X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fzcroll.c;h=0ec3b84790401f89aaaa220b3ff25f012c56efc6;hb=fff0f71242f32851524284239d75b294f1fadf07;hp=3162336759841b37722be8febc8497033898c6a3;hpb=fb97121f7d0be4408d8e2ed98a2f7b10b852a915;p=16.git

diff --git a/src/zcroll.c b/src/zcroll.c
index 31623367..0ec3b847 100755
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -20,248 +20,224 @@
  *
  */
 
-#include "src/lib/scroll16.h"
+#include "src/lib/16_scr.h"
 #include "src/lib/16_timer.h"
 #include "src/lib/wcpu/wcpu.h"
+#include "src/lib/16render.h"
+#include "src/lib/16_dbg.h"
 
-//word far *clock= (word far*) 0x046C; /* 18.2hz clock */
-//bitmap_t *p;
+#define MODEXZ
+boolean dbg_noplayerinpu=0;
+
+//TODO: known issues the array dependent mv stuff and player arrays
 global_game_variables_t gvar;
 static map_t map;
 player_t player[MaxPlayers];
 map_view_t mv[4];
-//word pn=0; //i forgot ww
 float t;
 sword bakapee;
 pan_t pan;
 //debugswitches
 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 */
+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];
-	word pg;
-//#ifdef FADE
-	static word paloffset=0;
-	byte *dpal;
-//#endif
-	byte *gpal;
-	byte *ptr;
-	byte *mappalptr;
+//map_view_db_t pgid[4];
+word pg;
+#ifdef FADE
+static word paloffset=0;
+byte *dpal;
+#endif
+byte *gpal;
+byte *ptr;
+memptr pal;
 
 void main(int argc, char *argv[])
 {
-	byte *mesg=malloc(sizeof(dword));
-
 	if(argv[1]) bakapee = atoi(argv[1]);
 	else bakapee = 1;
 
 	Startup16(&gvar);
 
-	pan.pn=1;
+	pan.pn=0;
+	// OK, this one takes hellova time and needs to be done in farmalloc or MM_...
+	//TODO: USE MM AND CA AND PM WWWWWWWW
+	player[0].ent = malloc(sizeof(entity_t));
+	player[0].ent->spri = malloc(sizeof(struct sprite));
+	player[0].ent->spri->spritesheet = malloc(sizeof(struct vrs_container));
 
-	/* create the map */
+	// create the map
 	fprintf(stderr, "testing map load~	");
 	loadmap("data/test.map", &map);
 	chkmap(&map, 0);
 	printf("chkmap ok	");
 	fprintf(stderr, "yay map loaded~~\n");
 
-	/* draw the tiles */
-	ptr = map.data;
-	//mappalptr = map.tiles->btdata->palette;
-
-	/* data */
-	if(CA_LoadFile("data/spri/chikyuu.vrs", &(player[0].gr), &gvar)) baka=1; else baka=0;
+	// data
+	read_vrs(&gvar, "data/spri/chikyuu.vrs", player[0].ent->spri->spritesheet);
 
-	/* create the planar buffer */
-////++++	(player[0].data) = *planar_buf_from_bitmap(&p);
-	/*++++printf("load pee!!	");
-	pp = planar_buf_from_bitmap(&p);
-	printf("done!\n");*/
+	//	input!
+if(!dbg_noplayerinpu)
+	IN_Default(0, &player,ctrl_Keyboard1);
 
-	/*	input!	*/
-	IN_Default(0,&player,ctrl_Joystick);
-	//IN_Default(1,&player,ctrl_Joystick);
-
-	/* save the palette */
+	// save the palette
+#ifdef FADE
 	dpal = modexNewPal();
 	modexPalSave(dpal);
 	modexFadeOff(4, dpal);
-
+#endif
 	textInit();
 	VGAmodeX(bakapee, 1, &gvar);
-//	printf("%dx%d\n", gvar.video.page[0].sw, gvar.video.page[0].sh);
+#ifdef MODEXZ
+#ifdef FADE
 	modexPalBlack();	//reset the palette~
-
-//	printf("Total used @ before palette initiation:		%zu\n", oldfreemem-GetFreeSize());
-//++++	player[0].data.offset=(paloffset/3);
-//++++	modexPalUpdate1(&player[0].data, &paloffset, 0, 0);
-		modexPalUpdate1(player[0].data->palette);
-//++++0000		modexPalUpdate1(map.tiles->btdata->palette);
-	//printf("	%d\n", sizeof(ptmp->data));
-	//printf("1:	%d\n", paloffset);
-//++++	map.tiles->data->offset=(paloffset/3);
-	//XTmodexPalUpdate(map.tiles->data, &paloffset, 0, 0);
-//	printf("\n====\n");
-//	printf("0	paloffset=	%d\n", paloffset/3);
-//	printf("====\n\n");
-
+	CA_LoadFile("data/spri/chikyuu.pal", &pal, &gvar);
+	modexPalUpdate1(pal);
 	gpal = modexNewPal();
 	modexPalSave(gpal);
 	modexSavePalFile("data/g.pal", gpal);
 	modexPalBlack();	//so player will not see loadings~
+#endif
+
+	// setup camera and screen~
+	strcpy(global_temp_status_text, "press a key for video setup");
+	modexprint(mv[0].page, 0, 64, 1, 7, 0, global_temp_status_text);
 
-	/* setup camera and screen~ */
 	modexHiganbanaPageSetup(&gvar.video);
-	for(i=0;i<gvar.video.num_of_pages;i++)
-	{
-		mv[i].page = &gvar.video.page[i];
-		mv[i].map = &map;
-		mv[i].video = &gvar.video;
-		mv[i].pan	= &pan;
-	}
+	mv[0].page = &gvar.video.page[0];
+	mv[0].map = &map;
+	mv[0].video = &gvar.video;
+	mv[0].pan	= &pan;
+	player[0].ent->spri->x = player[0].ent->spri->y = 20;
 
-	/* set up paging */
+	// 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);
-	//_fmemcpy(mv[1].page->data, mv[0].page->data, mv[0].page->pagesize);
+#endif
 
 	//TODO: put player in starting position of spot
 	//default player position on the viewable map
 	player[0].tx = mv[0].tx + mv[0].page->tilemidposscreenx;
 	player[0].ty = mv[0].ty + mv[0].page->tilemidposscreeny;
 	IN_initplayer(&player, 0);
-	//IN_initplayer(&player, 1);
 
-#ifndef	SPRITE
-	modexClearRegion(mv[0].page, player[0].x, player[0].y-TILEWH, 16, 32, 15);
-	//modexClearRegion(mv[1].page, player[0].x, player[0].y-TILEWH, 16, 32, 15);
-#else
-	//PBUFSFUN(mv[1].page, player[0].x, player[0].y-TILEWH, 16, 64, 24, 32,	PLAYERBMPDATA);
-	PBUFSFUN(mv[0].page, player[0].x, player[0].y-TILEWH, 16, 64, 16, 32,	player[0].data);
+	i = set_anim_by_id(player[0].ent->spri, 11);
+	print_anim_ids(player[0].ent->spri);
+	if (i == -1)
+	{
+#ifdef FADE
+		modexFadeOff(4, gpal);
 #endif
+	VGAmodeX(0, 1, &gvar);
+	Shutdown16(&gvar);
+	printf("Wrong");
+#ifdef FADE
+		modexFadeOn(4, dpal);
+#endif
+	exit(-4);
+	}
+	//animate_spri(&(player[0].ent->spri));
 
-	if(!pageflipflop)	modexShowPage(mv[1].page);
-	else			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.
-
-	/* buffer pages */
-// 	modexClearRegion(mv[2].page, 0, 0, mv[2].page->width, mv[2].page->height, 47);
-// 	modexClearRegion(mv[3].page, 0, 0, mv[3].page->width, mv[3].page->height, 45);
-// 	{
-// 		unsigned int k,j,o;
-// 		/* fill screen with a distinctive pattern */
-// 		for (k=0;k < vga_state.vga_width;k++) {
-// 			o = k >> 2;
-// 			vga_write_sequencer(0x02/*map mask*/,1 << (k&3));
-// 				for (j=0;j < vga_state.vga_height;j++,o += vga_state.vga_stride)
-// 					vga_state.vga_graphics_ram[o] = (k^j)&15; // VRL samples put all colors in first 15!
-// 		}
-// 	}
-	modexClearRegion(mv[3].page, 0, 128, 24, 36, 15);
-
+	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);
-	while(!IN_KeyDown(sc_Escape) && player[0].hp>0)
+#endif
+	if(!dbg_noplayerinpu)
+	while(!IN_KeyDown(sc_Escape))// && player[0].hp>0)
 	{
 		shinku(&gvar);
-	//top left corner & bottem right corner of map veiw be set as map edge trigger since maps are actually square
-	//to stop scrolling and have the player position data move to the edge of the screen with respect to the direction
-	//when player[0].tx or player[0].ty == 0 or player[0].tx == 20 or player[0].ty == 15 then stop because that is edge of map and you do not want to walk of the map
+		//top left corner & bottem right corner of map veiw be set as map edge trigger since maps are actually square
+		//to stop scrolling and have the player position data move to the edge of the screen with respect to the direction
+		//when player[0].tx or player[0].ty == 0 or player[0].tx == 20 or player[0].ty == 15 then stop because that is edge of map and you do not want to walk of the map
 
-	//player movement
-		IN_ReadControl(0,&player);
-	if(!panswitch){
-		walk(mv, player, 0);
-	}else{
-		panpagemanual(mv, player, 0);
-		//printf("	player[0].q: %d", player[0].q);	printf("	player[0].d: %d\n", player[0].d);
-	}
+		//player movement
+		IN_ReadControl(0, &player);
+		if(!panswitch){
+			ZC_walk(player[0].ent, mv);
+			//walk(mv, &player, 0);
+		}
 
-	//the scripting stuff....
-	//if(((player[0].triggerx == TRIGGX && player[0].triggery == TRIGGY) && IN_KeyDown(0x1C))||(player[0].tx == 5 && player[0].ty == 5))
-	if(((mv[0].map->data[(player[0].triggerx-1)+(map.width*(player[0].triggery-1))] == 0) && IN_KeyDown(0x1C))||(player[0].tx == 5 && player[0].ty == 5))
-	{
-		short i;
-		for(i=800; i>=400; i--)
+		//the scripting stuff....
+/*		if(((mv[0].map->data[(player[0].triggerx-1)+(map.width*(player[0].triggery-1))] == 0) && IN_KeyDown(0x1C))||(player[0].tx == 5 && player[0].ty == 5))
 		{
-			sound(i);
+			short i;
+			for(i=800; i>=400; i--)
+			{
+				sound(i);
+			}
+			nosound();
 		}
-		nosound();
-	}
-	if(player[0].q == (TILEWH/(player[0].speed))+1 && player[0].info.dir != 2 && (player[0].triggerx == 5 && player[0].triggery == 5)){ player[0].hp--; }
-	//debugging binds!
-	if(IN_KeyDown(2)){ modexShowPage(mv[0].page); pan.pn=0; }
-	if(IN_KeyDown(3)){ modexShowPage(mv[1].page); pan.pn=1; }
-	if(IN_KeyDown(4)){ modexShowPage(mv[2].page); pan.pn=2; }
-	if(IN_KeyDown(4+1)){ modexShowPage(mv[3].page); pan.pn=3; }
-	if(IN_KeyDown(25)){ modexpdump(mv[0].page); modexpdump(mv[1].page);
-		 IN_UserInput(1,1);
-	}	//p
-	if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; modexpdump(mv[0].page); modexpdump(mv[1].page);  IN_UserInput(1,1); }
-	if(IN_KeyDown(22)){
-	paloffset=0; modexPalBlack(); modexPalUpdate(player[0].data, &paloffset, 0, 0);
-	printf("2paloffset	=	%d\n", paloffset/3);
-	 modexpdump(mv[0].page); modexpdump(mv[1].page);
-		IN_UserInput(1,1);
-	}
+		if(player[0].q == (TILEWH/(player[0].speed))+1 && player[0].info.dir != 2 && (player[0].triggerx == 5 && player[0].triggery == 5)){ player[0].hp--; }
+*/		//debugging binds!
+		if(IN_KeyDown(2)){ modexShowPage(mv[0].page); pan.pn=0; }
+		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
 
-	//pan switch
-	if(IN_KeyDown(88)){panswitch=!panswitch; IN_UserInput(1,1);}	//f12
-	if(IN_KeyDown(87))	//f11
-	{
-		pageflipflop=!pageflipflop;
-		IN_UserInput(1,1);
-// 		VGAmodeX(0, 0, &gvar);
-// 		IN_Shutdown();
-// 		__asm
-// 		{
-// 			mov ah,31h
-// 			int 21h
-// 		}
-	}
-	if(IN_KeyDown(68))	//f10
-	{
-		gvar.kurokku.fpscap=!gvar.kurokku.fpscap;
-		IN_UserInput(1,1);
-	}
-	if(IN_KeyDown(67))	//f9
-	{
-		modexClearRegion(mv[1].page, 0, 0, mv[1].page->width, mv[1].page->height, 2);
-		modexClearRegion(mv[2].page, 0, 0, mv[2].page->width, mv[2].page->height, 3);
-		modexClearRegion(mv[3].page, 0, 0, mv[3].page->width, mv[3].page->height, 4);
-		modexClearRegion(mv[3].page, 0, 0, 20, 36, 15);
-		//IN_UserInput(1,1);
-	}
-	if(IN_KeyDown(66))	//f8
-	{
-//		modexDrawSprite(mv[0].page, 16, 16, p);
-		modexDrawSprite(mv[0].page, 32+48, 16, (player[0].data));
-	}
-	//TODO fmemtest into page
-	/*if(IN_KeyDown(4+1))	//4
-	{
-		pg=1;
-		SELECT_ALL_PLANES();
-		_fmemset(((mv[pg].page->data+4)+(16*(mv[pg].page->width/4))), 15, 4);
-	}*/
+		//pan switch
+		if(IN_KeyDown(88)){panswitch=!panswitch; IN_UserInput(1,1);}	//f12
+		if(IN_KeyDown(87))	//f11
+		{
+			pageflipflop=!pageflipflop;
+			IN_UserInput(1,1);
+		}
+		if(IN_KeyDown(68))	//f10
+		{
+			gvar.kurokku.fpscap=!gvar.kurokku.fpscap;
+			IN_UserInput(1,1);
+		}
+		if(IN_KeyDown(67))	//f9
+		{
+			modexClearRegion(mv[0].page, 0, 0, mv[0].page->width, mv[0].page->height, 2);
+		}
+		if(IN_KeyDown(66))	//f8
+		{
+	//		modexDrawSprite(mv[0].page, 16, 16, p);
+			modexDrawSprite(mv[0].page, 32+48, 16, (player[0].data));
+		}
+		//TODO fmemtest into page
+		/*if(IN_KeyDown(4+1))	//4
+		{
+			pg=1;
+			SELECT_ALL_PLANES();
+			_fmemset(((mv[pg].page->data+4)+(16*(mv[pg].page->width/4))), 15, 4);
+		}*/
 
-	//9
-	if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate1(dpal); IN_UserInput(1,1); }
-	//if(IN_KeyDown(11)){ modexPalOverscan(15); }
-	if((player[0].q==1) && !(player[0].x%TILEWH==0 && player[0].y%TILEWH==0)) break;	//incase things go out of sync!
+		//9
+#ifdef FADE
+		if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate1(dpal); IN_UserInput(1,1); }
+		//if(IN_KeyDown(11)){ modexPalOverscan(15); }
+#endif
+		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;
 	}
 
