BROKEN ON REAL HW comitted to see what was changed

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

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index 1888cb4fa33b0d90f79c4b08dbd0adca0898e883..a3f28541c9ba5d007c0d447b5ad27633707059d7 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -162,7 +162,7 @@ void ZC_walk(global_game_variables_t *gvar, word pn)
                                gvar->player[pn].walktype=1;\r
                                if(gvar->player[pn].enti.q<=gvar->player[pn].enti.spt)\r
                                {\r
-                                       gvar->player[pn].enti.x+=(gvar->player[pn].enti.speed);\r
+                                       gvar->player[pn].enti.x+=(gvar->player[pn].enti.spt);\r
                                        ZC_animatePlayer(gvar->mv, gvar->player, pn);\r
                                        gvar->player[pn].enti.q++;\r
 #ifdef OLDWALKSHOWPAGESTUFF\r
@@ -205,7 +205,7 @@ void ZC_walk(global_game_variables_t *gvar, word pn)
                                gvar->player[pn].walktype=1;\r
                                if(gvar->player[pn].enti.q<=gvar->player[pn].enti.spt)\r
                                {\r
-                                       gvar->player[pn].enti.x-=(gvar->player[pn].enti.speed);\r
+                                       gvar->player[pn].enti.x-=(gvar->player[pn].enti.spt);\r
                                        ZC_animatePlayer(gvar->mv, gvar->player, pn);\r
                                        gvar->player[pn].enti.q++;\r
 #ifdef OLDWALKSHOWPAGESTUFF\r
@@ -248,7 +248,7 @@ void ZC_walk(global_game_variables_t *gvar, word pn)
                                gvar->player[pn].walktype=1;\r
                                if(gvar->player[pn].enti.q<=gvar->player[pn].enti.spt)\r
                                {\r
-                                       gvar->player[pn].enti.y+=(gvar->player[pn].enti.speed);\r
+                                       gvar->player[pn].enti.y+=(gvar->player[pn].enti.spt);\r
                                        ZC_animatePlayer(gvar->mv, gvar->player, pn);\r
                                        gvar->player[pn].enti.q++;\r
 #ifdef OLDWALKSHOWPAGESTUFF\r
@@ -291,7 +291,7 @@ void ZC_walk(global_game_variables_t *gvar, word pn)
                                gvar->player[pn].walktype=1;\r
                                if(gvar->player[pn].enti.q<=gvar->player[pn].enti.spt)\r
                                {\r
-                                       gvar->player[pn].enti.y-=(gvar->player[pn].enti.speed);\r
+                                       gvar->player[pn].enti.y-=(gvar->player[pn].enti.spt);\r
                                        ZC_animatePlayer(gvar->mv, gvar->player, pn);\r
                                        gvar->player[pn].enti.q++;\r
 #ifdef OLDWALKSHOWPAGESTUFF\r
@@ -318,7 +318,7 @@ void ZC_walk(global_game_variables_t *gvar, word pn)
 //panning page\r
 void ZC_panPageManual(map_view_t *pip, player_t *player, word pn)\r
 {\r
-#define SHOWMVFUN_ ZC_ShowMV(pip, 0, 0);\r
+#define SHOWMVFUN_ VL_ShowPage(pip[0].page, 0, 0);//ZC_ShowMV(pip, 0, 0);\r
        switch(player[pn].enti.d)\r
        {\r
                //right movement\r
@@ -413,6 +413,8 @@ void ZC_MVInit(map_view_t *pip, int tx, int ty)
        //pip[0].ty = pip[1].ty = ty;\r
 }\r
 \r
+//#if 0\r
+//for backwards compatibility with code i am lazy ww\r
 void ZC_ShowMV(map_view_t *moo, boolean vsync, boolean sr)\r
 {\r
        VL_ShowPage(moo[0].page, vsync, sr);\r
@@ -754,7 +756,7 @@ void near mapDrawRow(map_view_t *mv, int tx, int ty, word y, player_t *player, w
 #ifdef __DEBUG_RF__\r
 if(dbg_pagedelayrendermap)             if(!y)  y+=TILEWH;      else    y-=TILEWH;\r
 #endif\r
-       poopoffset%=player[0].enti.speed;\r
+       poopoffset%=player[0].enti.spt;\r
 //printf("y: %d\n", poopoffset);\r
 #ifdef __DEBUG_RF__\r
 if(dbg_pagedelayrendermap){ sprintf(global_temp_status_text, "%-3u", mv->dx); modexprint(mv[0].page, player[0].enti.x, player[0].enti.y-28-(poopoffset*8) , 1, 0, PALMAPDRAWW, 1, 1, global_temp_status_text); }\r
@@ -783,7 +785,7 @@ void near mapDrawCol(map_view_t *mv, int tx, int ty, word x, player_t *player, w
 #ifdef __DEBUG_RF__\r
 if(dbg_pagedelayrendermap)             if(!x)  x+=TILEWH;              else    x-=TILEWH;\r
 #endif\r
-       poopoffset%=player[0].enti.speed;\r
+       poopoffset%=player[0].enti.spt;\r
 //printf("x: %d\n", poopoffset);\r
 #ifdef __DEBUG_RF__\r
 if(dbg_pagedelayrendermap){ sprintf(global_temp_status_text, "%-3u", mv->dy); modexprint(mv[0].page, player[0].enti.x, player[0].enti.y-28-(poopoffset*8) , 1, 0, PALMAPDRAWW, 1, global_temp_status_text); }\r
@@ -940,7 +942,7 @@ void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn)
                break;\r
                case 2:\r
                        dd = 1;\r
-                       qq = player[pn].enti.q*player[pn].enti.speed;\r
+                       qq = player[pn].enti.q*player[pn].enti.spt;\r
                break;\r
        }\r
        x-=4;\r