From: sparky4 <sparky4@cock.li>
Date: Wed, 23 Sep 2015 15:05:46 +0000 (-0500)
Subject: dang!
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=fc0091a56ec3c5c6289ed860dac329c435f4b85d;p=16.git

dang!
	modified:   16.exe
	modified:   scroll.exe
	modified:   src/lib/scroll16.c
	modified:   src/lib/scroll16.h
	modified:   src/scroll.c
---

diff --git a/16.exe b/16.exe
index 1fbbd08f..9fd4f7d7 100755
Binary files a/16.exe and b/16.exe differ
diff --git a/scroll.exe b/scroll.exe
index eab87201..b7061865 100755
Binary files a/scroll.exe and b/scroll.exe differ
diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index 7305f1dd..6f83207c 100755
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -608,14 +608,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 +628,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 +683,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
diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index 2b7d9a67..d5a9a284 100755
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -32,7 +32,7 @@
 #include "src/lib/mapread.h"
 #include "src/lib/timer.h"
 
-//#define SPRITE
+#define SPRITE
 //#define BMPTYPE
 
 typedef struct {
@@ -69,8 +69,8 @@ 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 mapDrawWRow(map_view_t *mv, int tx, int ty, word y);
 void mapDrawWCol(map_view_t *mv, int tx, int ty, word x);
-void qclean();
-void shinku(page_t *page, global_game_variables_t *gv);
+//void qclean();
+//void shinku(page_t *page, global_game_variables_t *gv);
 void animatePlayer(map_view_t *pip, player_t *player, word playnum, sword scrollswitch);
 
 #endif /*__SCROLL16_H_*/
diff --git a/src/scroll.c b/src/scroll.c
index 02cdd8c6..ed1498ff 100755
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -25,7 +25,6 @@
 #include "src/lib/wcpu/wcpu.h"
 
 //#define FADE
-//#define SPRITE
 #define MODEX	//this is for mode x initiating
 
 //word far *clock= (word far*) 0x046C; /* 18.2hz clock */
@@ -176,7 +175,11 @@ void main()
 	npc0.d=0;
 	modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 64, 24, 32, &npctmp);*/
 #ifdef	SPRITE
+#ifdef BMPTYPE
+	oldDrawBmp(VGA, player[0].x-4, player[0].y-TILEWH, &player[0].data, 1);
+#else
 	modexDrawSpriteRegion(spri->page, player[0].x-4, player[0].y-TILEWH, 24, 64, 24, 32, &player[0].data);
+#endif
 #else
 	modexClearRegion(mv[1].page, player[0].x-4, player[0].y-TILEWH, 24, 32, 15);
 #endif
@@ -193,7 +196,7 @@ void main()
 	{
 		sprintf(mesg, "%lu", gvar.tiku);
 //++++		modexprint(mv[1].page, 16, 16, 1, 15, 0, mesg);
-		shinku(mv[1].page, &gvar);
+		//++++shinku(mv[1].page, &gvar);
 		IN_ReadControl(0,&player);
 	//top left corner & bottem right corner of map veiw be set as map edge trigger since maps are actually square
 	//to stop scrolling and have the player position data move to the edge of the screen with respect to the direction