From: sparky4 <sparky4@cock.li>
Date: Fri, 25 Nov 2016 21:25:28 +0000 (-0600)
Subject: wwww ok wwwww zscroll and scroll compile disabled due to me being too tired to whack... 
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=de41863a916d793f03f7dba0d5a85bb8c325accc;p=16.git

wwww ok wwwww zscroll and scroll compile disabled due to me being too tired to whack at code wwwwwwwwwwwwwwwwwww
---

diff --git a/makefile b/makefile
index 47864122..dd3d7cf9 100755
--- a/makefile
+++ b/makefile
@@ -157,12 +157,12 @@ DOSLIBLIBS += $(DOSLIB_8250)/dos86h/8250.lib
 TESTEXEC = &
 	tesuto.exe &
 	0.exe &
-	scroll.exe &
-	zcroll.exe &
 	exmmtest.exe &
+	vgmtest.exe &
 	vrstest.exe
 TESTEXEC2 = &
-	vgmtest.exe &
+	scroll.exe &
+	zcroll.exe &
 	inputest.exe &
 	maptest.exe &
 	fmemtest.exe &
diff --git a/scroll.exe b/scroll.exe
new file mode 100755
index 00000000..98bf3dc2
Binary files /dev/null and b/scroll.exe differ
diff --git a/src/0.c b/src/0.c
index 09e8953d..4da93c71 100755
--- a/src/0.c
+++ b/src/0.c
@@ -25,7 +25,7 @@ int main(int argc,char **argv) {
 
 	IN_Startup();
 	IN_Default(0,&player,ctrl_Joystick);
-	IN_initplayer(&player, 0);
+	IN_initplayer(&player);//, 0);
 
 	if (argc < 3) {
 		fprintf(stderr,"drawvrl <VRL file> <palette file>\n");
@@ -134,7 +134,7 @@ int main(int argc,char **argv) {
 
 		while(!IN_KeyDown(sc_Escape))
 		{
-			IN_ReadControl(0,&player);
+			IN_ReadControl(/*0,*/&player);
 			if(IN_KeyDown(2)) modexShowPage(&(gvar.video.page[0]));
 			if(IN_KeyDown(3)) modexShowPage(&(gvar.video.page[1]));
 			if(IN_KeyDown(68))	//f10
diff --git a/src/16.c b/src/16.c
index 6ad5334f..b7850faa 100755
--- a/src/16.c
+++ b/src/16.c
@@ -78,7 +78,7 @@ main(int argc, char *argv[])
 	start_timer(&gvar);
 	while(ENGI_EXIT != engi_stat)
 	{
-		IN_ReadControl(0,&player);
+		IN_ReadControl(/*0,*/&player);
 		if(IN_KeyDown(sc_Escape)) engi_stat = ENGI_EXIT;
 		shinku(&gvar);
 		_DEBUGF("Serial debug output printf test %u %u %u\n",1U,2U,3U);
diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index ef0f1fa6..0d3b29c7 100755
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -686,7 +686,7 @@ IN_Startup()
 void
 IN_Default(boolean gotit,player_t *player,ControlType nt)
 {
-	int i;
+	//int i;
 	if
 	(
 		(!gotit)
diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index de0bf36d..3c104633 100755
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -33,6 +33,7 @@
 #ifdef __WATCOMC__	//borland C BCEXMM.EXE
 #include "src/lib/16_dbg.h"
 #include "src/lib/16_sprit.h"
+#include "src/lib/16_enti.h"
 //#include "src/lib/bitmap.h"	//old format
 #endif
 #ifdef	__DEBUG__
@@ -43,8 +44,8 @@ extern boolean dbg_testkeyin,dbg_testcontrolnoisy;
 //if else for gfxtesting and direction
 //player[pn].d == 2 ||
 //player[pn].d != 2 ||
-#define DIRECTIONIFELSE	(player[pn].info.dir == 2)
-//#define NDIRECTIONIFELSE	(player[pn].info.dir != 2)
+#define DIRECTIONIFELSE	(player->info.dir == 2)//(player[pn].info.dir == 2)
+//#define NDIRECTIONIFELSE	(player->info.dir != 2)//(player[pn].info.dir != 2)
 
 #define	KeyInt	9	// The keyboard ISR number
 
diff --git a/src/scroll.c b/src/scroll.c
index b512f832..dd2db336 100755
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -178,7 +178,7 @@ void main(int argc, char *argv[])
 	//default player position on the viewable map
 	player[0].tx = mv[0].tx + mv[0].page->tilemidposscreenx;
 	player[0].ty = mv[0].ty + mv[0].page->tilemidposscreeny;
-	IN_initplayer(&player, 0);
+	IN_initplayer(&player);//, 0);
 	//IN_initplayer(&player, 1);
 
 #ifndef	SPRITE
@@ -221,7 +221,7 @@ void main(int argc, char *argv[])
 	//when player[0].tx or player[0].ty == 0 or player[0].tx == 20 or player[0].ty == 15 then stop because that is edge of map and you do not want to walk of the map
 
 	//player movement
-		IN_ReadControl(0,&player);
+		IN_ReadControl(/*0,*/&player);
 	if(!panswitch){
 		walk(mv, player, 0);
 	}else{
diff --git a/src/vgmtest.c b/src/vgmtest.c
index c3a3c176..2760ac0d 100755
--- a/src/vgmtest.c
+++ b/src/vgmtest.c
@@ -48,7 +48,7 @@ UINT8 OPL2_ReadStatus(void)
 void
 main(int argc, char *argv[])
 {
-	global_game_variables_t gvar;
+	//++++global_game_variables_t gvar;
 	VGM_FILE pee[9];
 	player_t player[MaxPlayers];
 	char *bakapee;
@@ -64,7 +64,7 @@ main(int argc, char *argv[])
 	while(!IN_KeyDown(sc_Escape))
 	//while(!kbhit())
 	{
-		IN_ReadControl(0,&player);
+		IN_ReadControl(/*0,*/&player);
 		UpdateSoundEngine();
 	}
 	StopMusic();
diff --git a/vgmtest.exe b/vgmtest.exe
deleted file mode 100755
index 68c88c98..00000000
Binary files a/vgmtest.exe and /dev/null differ