16_ca needs huge amounts of work and I should remember what needs to be done soon...

[16.git] / src / lib / scroll16.h

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index 546fbe2929850ad3f25b1c0b21d0f8431749ae7c..48eecf8914b329fef745638ccf401ad4b27c3f60 100755 (executable)
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -29,8 +29,7 @@
 #include "src/lib/16_vl.h"\r
 #include "src/lib/16_in.h"\r
 #include "src/lib/16_map.h" //map is loaded here www\r
-#include "src/lib/16render.h"\r
-//#include "src/lib/16_map.h"  //new map stuff\r
+//#include "src/lib/16render.h"\r
 #include "src/lib/16_timer.h"\r
 #include "src/lib/wcpu/16_wcpu.h"\r
 #include "src/lib/16_spri.h"\r
@@ -42,9 +41,11 @@
 \r
 #define SPRITE\r
 //#define TILERENDER\r
-#define SHOWFPS\r
+\r
+//0000#define SHOWFPS\r
 //#define OLDWALKSHOWPAGESTUFF\r
 \r
+\r
 #define PLAYERBMPDATAVAR       gvar.player[pn].data\r
 #define PLAYERBMPDATA          *PLAYERBMPDATAVAR\r
 #define PLAYERBMPDATAPTR       PLAYERBMPDATAVAR\r
@@ -91,9 +92,9 @@ printf("\n\n");\
        printf("gvar.video:\n");\\r
        printf(" r=%u ", gvar.video.dorender);\\r
        printf("bgps=%u ", gvar.video.vga_state.bgps);\\r
-       printf("dbg_delayanimation=%u ", dbg_delayanimation);\\r
 printf("\n\n");\r
 \r
+//     printf("dbg_delayanimation=%u ", dbg_delayanimation);\r
 /*\r
        if(IN_KeyDown(sc_F11)){ pagedelayrendermap=!pagedelayrendermap;         IN_UserInput(1, &gvar); }\r
        if(IN_KeyDown(sc_F10)){ gvar.kurokku.fpscap=!gvar.kurokku.fpscap;               IN_UserInput(1, &gvar); }\r
@@ -106,7 +107,7 @@ extern char global_temp_status_text[512];
 extern char global_temp_status_text2[512];\r
 \r
 void initMap(map_t *map);\r
-void ZC_walk(map_view_t *pip, player_t *player, word pn);\r
+void ZC_walk(global_game_variables_t *gvar, word pn);\r
 void ZC_panPageManual(map_view_t *pip, player_t *player, word pn);\r
 void ZC_MVSetup(map_view_t *pip, map_t *map, global_game_variables_t *gv);\r
 void ZC_MVInit(map_view_t *pip, int tx, int ty);\r
@@ -116,7 +117,7 @@ void near mapScrollLeft(map_view_t *mv, player_t *player, word id, word plid);
 void near mapScrollUp(map_view_t *mv, player_t *player, word id, word plid);\r
 void near mapScrollDown(map_view_t *mv, player_t *player, word id, word plid);\r
 void ZC_mapScroll(map_view_t *mv, player_t *player, word pn);\r
-void ZC_PlayerXYpos(int x, int y, player_t *player, map_view_t *pip, nibble pn, boolean defaultsw);\r
+void ZC_PlayerXYpos(int x, int y, player_t *player, map_view_t *pip, boolean defaultsw);\r
 sword chkmap(map_t *map, word q);\r
 void mapGoTo(map_view_t *mv, int tx, int ty);\r
 void ZC_mapinitMV(map_view_t *mv, int tx, int ty);\r
@@ -209,4 +210,6 @@ void walk_player(player_t *player, map_view_t *map_v);
 // Scroll map in one direction (assumed from gvar.player's movement)\r
 void mapScroll(map_view_t *mv, player_t *player);\r
 \r
+void ZC_GirdChk (global_game_variables_t *gvar, player_t *player);\r
+\r
 #endif /*__SCROLL16_H_*/\r