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 0cd71b63f42e92eaba99d57de47e2a6080fe48c8..3c7bc5597e261a20cd4a955f4c71e86792d5c449 100755 (executable)
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -42,8 +42,7 @@
 #define SPRITE\r
 //#define TILERENDER\r
 \r
-//0000\r
-#define SHOWFPS\r
+//0000#define SHOWFPS\r
 //#define OLDWALKSHOWPAGESTUFF\r
 \r
 \r
@@ -86,7 +85,7 @@
        printf("size of mmblocktype: %u ", sizeof(mmblocktype));\\r
        printf("\n\n");\\r
        printf("player vars:\n");\\r
-       printf("        xy: %dx%d", gvar.player[0].enti.x, gvar.player[0].enti.y); printf("     txy: %dx%d", gvar.player[0].enti.tx, gvar.player[0].enti.ty); printf("  triggxy: %dx%d", gvar.player[0].enti.triggerx, gvar.player[0].enti.triggery); printf("  value: %d\n", gvar.mv[1].map->layerdata[0].data[(gvar.player[0].enti.triggerx-1)+(map.width*(gvar.player[0].enti.triggery-1))]);\\r
+       printf("        xy: %dx%d", gvar.player[0].enti.x, gvar.player[0].enti.y); printf("     txy: %dx%d", gvar.player[0].enti.tx, gvar.player[0].enti.ty); printf("  triggxy: %dx%d", gvar.player[0].enti.triggerx, gvar.player[0].enti.triggery); printf("  value: %d\n", gvar.mv[1].map->layerdata[0].data[(gvar.player[0].enti.triggerx-1)+(gvar.map.width*(gvar.player[0].enti.triggery-1))]);\\r
        printf("        hp: %d", (gvar.player[0].enti.hp));     printf("        q: %u", gvar.player[0].enti.q); printf("        info.dir: %u", gvar.player[0].info.dir);        printf("        d: %u", gvar.player[0].enti.d); printf("        dire: %u", gvar.player[0].enti.dire);\\r
                printf("        pdir: %u\n", gvar.player[0].pdir); printf("     delay=%u", gvar.player[0].enti.spri.delay);\\r
 printf("\n\n");\\r
@@ -133,7 +132,7 @@ void mapDrawWCol(map_view_t *mv, int tx, int ty, word x);
 inline void near ScrollRight(map_view_t *mv, player_t *pl, word id, word plid)\r
 {\r
        /* increment the pixel position and update the page */\r
-       mv[id].page->dx += pl[plid].enti.speed;\r
+       mv[id].page->dx += pl[plid].enti.spt;\r
 \r
        /* check to see if this changes the tile */\r
        if(mv[id].page->dx >= mv[id].dxThresh )\r
@@ -150,7 +149,7 @@ inline void near ScrollRight(map_view_t *mv, player_t *pl, word id, word plid)
 inline void near ScrollLeft(map_view_t *mv, player_t *pl, word id, word plid)\r
 {\r
        /* decrement the pixel position and update the page */\r
-       mv[id].page->dx -= pl[plid].enti.speed;\r
+       mv[id].page->dx -= pl[plid].enti.spt;\r
 \r
        /* check to see if this changes the tile */\r
        if(mv[id].page->dx == 0)\r
@@ -167,7 +166,7 @@ inline void near ScrollLeft(map_view_t *mv, player_t *pl, word id, word plid)
 inline void near ScrollUp(map_view_t *mv, player_t *pl, word id, word plid)\r
 {\r
        /* decrement the pixel position and update the page */\r
-       mv[id].page->dy -= pl[plid].enti.speed;\r
+       mv[id].page->dy -= pl[plid].enti.spt;\r
 \r
        /* check to see if this changes the tile */\r
        if(mv[id].page->dy == 0 )\r
@@ -184,7 +183,7 @@ inline void near ScrollUp(map_view_t *mv, player_t *pl, word id, word plid)
 inline void near ScrollDown(map_view_t *mv, player_t *pl, word id, word plid)\r
 {\r
        /* increment the pixel position and update the page */\r
-       mv[id].page->dy += pl[plid].enti.speed;\r
+       mv[id].page->dy += pl[plid].enti.spt;\r
 \r
        /* check to see if this changes the tile */\r
        if(mv[id].page->dy >= mv[id].dyThresh )\r