X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fscroll.c;h=ceb76bcc9f4eb183074ec24ad58c72ea708b9ae2;hb=51b492de428068830f36b4ec57168f34c9477dab;hp=41251258b2c17e9902519d5c66502385a45d1780;hpb=66631d5409667cc804fe7e8622342e9b7d5436b5;p=16.git

diff --git a/src/scroll.c b/src/scroll.c
index 41251258..ceb76bcc 100755
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -20,75 +20,58 @@
  *
  */
 
-#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/16_dbg.h"
 
-//#define FADE
+#define FADE
 #define MODEX	//this is for mode x initiating
 
-//word far *clock= (word far*) 0x046C; /* 18.2hz clock */
-//bitmap_t *p;
 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;//1
 //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];
-	word pg;
+unsigned int i;
 //#ifdef FADE
-	//static word paloffset=0;
+	static word paloffset=0;
 	byte *dpal;
 //#endif
 	byte *gpal;
-	byte *ptr;
+//	byte *ptr;
 	byte *mappalptr;
 
 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;
 
 	Startup16(&gvar);
 
-	pan.pn=1;
+	gvar.video.panp=0;
 
 	/* 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");
 
 	/* draw the tiles */
 #ifdef MODEX
-	ptr = map.data;
-	//mappalptr = map.tiles->btdata->palette;
+//	ptr = map.data;
+//	mappalptr = map.tiles->btdata->palette;
 
 	/* data */
-	player[0].data = malloc(48*128); //TODO use exmm
-	*player[0].data = bitmapLoadPcx("data/chikyuu.pcx"); // load sprite
-
-	/* create the planar buffer */
-////++++	(player[0].data) = *planar_buf_from_bitmap(&p);
-	/*++++printf("load pee!!	");
-	pp = planar_buf_from_bitmap(&p);
-	printf("done!\n");*/
+	PCXBMP = bitmapLoadPcx("data/chikyuu.pcx", &gvar); // load sprite
 
 #endif
 	/*	input!	*/
-	IN_Default(0,&player,ctrl_Keyboard1);
+	IN_Default(0, &player,ctrl_Keyboard1);
 
 	/* save the palette */
 #ifdef MODEX
@@ -98,17 +81,16 @@ void main(int argc, char *argv[])
 	modexFadeOff(4, dpal);
 #endif
 
-	textInit();
 	VGAmodeX(bakapee, 1, &gvar);
-//	printf("%dx%d\n", gvar.video.page[0].sw, gvar.video.page[0].sh);
+
+	/* fix up the palette and everything */
 #ifdef FADE
 	modexPalBlack();	//reset the palette~
 #endif
 #endif
-//	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);
+//++++	PCXBMPVAR.offset=(paloffset/3);
+//++++	modexPalUpdate1(&PCXBMPVAR, &paloffset, 0, 0);
+	modexPalUpdate1(&PCXBMP->palette);
 //++++0000		modexPalUpdate1(map.tiles->btdata->palette);
 	//printf("	%d\n", sizeof(ptmp->data));
 	//printf("1:	%d\n", paloffset);
@@ -128,37 +110,26 @@ void main(int argc, char *argv[])
 
 	/* 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;
-	}
+	ZC_MVSetup(&mv, &map, &gvar);
+
 
 	/* 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);
+	mapGoTo(&mv, 0, 0);
 
-	//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;
+	playerXYpos(0, 0, &player, &mv, 0);
 	IN_initplayer(&player, 0);
 
 #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);
+	PBUFSFUN(&gvar.video.page[0], player[0].x, player[0].y-TILEWH, 16, 64, 16, 32,	PCXBMPPTR);
 #endif
 
-	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.
+	if(!pageflipflop)	VL_ShowPage(mv[1].page, 0, 0);//modexShowPage(mv[1].page);
+	else			ZC_ShowMV(&mv, 0, 0);//modexShowPage(mv[0].page);//!(gvar.video.p)
 
+	modexDrawBmp(&gvar.video.page[0], 16, 16, PCXBMPPTR);
 	/* 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);
@@ -189,9 +160,9 @@ void main(int argc, char *argv[])
 	//player movement
 		IN_ReadControl(0, &player);
 	if(!panswitch){
-		walk(mv, &player, 0);
+		ZC_walk(&mv, &player, 0);
 	}else{
-		panpagemanual(mv, &player, 0);
+		PANKEYFUN;//panPageManual(&mv, &player, 0);
 		//printf("	player[0].q: %d", player[0].q);	printf("	player[0].d: %d\n", player[0].d);
 	}
 
@@ -208,24 +179,17 @@ void main(int argc, char *argv[])
 	}
 	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
 #ifdef MODEX
 #ifdef FADE
-	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);
+	if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; modexpdump(mv[0].page); modexpdump(mv[1].page);  IN_UserInput(1,1); } //p
+	/*if(IN_KeyDown(22)){
+	paloffset=0; modexPalBlack(); modexPalUpdate(PCXBMPVAR, &paloffset, 0, 0);
 	printf("1paloffset	=	%d\n", paloffset/3);
 	 modexPalUpdate(map.tiles->data, &paloffset, 0, 0);
 	printf("2paloffset	=	%d\n", paloffset/3);
 	 modexpdump(mv[0].page); modexpdump(mv[1].page);
 		IN_UserInput(1,1);
-	}
+	}*/
 #endif
 #endif
 	//pan switch
@@ -257,20 +221,17 @@ 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, (PCXBMPVAR));
 	}
-	//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);
-	}*/
+	FUNCTIONKEYFUNCTIONS;
 
 	//9
-	if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate1(dpal); IN_UserInput(1,1); }
-	//if(IN_KeyDown(11)){ modexPalOverscan(15); }
+#ifdef FADE
+		if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate1(dpal); IN_UserInput(1,1); }
+#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!
 	}
 
@@ -288,14 +249,7 @@ void main(int argc, char *argv[])
 	printf("\nProject 16 scroll.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 MODEX
 #ifdef FADE
 	modexFadeOn(4, dpal);