exmmtest error

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

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index 7305f1dd238a2c6fe2daaccb82f79c5a0a10ecc6..23d34bef4b2580f078b6f52db9673485d35cc21d 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -451,7 +451,7 @@ sword chkmap(map_t *map, word q)
 1,     1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      \
 1,     1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      3,      3,      3,      3,      1,      2,      3,      4 };*/
        //check for failed to load map
-       if((map->width == map->height == 0) || (q>0))
+       if((map->width == map->height == 0) && (q>0))
        {
                //initiate a null map!
                map->width=MAPW;///2;
@@ -469,6 +469,7 @@ sword chkmap(map_t *map, word q)
                map->tiles->cols = 1;
                map->tiles->debug_text = true;
        }
+       else map->tiles->debug_text = false;
        return 0;
 }
 
@@ -608,14 +609,14 @@ void mapDrawWCol(map_view_t *mv, int tx, int ty, word x)
        }
 }
 
-void qclean()
+/*void qclean()
 {
        modexLeave();
        //setkb(0);
-}
+}*/
 
 //sync!
-void shinku(page_t *page, global_game_variables_t *gv)
+/*void shinku(page_t *page, global_game_variables_t *gv)
 {
        byte *pee;
        word x = (16);
@@ -628,10 +629,10 @@ void shinku(page_t *page, global_game_variables_t *gv)
        //      pee = malloc(sizeof(double));
        //      sprintf(pee, "%f", ((*gv->clock) /18.2));
 //++++         modexprint(page, x, y, type, col, bgcol, pee);
-               //sprintf(pee, "%f", /*gv->tiku/*/time_in_seconds(gv));
+               //sprintf(pee, "%f", *gv->tiku/\*time_in_seconds(gv));
                //modexprint(page, x, y+8, type, col, bgcol, pee);
        //}
-}
+}*/
 
 void animatePlayer(map_view_t *pip, player_t *player, word playnum, sword scrollswitch)
 {
@@ -683,7 +684,7 @@ void animatePlayer(map_view_t *pip, player_t *player, word playnum, sword scroll
 #define FRAME4 oldDrawBmp(VGA, x, y, &player[playnum].data, 1);
 #else
 #define FRAME1 modexDrawSpriteRegion(pip[1].page, x, y, 48, dire, 24, 32, &player[playnum].data);
-#define FRAME2 modexDrawSpriteRegion(pip[1].page, x, y, 24, dire, 24, 32, &player[playnum].data)
+#define FRAME2 modexDrawSpriteRegion(pip[1].page, x, y, 24, dire, 24, 32, &player[playnum].data);
 #define FRAME3 modexDrawSpriteRegion(pip[1].page, x, y, 0, dire, 24, 32, &player[playnum].data);
 #define FRAME4 modexDrawSpriteRegion(pip[1].page, x, y, 24, dire, 24, 32, &player[playnum].data);
 #endif
@@ -702,6 +703,6 @@ void animatePlayer(map_view_t *pip, player_t *player, word playnum, sword scroll
        //modexClearRegion(top->page, 66, 66, 2, 40, 0);
        //modexCopyPageRegion(dest->page, top->page, 66, 66, 66, 66, 2, 40);
        //turn this off if XT
-       //XTif(detectcpu() > 0)
+       if(detectcpu() > 0)
        modexWaitBorder();
 }