X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fzcroll.c;h=e1b3c55799e3582fec76ef784b3dbf6d2189c6cb;hb=285987ea5f697bbd8dbd273a39345f892fa0caa9;hp=a28522d71f4ded0c85f7d199ef5412fd13af310c;hpb=d1ad125567c999bff1adeff2e0f5b1ada15ebd2d;p=16.git

diff --git a/src/zcroll.c b/src/zcroll.c
index a28522d7..e1b3c557 100755
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -20,18 +20,15 @@
  *
  */
 
-#include "src/lib/16_scr.h"
+#include "src/lib/scroll16.h"
 #include "src/lib/16_timer.h"
-#include "src/lib/wcpu/wcpu.h"
 #include "src/lib/16render.h"
 #include "src/lib/16_dbg.h"
 
 #define MODEXZ
 
-//TODO: known issues the array dependent mv stuff and player arrays
-global_game_variables_t gvar;
+//bitmap_t p;
 static map_t map;
-player_t player[MaxPlayers];
 map_view_t mv[4];
 float t;
 sword bakapee;
@@ -40,7 +37,6 @@ pan_t pan;
 boolean panswitch=0,baka=0;
 //extern boolean pageflipflop=1;
 unsigned int i;
-const char *cpus;
 //static int persist_aniframe = 0;    /* gonna be increased to 1 before being used, so 0 is ok for default */
 
 //map_view_db_t pgid[4];
@@ -55,12 +51,18 @@ memptr pal;
 
 void main(int argc, char *argv[])
 {
+	static global_game_variables_t gvar;
+	static player_t player[MaxPlayers];
 	if(argv[1]) bakapee = atoi(argv[1]);
 	else bakapee = 1;
 
+	player[0].data = _fmalloc(72*128); //TODO use exmm
+	*player[0].data = bitmapLoadPcx("data/chikyuu.pcx", &gvar); // load sprite
+
 	Startup16(&gvar);
 
 	pan.pn=0;
+
 	// 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
 	player[0].ent = malloc(sizeof(entity_t));
@@ -68,14 +70,16 @@ void main(int argc, char *argv[])
 	player[0].ent->spri->spritesheet = malloc(sizeof(struct vrs_container));
 
 	// create the map
-	fprintf(stderr, "testing map load~	");
+//	fprintf(stderr, "testing map load~	");
 	loadmap("data/test.map", &map);
 	chkmap(&map, 0);
-	printf("chkmap ok	");
-	fprintf(stderr, "yay map loaded~~\n");
+//	printf("chkmap ok	");
+//	fprintf(stderr, "yay map loaded~~\n");
 
 	// data
 	read_vrs(&gvar, "data/spri/chikyuu.vrs", player[0].ent->spri->spritesheet);
+//	player[0].data = malloc(72*128); //TODO use exmm
+//	*player[0].data = bitmapLoadPcx("data/chikyuu.pcx", &gvar); // load sprite
 
 	//	input!
 	IN_Default(0, &player,ctrl_Keyboard1);
@@ -86,16 +90,15 @@ void main(int argc, char *argv[])
 	modexPalSave(dpal);
 	modexFadeOff(4, dpal);
 #endif
-	textInit();
+	//textInit();
 	VGAmodeX(bakapee, 1, &gvar);
-	//strcpy(global_temp_status_text, "press enter for video setup\nescape to quit");
-	//modexprint(&gvar.video.page[0], 64, 64, 1, 7, 0, global_temp_status_text);
-	//while(!IN_KeyDown(sc_Enter)){ if(IN_KeyDown(sc_Escape)) goto quit; } IN_UserInput(1,1); //wwww
 #ifdef MODEXZ
 #ifdef FADE
 	modexPalBlack();	//reset the palette~
+#endif
 	CA_LoadFile("data/spri/chikyuu.pal", &pal, &gvar);
 	modexPalUpdate1(pal);
+#ifdef FADE
 	gpal = modexNewPal();
 	modexPalSave(gpal);
 	modexSavePalFile("data/g.pal", gpal);
@@ -103,9 +106,6 @@ void main(int argc, char *argv[])
 #endif
 
 	// setup camera and screen~
-	strcpy(global_temp_status_text, "press enter for page setup\nescape to quit");
-	modexprint(&gvar.video.page[0], 64, 64, 1, 7, 0, global_temp_status_text);
-	while(!IN_KeyDown(sc_Enter)){ if(IN_KeyDown(sc_Escape)) goto quit; } IN_UserInput(1,1); //wwww
 	modexHiganbanaPageSetup(&gvar.video);
 	for(i=0;i<gvar.video.num_of_pages;i++)
 	{
@@ -114,17 +114,11 @@ void main(int argc, char *argv[])
 		mv[i].video = &gvar.video;
 		mv[i].pan	= &pan;
 	}
-	player[0].ent->spri->x = player[0].ent->spri->y = 20;
+	player[0].ent->spri->x = player[0].ent->spri->y = TILEWH;
 
-	strcpy(global_temp_status_text, "press enter for mapGoTo setup\nescape to quit");
-	modexprint(mv[0].page/*&gvar.video.page[0]*/, 64, 64, 1, 7, 0, global_temp_status_text);
-	while(!IN_KeyDown(sc_Enter)){ if(IN_KeyDown(sc_Escape)) goto quit; } IN_UserInput(1,1); //wwww
 	// set up paging
 	//TODO: LOAD map data and position the map in the middle of the screen if smaller then screen
 	mapGoTo(mv, 0, 0);
-	strcpy(global_temp_status_text, "press enter for final initiation setup\nescape to quit");
-	modexprint(&gvar.video.page[0], 64, 64, 1, 7, 0, global_temp_status_text);
-	while(!IN_KeyDown(sc_Enter)){ if(IN_KeyDown(sc_Escape)) goto quit; } IN_UserInput(1,1); //wwww
 #endif
 
 	//TODO: put player in starting position of spot
@@ -140,21 +134,21 @@ void main(int argc, char *argv[])
 #ifdef FADE
 		modexFadeOff(4, gpal);
 #endif
-	VGAmodeX(0, 1, &gvar);
-	Shutdown16(&gvar);
-	printf("Wrong");
+		Quit(&gvar, "Wrong");
 #ifdef FADE
 		modexFadeOn(4, dpal);
 #endif
-	exit(-4);
 	}
