X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscroll16.c;h=41634957455fae46f0847231cece1246f845cb44;hb=d71e4ebbd3770b48eee2b2cc18288b97aad4e1e4;hp=16fd5d0796f9cf18ad6d2a514bb7e66a07caa53d;hpb=7bfb27fa40c79a2faafd96f87e83e86c0ad0bd12;p=16.git

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index 16fd5d07..41634957 100755
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123
  *
  * This file is part of Project 16.
  *
@@ -478,8 +478,8 @@ mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y)
 	}
 	else
 	{
-		rx = (((i-1) % ((t->data.width)/t->tileWidth)) * t->tileWidth);
-		ry = (((i-1) / ((t->data.height)/t->tileHeight)) * t->tileHeight);
+		rx = (((i-1) % ((t->data->width)/t->tileWidth)) * t->tileWidth);
+		ry = (((i-1) / ((t->data->height)/t->tileHeight)) * t->tileHeight);
 ////0000printf("i=%d\n", i);
 		switch(t->debug_text)
 		{
@@ -488,8 +488,8 @@ mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y)
 				modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, ((t->debug_data[i])+1));
 				//cannot print number value du to it being slow as bakapee
 #else
-				PBUFBFUN(page, x, y, rx, ry, t->tileWidth, t->tileHeight, &(t->data));
-				//modexDrawBmpRegion(page, x, y, rx, ry, t->tileWidth, t->tileHeight, (t->btdata));
+				PBUFBFUN		(page, x, y, rx, ry, t->tileWidth, t->tileHeight, (t->data));
+				//modexDrawBmpRegion	(page, x, y, rx, ry, t->tileWidth, t->tileHeight, (t->data));
 #endif
 			break;
 			case 1:
@@ -597,8 +597,9 @@ void shinku(map_view_t *pip, global_game_variables_t *gv)
 		word bgcol = 0;
 		word type = 1;
 		//t=(((*(gv->clock))-gv->clock_start) /18.2);
-		sprintf(gv->pee, "%f fps", (double)gv->kurokku.tiku/ticktock(gv));
-		modexprint(pip[1].page, 16, 16, 1, 15, 0, gv->pee);
+		//sprintf(gv->pee, "%f fps", (double)gv->kurokku.tiku/ticktock(gv));
+		printf("%f fps", (double)gv->kurokku.tiku/ticktock(gv));
+		//modexprint(pip[1].page, 16, 16, 1, 15, 0, gv->pee, 1);
 		//(gv->clock_start)=*(gv->clock);
 		gv->kurokku.tiku=0;
 	}