X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2F0tesuto.c;h=f58b0a0ad6a47250cd6f5a93fc2e3cda2fabd1a5;hb=5ad8cc4e485b54223dac7f5416ce8463e4dc09a4;hp=fb3d0fc908ebf8c2f972324c5fc6aefbe603ed68;hpb=87088c254614070c598ac105d2d89c9d453ee7e3;p=16.git

diff --git a/src/0tesuto.c b/src/0tesuto.c
index fb3d0fc9..f58b0a0a 100755
--- a/src/0tesuto.c
+++ b/src/0tesuto.c
@@ -29,9 +29,11 @@
 
 //#define FILENAME_1 "data/aconita.vrl"
 //#define FILENAME_2 "data/aconita.pal"
-#define FILENAME_1 "data/spri/chikyuu.vrl"
+#define FILENAME_1 "data/spri/chistnd.vrl"
 #define FILENAME_2 "data/spri/chikyuu.pal"
 
+//#define ZSP
+
 #define INITTNUM 1
 
 map_view_t mv[4];
@@ -41,7 +43,7 @@ int main(int argc,char **argv)
 {
 	static global_game_variables_t gvar;
 	struct vrl1_vgax_header *vrl_header;
-	vrl1_vgax_offset_t *vrl_lineoffs;
+	vrl1_vgax_offset_t *line_offsets;
 	unsigned char *buffer;
 	unsigned int bufsz;
 	int fd;
@@ -50,10 +52,10 @@ int main(int argc,char **argv)
 	char bakapee1[64] = FILENAME_1;
 	char bakapee2[64] = FILENAME_2;
 
-	boolean anim=1,noanim=0,zerostoppause=1;
-
-//	bakapee1=mALLoc(64);
-//	bakapee2=mALLoc(64);
+	boolean anim=1,noanim=0;
+#ifdef ZSP
+	boolean zerostoppause=1;
+#endif
 
 	if (argc >= 2) {
 /*	if (argc < 2) {
@@ -103,8 +105,8 @@ int main(int argc,char **argv)
 	VL_LoadPalFile(bakapee2, &gvar.video.palette, &gvar);
 
 	/* preprocess the sprite to generate line offsets */
-	vrl_lineoffs = vrl1_vgax_genlineoffsets(vrl_header,buffer+sizeof(*vrl_header),bufsz-sizeof(*vrl_header));
-	if (vrl_lineoffs == NULL) return 1;
+	line_offsets = vrl1_vgax_genlineoffsets(vrl_header,buffer+sizeof(*vrl_header),bufsz-sizeof(*vrl_header));
+	if (line_offsets == NULL) return 1;
 
 	IN_Startup(&gvar);
 	IN_Default(0,&gvar.player[0],ctrl_Keyboard1, &gvar);
@@ -113,7 +115,8 @@ int main(int argc,char **argv)
 	/* setup camera and screen~ */
 	modexHiganbanaPageSetup(&gvar);
 	ZC_MVSetup(&gvar.mv, &map, &gvar);
-	ZC_ShowMV(&gvar.mv, gvar.video.sp, 0);
+	//ZC_ShowMV(&gvar.mv, gvar.video.sp, 0);
+	VL_ShowPage(&gvar.video.page[gvar.video.sp], 0, 0);
 
 //	VL_PatternDraw(video_t *video, word pn, boolean sw, boolean allsw);
 	VL_PatternDraw(&gvar.video, 0/*gvar.video.sp*/, 0, 1);
@@ -148,11 +151,17 @@ int main(int argc,char **argv)
 			IN_ReadControl(&gvar.player[0], &gvar);
 			if(gvar.in.inst->Keyboard[68]){ gvar.kurokku.fpscap=!gvar.kurokku.fpscap; IN_UserInput(1, &gvar); } //f10
 			TAIL_PANKEYFUN;
-			if(gvar.in.inst->Keyboard[sc_Space] || zerostoppause)	//space
+			if(gvar.in.inst->Keyboard[sc_Space]
+#ifdef ZSP
+				|| zerostoppause
+#endif
+)	//space
 			{
 				anim=!anim;
 				DRAWCORNERBOXES;
+#ifdef ZSP
 				if(!zerostoppause) IN_UserInput(1, &gvar); else zerostoppause=0;
+#endif
 			}
 			if(gvar.in.inst->Keyboard[sc_R]){
 				gvar.video.page[0].dx=gvar.video.page[0].dy=gvar.video.page[1].dx=gvar.video.page[1].dy=16;
@@ -190,7 +199,7 @@ int main(int argc,char **argv)
 				vga_state.vga_graphics_ram = omemptr + gvar.video.page[0].pagesize + gvar.video.page[1].pagesize;
 
 				/* 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));
+draw_vrl1_vgax_modex(x-rx,y-ry,vrl_header,line_offsets,buffer+sizeof(*vrl_header),bufsz-sizeof(*vrl_header));
 //printf("x=%d	y=%d	rx=%d	ry=%d\n", x, y, rx, ry);
 
 				/* restore ptr */
@@ -222,7 +231,8 @@ draw_vrl1_vgax_modex(x-rx,y-ry,vrl_header,vrl_lineoffs,buffer+sizeof(*vrl_header
 
 //===========================================================================//
 
-	ZC_ShowMV(&gvar.mv, 0, 0);
+	//ZC_ShowMV(&gvar.mv, 0, 0);
+	VL_ShowPage(&gvar.video.page[gvar.video.sp], 0, 0);
 if(!noanim) {
 	/* another handy "demo" effect using VGA write mode 1.
 	 * we can take what's on screen and vertically squash it like an old analog TV set turning off. */
@@ -308,7 +318,7 @@ if(!noanim) {
 }
 	IN_Shutdown(&gvar);
 	VGAmodeX(0, 1, &gvar);
-	free(vrl_lineoffs);
+	free(line_offsets);
 	buffer = NULL;
 	free(buffer);
 	bufsz = 0;