X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fxcroll.c;h=189746da75d57715901c6c94461eae4e11532921;hb=050d28da3358d5c1434fda542ec11adbee182ea5;hp=542301c18ef91e8f7fbe5c3fdbfdb6c046aa441a;hpb=23633a34e93bf04d2865738e98804a9005948a34;p=16.git

diff --git a/src/xcroll.c b/src/xcroll.c
index 542301c1..189746da 100755
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -22,7 +22,6 @@
 
 #include "src/lib/scroll16.h"
 #include "src/lib/16_timer.h"
-#include "src/lib/16render.h"
 #include "src/lib/16_dbg.h"
 
 #define FADE
@@ -53,28 +52,14 @@ void main(int argc, char *argv[])
 {
 	static global_game_variables_t gvar;
 	struct glob_game_vars *ggvv;
-//	sword bakapee;
-// 	if(argv[1]) bakapee = atoi(argv[1]);
-// 	else bakapee = 1;
-	//char *bakapee1,*bakapee1p;
 	char bakapee1[64] = FILENAME_1;
 	char bakapee1p[64] = FILENAME_1P;
 
 	Startup16(&gvar);
 
-//	bakapee1=mALLoc(64);
-//	bakapee1p=mALLoc(64);
 	ggvv=&gvar;
 
 	if (argc >= 2) {
-/*	if (argc < 2) {
-		//fprintf(stderr,"drawvrl <VRL file> <palette file>\n palette file optional\n");
-		bakapee1 =		FILENAME_1;
-		bakapee1p =	FILENAME_1P;
-
-	}else{
-		if(argv[1]) bakapee1 = argv[1];
-		if(argv[2]) bakapee1p = argv[2];*/
 		if(argv[1]){ strcpy(bakapee1, argv[1]);
 		if(argv[2]) strcpy(bakapee1p, argv[2]); }
 	}
@@ -136,9 +121,7 @@ void main(int argc, char *argv[])
 	modexFadeOn(4, &gvar.video.palette);
 #endif
 
-	IN_StartAck (&gvar);
-	MM_ShowMemory(&gvar);
-	while (!IN_CheckAck (&gvar)){}
+//	IN_StartAck (&gvar);	MM_ShowMemory(&gvar);	while (!IN_CheckAck (&gvar)){}
 #ifdef FADE
 	modexPalBlack();	//so player will not see loadings~
 #endif
@@ -155,7 +138,7 @@ void main(int argc, char *argv[])
 #ifdef FADE
 		modexFadeOff(4, &gvar.video.palette);
 #endif
-		Quit (&gvar, "Wrong ID for sprite");
+		Quit ("Wrong ID for sprite");
 #ifdef FADE
 		modexFadeOn(4, &gvar.video.dpal);
 #endif
@@ -236,7 +219,7 @@ void main(int argc, char *argv[])
 #endif
 		if(gvar.in.inst->Keyboard[sc_R]){ modexPalOverscan(rand()%56); } //r
 
-		if((gvar.player[0].enti.q==1) && !(gvar.player[0].enti.x%TILEWH==0 && gvar.player[0].enti.y%TILEWH==0)) Quit (&gvar, "PLAYER OFF THE RAILS!");//break;	//incase things go out of sync!
+		if((gvar.player[0].enti.q==1) && !(gvar.player[0].enti.x%TILEWH==0 && gvar.player[0].enti.y%TILEWH==0)) Quit ("PLAYER OFF THE RAILS!");//break;	//incase things go out of sync!
 	}
 
 	/* fade back to text mode */