[xcroll.exe needs testing on real hardware] it is working but not flexible 16_ca...

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

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index 94338ab7d872a49765a44ccfe9f9c4d8f4606653..0aad37a257eb17c156c87dce74bfd380e4631109 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -614,16 +614,16 @@ void ZC_mapScroll(map_view_t *mv, player_t *player, word pn)
 //===========================================================================\r
 //TODO: put player in starting position of assigned spot on map\r
 //default player position on the viewable map\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
 {\r
-       player[pn].enti.tx = x + pip[0].tx;\r
-       player[pn].enti.ty = y + pip[0].ty;\r
+       player->enti.tx = x + pip[0].tx;\r
+       player->enti.ty = y + pip[0].ty;\r
 \r
        switch(defaultsw)\r
        {\r
                case 1:\r
-                       player[pn].enti.tx += pip[0].page->ti.tilemidposscreenx;\r
-                       player[pn].enti.ty += pip[0].page->ti.tilemidposscreeny;\r
+                       player->enti.tx += pip[0].page->ti.tilemidposscreenx;\r
+                       player->enti.ty += pip[0].page->ti.tilemidposscreeny;\r
                break;\r
                case 0:\r
                break;\r
@@ -877,7 +877,7 @@ void shinku(global_game_variables_t *gv)
                                gv->video.page[/*!*/(gv->video.p)].dx,\r
                                gv->video.page[/*!*/(gv->video.p)].dy,\r
                                96, 16);\r
-                       modexprint(&(gv->video.page[/*!*/(gv->video.p)]), x, y, type, 1, col, 1, bgcol, global_temp_status_text);\r
+                       modexprint(&(gv->video.page[/*!*/(gv->video.p)]), x, y, type, 1, col, bgcol, 1, global_temp_status_text);\r
 //0000printf("dx=%u    dy=%u\n", gv->video.page[/*!*/(gv->video.p)].dx, gv->video.page[/*!*/(gv->video.p)].dy);\r
                }\r
 #endif\r
@@ -912,8 +912,8 @@ void shinku(global_game_variables_t *gv)
                        //modexWaitBorder();\r
                        //modexWaitBorder_start();\r
 #else\r
-                       vga_wait_for_vsync();\r
-                       //vga_wait_for_vsync_end();\r
+                       //vga_wait_for_vsync();\r
+                       vga_wait_for_vsync_end();\r
 #endif\r
                        gv->kurokku.frames_per_second=60;\r
                break;\r
@@ -1058,7 +1058,6 @@ void player_walk(player_t *player, map_view_t *map_v){
  */\r
 \r
 \r
-\r
 void mapScroll(map_view_t *mv, player_t *player)\r
 {\r
        //word x, y;  /* coordinate for drawing */\r
@@ -1092,3 +1091,11 @@ void mapScroll(map_view_t *mv, player_t *player)
                        break;\r
        }\r
 }\r
+\r
+void ZC_GirdChk (global_game_variables_t *gvar, player_t *player)\r
+{\r
+       if((player->enti.q==1) &&\r
+               !(player->enti.x%gvar->mv[0].map->tiles->tileWidth==0 && player->enti.y%gvar->mv[0].map->tiles->tileHeight==0))\r
+               ZC_PlayerXYpos(0, 0, player, gvar->mv, 1);\r
+               //TODO: MAKE SURE TO RESYNC PLAYER IN WALKABLE SPOT\r
+}\r