p16 is being worked on a bunch by me wwww [16_ca needs huge amounts of work and I...

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

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index 8a7cbb7ea744e68b91e2fc6622591dfea9deb09e..2eb1b8383f953538624f704d154611c62979d1d1 100755 (executable)
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -42,6 +42,8 @@
 \r
 #define SPRITE\r
 //#define TILERENDER\r
+#define SHOWFPS\r
+//#define OLDWALKSHOWPAGESTUFF\r
 \r
 #define PLAYERBMPDATAVAR       gvar.player[pn].data\r
 #define PLAYERBMPDATA          *PLAYERBMPDATAVAR\r
@@ -88,10 +90,17 @@ printf("\n\n");\
 \\r
        printf("gvar.video:\n");\\r
        printf(" r=%u ", gvar.video.dorender);\\r
-       printf("bgps=%u ", gvar.video.bgps);\\r
+       printf("bgps=%u ", gvar.video.vga_state.bgps);\\r
 printf("\n\n");\r
 \r
-extern boolean pagenorendermap, pagedelayrendermap;\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
+       if(IN_KeyDown(sc_F9)){ pagenorendermap=!pagenorendermap;                                IN_UserInput(1, &gvar); }\r
+       if(IN_KeyDown(sc_F8)){ gvar.video.vga_state.bgps=!gvar.video.vga_state.bgps;                                    IN_UserInput(1, &gvar); }\r
+       if(IN_KeyDown(sc_T)){ gvar.video.vga_state.rss=!gvar.video.vga_state.rss;                                               IN_UserInput(1, &gvar); }\r
+*/\r
 \r
 extern char global_temp_status_text[512];\r
 extern char global_temp_status_text2[512];\r
@@ -197,51 +206,6 @@ boolean ZC_walk2(entity_t *ent, map_view_t *map_v);
 // Move gvar.player around and call map scrolling if required/possible\r
 void walk_player(player_t *player, map_view_t *map_v);\r
 \r
-//check map edge\r
-inline boolean ZC_mapEdgeChk(map_view_t *map_v, nibble dir, boolean pansw)\r
-{\r
-       int     w,h;\r
-\r
-       switch (pansw)\r
-       {\r
-               case 0:\r
-                       w = map_v[0].map->width;\r
-                       h = map_v[0].map->height;\r
-               break;\r
-               case 1:\r
-                       w = map_v[0].page->ti.tilesw;\r
-                       h = map_v[0].page->ti.tilesh;\r
-               break;\r
-       }\r
-\r
-       switch(dir)\r
-       {\r
-               //no direction\r
-               default:\r
-               case 2:\r
-                       //0000pip[0].video->startclk = (*clockw);\r
-                       return false;\r
-               break;\r
-               //right movement\r
-               case 3:\r
-                       if(map_v[0].tx >= 0 && map_v[0].tx+map_v[0].page->ti.tw < w) return true;\r
-               break;\r
-               //left movement\r
-               case 1:\r
-                       if(map_v[0].tx > 0 && map_v[0].tx+map_v[0].page->ti.tw <= w) return true;\r
-               break;\r
-               //down movement\r
-               case 4:\r
-                       if(map_v[0].ty >= 0 && map_v[0].ty+map_v[0].page->ti.th < h) return true;\r
-               break;\r
-               //up movement\r
-               case 0:\r
-                       if(map_v[0].ty > 0 && map_v[0].ty+map_v[0].page->ti.th <= h) return true;\r
-               break;\r
-       }\r
-       return false;\r
-}\r
-\r
 // Scroll map in one direction (assumed from gvar.player's movement)\r
 void mapScroll(map_view_t *mv, player_t *player);\r
 \r