X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fzcroll.c;h=888a00341c67bed7dffab102e30475518044f91a;hb=af2715fef8681d909afe82f7baaf5e13baabb76f;hp=0cdfadfe7b499f1936d5f1e9fbe48006d4412b5d;hpb=47c09acbb1eb6319d7327313668c4f0ec268f31b;p=16.git

diff --git a/src/zcroll.c b/src/zcroll.c
index 0cdfadfe..888a0034 100755
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -73,8 +73,7 @@ void main(int argc, char *argv[])
 
 	// OK, this one takes hellova time and needs to be done in farmalloc or MM_...
 	//IN CA i think you use CAL_SetupGrFile but i do think we should work together on this part --sparky4
-	//gvar.player[0].enti.spri = malloc(sizeof(struct sprite));
-	gvar.player[0].enti.spri.spritesheet = malloc(sizeof(struct vrs_container));
+	//----gvar.player[0].enti.spri.spritesheet = malloc(sizeof(struct vrs_container));
 
 	// create the map
 //	fprintf(stderr, "testing map load~	");
@@ -88,7 +87,7 @@ void main(int argc, char *argv[])
 	VRS_LoadVRS(bakapee1, &gvar.player[0].enti, &gvar);
 
 	// input!
-	IN_Default(0, &gvar.player[0],ctrl_Keyboard1);
+	IN_Default(0, &gvar.player[0],ctrl_Keyboard1, &gvar);
 
 	// save the palette
 #ifdef FADE
@@ -156,7 +155,7 @@ void main(int argc, char *argv[])
 		//when gvar.player[0].tx or gvar.player[0].ty == 0 or gvar.player[0].tx == 20 or gvar.player[0].ty == 15 then stop because that is edge of map and you do not want to walk of the map
 
 		//gvar.player movement
-		IN_ReadControl(&gvar.player[0]);
+		IN_ReadControl(&gvar.player[0], &gvar);
 		if(!panswitch){
 			//ZC_walk2(gvar.player[0].ent, mv);
 			ZC_walk(&gvar.mv, &gvar.player, 0);
@@ -179,7 +178,7 @@ void main(int argc, char *argv[])
 		if(gvar.player[0].enti.q == (TILEWH/(gvar.player[0].enti.speed))+1 && gvar.player[0].info.dir != 2 && (gvar.player[0].enti.triggerx == 5 && gvar.player[0].enti.triggery == 5)){ gvar.player[0].enti.hp--; }
 		//debugging binds!
 
-		if(IN_KeyDown(24)){ modexPalUpdate0(&gvar.video.palette); /*paloffset=0;*/ modexpdump(gvar.mv[0].page); IN_UserInput(1); } //o
+		if(IN_KeyDown(24)){ modexPalUpdate0(&gvar.video.palette); /*paloffset=0;*/ modexpdump(gvar.mv[0].page); IN_UserInput(1, &gvar); } //o
 		if(IN_KeyDown(22)){ modexPalUpdate0(&gvar.video.palette); } //u
 
 		TAIL_FUNCTIONKEYFUNCTIONS
@@ -204,7 +203,7 @@ void main(int argc, char *argv[])
 			VL_LoadPalFile(bakapee1p, &gvar.video.palette);
 		}//JK
 #ifdef FADE
-		if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate(gvar.video.dpal); IN_UserInput(1); }
+		if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate(gvar.video.dpal); IN_UserInput(1, &gvar); }
 #endif
 		if(IN_KeyDown(sc_R)){ modexPalOverscan(rand()%56); } //r