-	//animate_spri(&(player[0].ent->spri));
+	animate_spri((player[0].ent->spri), &gvar);
 
 	modexShowPage(mv[0].page);//!(gvar.video.p)
 	shinku_fps_indicator_page = 0; // we're on page 1 now, shinku(). follow along please or it will not be visible.
 #ifdef FADE
 	modexFadeOn(4, gpal);
 #endif
+	/*strcpy(global_temp_status_text, "press enter for the loop of zcroll\nescape to quit");
+	modexprint(&gvar.video.page[0], 144, 72, 1, 7, 0, global_temp_status_text);
+	while(!IN_KeyDown(sc_Enter)){ if(IN_KeyDown(sc_Escape)) goto quit; } IN_UserInput(1,1);*///wwww
 	while(!IN_KeyDown(sc_Escape))// && player[0].hp>0)
 	{
 		shinku(&gvar);
@@ -165,8 +159,8 @@ void main(int argc, char *argv[])
 		//player movement
 		IN_ReadControl(0, &player);
 		if(!panswitch){
-			ZC_walk(player[0].ent, mv);
-			//walk(mv, &player, 0);
+			//ZC_walk(player[0].ent, mv);
+			walk(mv, &player, 0);
 		}
 
 		//the scripting stuff....
@@ -185,13 +179,9 @@ void main(int argc, char *argv[])
 		if(IN_KeyDown(25)){ modexpdump(mv[0].page);
 			 IN_UserInput(1,1);
 		}	//p
-#ifdef FADE
-		if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; modexpdump(mv[0].page); IN_UserInput(1,1); }
-		if(IN_KeyDown(22)){
-			printf("2paloffset	=	%d\n", paloffset/3);
-			IN_UserInput(1,1);
-		}
-#endif
+
+		if(IN_KeyDown(24)){ modexPalUpdate0(gpal); /*paloffset=0;*/ modexpdump(mv[0].page); IN_UserInput(1,1); } //o
+		if(IN_KeyDown(22)){ modexPalUpdate0(gpal); } //u
 
 		//pan switch
 		if(IN_KeyDown(88)){panswitch=!panswitch; IN_UserInput(1,1);}	//f12
@@ -211,8 +201,18 @@ void main(int argc, char *argv[])
 		}
 		if(IN_KeyDown(66))	//f8
 		{
-	//		modexDrawSprite(mv[0].page, 16, 16, p);
-			modexDrawSprite(mv[0].page, 32+48, 16, (player[0].data));
+//			modexDrawSprite(mv[0].page, 16, 16, &p);
+//			modexDrawSprite(mv[0].page, 32+72, 16, (player[0].data));
+			switch(i)
+			{
+				case 11:
+					i=0;
+					player[0].ent->spri->x = 0;
+				default:
+					i++;
+					player[0].ent->spri->delay = 1; animate_spri((player[0].ent->spri), &gvar); player[0].ent->spri->x += 20;
+				break;
+			}
 		}
 		//TODO fmemtest into page
 		/*if(IN_KeyDown(4+1))	//4
@@ -225,15 +225,15 @@ void main(int argc, char *argv[])
 		//9
 #ifdef FADE
 		if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate1(dpal); IN_UserInput(1,1); }
-		//if(IN_KeyDown(11)){ modexPalOverscan(15); }
 #endif
+		if(IN_KeyDown(sc_R)){ modexPalOverscan(rand()%56); } //r
+
 		if((player[0].q==1) && !(player[0].x%TILEWH==0 && player[0].y%TILEWH==0)) break;	//incase things go out of sync!
 		player[0].hp = 0;
 	}
 
 	/* fade back to text mode */
 	/* but 1st lets save the game palette~ */
-	quit:
 #ifdef FADE
 	modexPalSave(gpal);
 	modexSavePalFile("data/g.pal", gpal);
@@ -244,14 +244,7 @@ void main(int argc, char *argv[])
 	printf("\nProject 16 zcroll.exe. This is just a test file!\n");
 	printf("version %s\n", VERSION);
 	SCROLLEXITMESG;
-	switch(detectcpu())
-	{
-		case 0: cpus = "8086/8088 or 186/88"; break;
-		case 1: cpus = "286"; break;
-		case 2: cpus = "386 or newer"; break;
-		default: cpus = "internal error"; break;
-	}
-	printf("detected CPU type: %s\n", cpus);
+	WCPU_cpufpumesg();
 #ifdef FADE
 	modexFadeOn(4, dpal);
 #endif