]> 4ch.mooo.com Git - 16.git/blobdiff - src/lib/scroll16.h
16_ca needs huge amounts of work and I should remember what needs to be done soon...
[16.git] / src / lib / scroll16.h
index 744e2f4a07eee94f35b8ef97687258262ab3f4ee..48eecf8914b329fef745638ccf401ad4b27c3f60 100755 (executable)
@@ -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
 #define SPRITE\r
 //#define TILERENDER\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
@@ -79,8 +82,8 @@
 //printf("mv[0]txy: %dx%d      ", mv[0].tx, mv[0].ty); printf("mv[1]txy: %dx%d", mv[1].tx, mv[1].ty);\r
 #define SCROLLEXITMESG         printf("page[0]dxy: %dx%d", gvar.video.page[0].dx, gvar.video.page[0].dy);\\r
        printf("\n\n");\\r
-       printf("gvar.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", mv[1].map->layerdata[0].data[(gvar.player[0].enti.triggerx-1)+(map.width*(gvar.player[0].enti.triggery-1))]);\\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("        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
@@ -88,16 +91,23 @@ 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
 \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
@@ -107,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
@@ -197,52 +207,9 @@ 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
+void ZC_GirdChk (global_game_variables_t *gvar, player_t *player);\r
+\r
 #endif /*__SCROLL16_H_*/\r