X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fscroll16.c;h=965f5f0406a2c93787ead449b14280be903bf2be;hb=707c5310d94a386646727cafad91f93cc65052ad;hp=7305f1dd238a2c6fe2daaccb82f79c5a0a10ecc6;hpb=397c4629f65e02f14821d0212860c44abfd037e3;p=16.git

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index 7305f1dd..965f5f04 100755
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -282,7 +282,7 @@ initMap(map_t *map) {
 	}
 }*/
 
-void mapScrollRight(map_view_t *mv, player_t *player, word id, word plid)
+void near mapScrollRight(map_view_t *mv, player_t *player, word id, word plid)
 {
 	word x, y;  /* coordinate for drawing */
 
@@ -310,7 +310,7 @@ void mapScrollRight(map_view_t *mv, player_t *player, word id, word plid)
 }
 
 
-void mapScrollLeft(map_view_t *mv, player_t *player, word id, word plid)
+void near mapScrollLeft(map_view_t *mv, player_t *player, word id, word plid)
 {
 	word x, y;  /* coordinate for drawing */
 
@@ -339,7 +339,7 @@ void mapScrollLeft(map_view_t *mv, player_t *player, word id, word plid)
 }
 
 
-void mapScrollUp(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)
 {
 	word x, y;  /* coordinate for drawing */
 
@@ -366,7 +366,7 @@ void mapScrollUp(map_view_t *mv, player_t *player, word id, word plid)
 	//}
 }
 
-void mapScrollDown(map_view_t *mv, player_t *player, word id, word plid)
+void near mapScrollDown(map_view_t *mv, player_t *player, word id, word plid)
 {
 	word x, y;  /* coordinate for drawing */
 
@@ -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;
 }
 
@@ -498,7 +499,7 @@ void mapGoTo(map_view_t *mv, int tx, int ty)
 }
 
 
-void
+void near
 mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y)
 {
 	word rx;
@@ -519,7 +520,12 @@ mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y)
 		switch(t->debug_text)
 		{
 			case 0:
+#ifndef SPRITE
+				modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, ((t->debug_data[i])+1)*2);
+				//cannot print number value du to it being slow as bakapee
+#else
 				modexDrawBmpRegion(page, x, y, rx, ry, t->tileWidth, t->tileHeight, (t->data));
+#endif
 			break;
 			case 1:
 				modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, (t->debug_data[i])+1);
@@ -536,7 +542,7 @@ mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y)
 	}
 }
 
-void mapDrawRow(map_view_t *mv, int tx, int ty, word y, player_t *p, word poopoffset)
+void near mapDrawRow(map_view_t *mv, int tx, int ty, word y, player_t *p, word poopoffset)
 {
 	word x;
 	int i;
@@ -553,7 +559,7 @@ void mapDrawRow(map_view_t *mv, int tx, int ty, word y, player_t *p, word poopof
 	}
 }
 
-void mapDrawCol(map_view_t *mv, int tx, int ty, word x, player_t *p, word poopoffset)
+void near mapDrawCol(map_view_t *mv, int tx, int ty, word x, player_t *p, word poopoffset)
 {
 	int y;
 	int i;
@@ -608,11 +614,11 @@ 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)
@@ -623,17 +629,23 @@ void shinku(page_t *page, global_game_variables_t *gv)
 	word col = 15;
 	word bgcol = 0;
 	word type = 1;
+	float t;
+	//gv->clock=*hwclockw;
+	t=(((*hwclockw)-gv->clock_start) /18.2);
 	//if(elapsed_timer(gv) >= (1.0 / gv->frames_per_second))
 	//{
-	//	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));
+		pee = _fmalloc(sizeof(byte)*64);
+		sprintf(pee, "%lu", gv->tiku);
+		modexprint(page, 16, 16, 1, 15, 0, pee);
+		//sprintf(pee, "%f", gv->tiku/t);
+		modexprint(page, x, y, type, col, bgcol, pee);
+		//sprintf(pee, "%f", *gv->tiku/\*time_in_seconds(gv));
 		//modexprint(page, x, y+8, type, col, bgcol, pee);
 	//}
+	(gv->clock_start)=*hwclockw;
 }
 
-void animatePlayer(map_view_t *pip, player_t *player, word playnum, sword scrollswitch)
+void near animatePlayer(map_view_t *pip, player_t *player, word playnum, sword scrollswitch)
 {
 	sword x = player[playnum].x;
 	sword y = player[playnum].y;
@@ -683,7 +695,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 +714,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();
 }