==== PRE SHOWPAGE TO SHOWMV CONVERSION ==== i am going to work on a really big area...

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

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index 94b5ea5eb1a062c19e787339f02df1873e9fbbf7..cf364c924910ec359066e123bb2be978d45d6b84 100755 (executable)
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -49,7 +49,14 @@ extern void modexDrawSpriteRegion(page_t *page, int x, int y, int rx, int ry, in
 //modexDrawBmpPBufRegion\r
 #define PBUFSFUN               modexDrawSpriteRegion\r
 #define PBUFBFUN               modexDrawBmpRegion\r
-#define PLAYERBMPDATA  player[pn].data\r
+\r
+#define PLAYERBMPDATAVAR       player[pn].data\r
+#define PLAYERBMPDATA          *PLAYERBMPDATAVAR\r
+#define PLAYERBMPDATAPTR       PLAYERBMPDATAVAR\r
+\r
+#define PCXBMPVAR      player[0].data\r
+#define PCXBMP         *PCXBMPVAR\r
+#define PCXBMPPTR      PCXBMPVAR\r
 \r
 typedef struct {\r
        map_t *map;\r
@@ -59,7 +66,7 @@ typedef struct {
        word dxThresh; //Threshold for physical tile switch\r
        word dyThresh; //Threshold for physical tile switch\r
        video_t *video; //pointer to game variables of the video\r
-       pan_t *pan;             //pointer the the page panning debug system\r
+       nibble *panp;   // pointer to video's pan page num\r
 //newer vars!\r
        int dx, dy, delta, d;\r
 } map_view_t;\r
@@ -87,7 +94,7 @@ typedef struct {
 //++++ printf("Total free: %zu\n", GetFreeSize());\r
 //not used now printf("temporary player sprite 0: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=45556867\n");\r
 //not used now printf("temporary player sprite 1: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=44606385\n");\r
-//printf("mv[%u].tx: %d", pan.pn, mv[pan.pn].tx); printf("     mv[%u].ty: %d   ", pan.pn, mv[pan.pn].ty);\r
+//printf("mv[%u].tx: %d", gvar.video.panp, mv[gvar.video.panp].tx); printf("   mv[%u].ty: %d   ", gvar.video.panp, mv[gvar.video.panp].ty);\r
 //printf("gvar.kurokku:        "); printf("%.0f ", clock());   printf("tiku=%lu ", gvar.kurokku.tiku); printf("t=%.0f ", gvar.kurokku.t);      printf("ticktock()=%f ", ticktock(&gvar));      printf("%.0f fps", (double)gvar.kurokku.tiku/ticktock(&gvar));\r
 //printf("map.width=%d map.height=%d   map.data[0]=%d\n", mv[0].map->width, mv[0].map->height, mv[0].map->data[0]);\r
 //printf("&global_temp_status_text = %Fp\n", &global_temp_status_text);\r
@@ -117,22 +124,22 @@ typedef struct {
 #define SHOWMVFUN ZC_ShowMV(&mv, 0, 0);\r
 #define PANKEYFUN \\r
                        ZC_panPageManual(&mv, &player, 0); \\r
-                       if(IN_KeyDown(1+1) || IN_KeyDown(sc_Z)){ pan.pn=0; SHOWMVFUN; } \\r
-                       if(IN_KeyDown(2+1) || IN_KeyDown(sc_X)){ pan.pn=1; SHOWMVFUN; } \\r
-                       if(IN_KeyDown(3+1) || IN_KeyDown(sc_C)){ pan.pn=2; SHOWMVFUN; if(IN_KeyDown(sc_C)) modexClearRegion(&gvar.video.page[2], 0, 0, gvar.video.page[2].sw, gvar.video.page[2].sh, 47); } \\r
-                       if(IN_KeyDown(4+1) || IN_KeyDown(sc_V)){ pan.pn=3; SHOWMVFUN; if(IN_KeyDown(sc_V)) modexClearRegion(&gvar.video.page[3], 0, 0, gvar.video.page[3].sw, gvar.video.page[3].sh, 45); } \\r
+                       if(IN_KeyDown(1+1) || IN_KeyDown(sc_Z)){ gvar.video.panp=0; SHOWMVFUN; } \\r
+                       if(IN_KeyDown(2+1) || IN_KeyDown(sc_X)){ gvar.video.panp=1; SHOWMVFUN; } \\r
+                       if(IN_KeyDown(3+1) || IN_KeyDown(sc_C)){ gvar.video.panp=2; SHOWMVFUN; if(IN_KeyDown(sc_C)) modexClearRegion(&gvar.video.page[2], 0, 0, gvar.video.page[2].sw, gvar.video.page[2].sh, 47); } \\r
+                       if(IN_KeyDown(4+1) || IN_KeyDown(sc_V)){ gvar.video.panp=3; SHOWMVFUN; if(IN_KeyDown(sc_V)) modexClearRegion(&gvar.video.page[3], 0, 0, gvar.video.page[3].sw, gvar.video.page[3].sh, 45); } \\r
                        if(IN_KeyDown(25)){ modexpdump(mv[1].page); modexShowPage(&(gvar.video.page[1])); IN_UserInput(1,1); }\r
 \r
 extern boolean pageflipflop, pageploop;\r
-extern unsigned char shinku_fps_indicator_page;\r
 \r
 extern char global_temp_status_text[512];\r
 \r
 //map_t allocMap(int w, int h);\r
 //void initMap(map_t *map);\r
 void walk(map_view_t *pip, player_t *player, word pn);\r
+void ZC_walk(map_view_t *pip, player_t *player, 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, pan_t *pan, global_game_variables_t *gv);\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
 void ZC_ShowMV(map_view_t *moo, boolean vsync, boolean sr);\r
 void near mapScrollRight(map_view_t *mv, player_t *player, word id, word plid);\r
@@ -154,10 +161,10 @@ void mapDrawWRow(map_view_t *mv, int tx, int ty, word y);
 void mapDrawWCol(map_view_t *mv, int tx, int ty, word x);\r
 //void qclean();\r
 void shinku(global_game_variables_t *gv);\r
-void near animatePlayer(map_view_t *pip, player_t *player, word playnum, sword scrollswitch);\r
+void /*near*/ animatePlayer(map_view_t *pip, player_t *player, word playnum, sword scrollswitch);\r
 \r
 // Move an entity around. Should actually be in 16_entity\r
-boolean ZC_walk(entity_t *ent, map_view_t *map_v);\r
+boolean ZC_walk2(entity_t *ent, map_view_t *map_v);\r
 \r
 // Move player around and call map scrolling if required/possible\r
 void walk_player(player_t *player, map_view_t *map_v);\r