X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2F0.c;h=b909273f88d9376857d75ab9a1e0f549d75c09e6;hb=340e87b918384afcde08592db5c24fc49ebf0694;hp=d1be46fd0f0e0382dffa0627660225610561948d;hpb=3506c6d20c6b49673eb3f527c25149b44f16ab12;p=16.git

diff --git a/src/0.c b/src/0.c
index d1be46fd..b909273f 100755
--- a/src/0.c
+++ b/src/0.c
@@ -15,7 +15,6 @@
 static byte palette[768];
 player_t player[MaxPlayers];
 map_view_t mv[4];
-pan_t pan;
 
 map_t map;//junk var
 
@@ -32,7 +31,7 @@ int main(int argc,char **argv)
 
 	boolean anim=1,noanim=0;
 
-	pan.pn=0;
+	gvar.video.panp=0;
 
 	bakapee1=malloc(64);
 	bakapee2=malloc(1024);
@@ -88,12 +87,12 @@ int main(int argc,char **argv)
 
 	IN_Startup();
 	IN_Default(0,&player,ctrl_Keyboard1);
-	IN_initplayer(&player, 0);
+	EN_initplayer(&player, 0);
 
 	/* setup camera and screen~ */
 	modexHiganbanaPageSetup(&gvar.video);
-	ZC_MVSetup(&mv, &map, &pan, &gvar);
-	//VL_ShowPage(&(gvar.video.page[pan.pn]), 0, 0);
+	ZC_MVSetup(&mv, &map, &gvar);
+	//VL_ShowPage(&(gvar.video.page[gvar.video.panp]), 0, 0);
 	ZC_ShowMV(&mv, 0, 0);
 
 	//DRAWCORNERBOXES;
@@ -141,8 +140,8 @@ int main(int argc,char **argv)
 			if(IN_KeyDown(sc_R)){
 				gvar.video.page[0].dx=gvar.video.page[0].dy=gvar.video.page[1].dx=gvar.video.page[1].dy=16;
 				mv[0].tx = mv[0].ty = mv[1].tx = mv[1].ty = INITTNUM;
-				modexShowPage(&(gvar.video.page[pan.pn]));
-				player[0].q = 1; player[0].d = 2;
+				modexShowPage(&(gvar.video.page[gvar.video.panp]));
+				player[0].enti.q = 1; player[0].enti.d = 2;
 				x=y=0;
 				xdir=ydir=1;
 				//TESTBG;
@@ -177,6 +176,7 @@ int main(int argc,char **argv)
 
 				/* then the sprite. note modding ram ptr means we just draw to (x&3,0) */
 draw_vrl1_vgax_modex(x-rx,y-ry,vrl_header,vrl_lineoffs,buffer+sizeof(*vrl_header),bufsz-sizeof(*vrl_header));
+//printf("x=%d	y=%d	rx=%d	ry=%d\n", x, y, rx, ry);
 
 				/* restore ptr */
 				vga_state.vga_graphics_ram = omemptr;