+	else
+		while(!kbhit())
+		{
+			shinku(&gvar);
+		}
+
 	/* fade back to text mode */
 	/* but 1st lets save the game palette~ */
+#ifdef FADE
 	modexPalSave(gpal);
 	modexSavePalFile("data/g.pal", gpal);
 	modexFadeOff(4, gpal);
+#endif
 	VGAmodeX(0, 1, &gvar);
 	Shutdown16(&gvar);
-	printf("\nProject 16 scroll.exe. This is just a test file!\n");
+	printf("\nProject 16 zcroll.exe. This is just a test file!\n");
 	printf("version %s\n", VERSION);
 	printf("tx: %d	", mv[0].tx);
 	printf("ty: %d\n", mv[0].ty);
@@ -284,8 +260,6 @@ void main(int argc, char *argv[])
 	//printf("mv[%u].tx: %d", pan.pn, mv[pan.pn].tx); printf("	mv[%u].ty: %d	", pan.pn, mv[pan.pn].ty);
 	printf("gvar.video.p=%u ", gvar.video.p); printf("gvar.video.r=%u ", gvar.video.r);
 	printf("pageflipflop=%u\n", pageflipflop);
-	//0000printf("\ngvar.video.tickclk=%f\n", gvar.video.tickclk);
-	//0000printf("gvar.video.clk=%f", gvar.video.clk);
 	printf("\n");
 	//printf("map.width=%d	map.height=%d	map.data[0]=%d\n", mv[0].map->width, mv[0].map->height, mv[0].map->data[0]);
 
@@ -298,5 +272,7 @@ void main(int argc, char *argv[])
 		default: cpus = "internal error"; break;
 	}
 	printf("detected CPU type: %s\n", cpus);
+#ifdef FADE
 	modexFadeOn(4, dpal);
+#endif
 }