X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fzcroll.c;h=9b6ba75f2f8c2072360d0e2e59552d0a698e27ad;hb=ffbad4972c8eed182edd7c0ba1fef0bc1d457bf2;hp=29f329c89b1264b1381755b807a90a4c9c5ad745;hpb=63fe6f02c681d5afb8c32f6eadaacfc5f67d27cc;p=16.git

diff --git a/src/zcroll.c b/src/zcroll.c
index 29f329c8..9b6ba75f 100755
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
+ * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -22,68 +22,76 @@
 
 #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
+#define FADE
 
-//bitmap_t p;
 static map_t map;
 map_view_t mv[4];
 float t;
-sword bakapee;
-pan_t pan;
+
 //debugswitches
 boolean panswitch=0,baka=0;
 //extern boolean pageflipflop=1;
+boolean pagenorendermap = 0;	//default: 0
 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;
+//static word paloffset=0;
 byte *dpal;
 #endif
 byte *gpal;
 byte *ptr;
 memptr pal;
 
+#define FILENAME_1	"data/spri/chikyuu.vrs"
+#define FILENAME_1P	"data/spri/chikyuu.pal"
+#define FILENAME_2	"data/spri/ptmp.vrs"
+#define FILENAME_2P	"data/spri/ptmp.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
+	char *bakapee1,*bakapee1p;
+//	sword bakapee;
+// 	if(argv[1]) bakapee = atoi(argv[1]);
+// 	else bakapee = 1;
 
 	Startup16(&gvar);
 
-	pan.pn=0;
+	bakapee1=malloc(64);
+	bakapee1p=malloc(64);
+
+	if (argc < 2) {
+		//fprintf(stderr,"drawvrl <VRL file> <palette file>\n palette file optional\n");
+		bakapee1 =		FILENAME_1;
+		bakapee1p =	FILENAME_1P;
+
+	}else{
+		if(argv[1]) bakapee1 = argv[1];
+		if(argv[2]) bakapee1p = argv[2];
+	}
 
 	// 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));
-	player[0].ent->spri = malloc(sizeof(struct sprite));
-	player[0].ent->spri->spritesheet = malloc(sizeof(struct vrs_container));
+	//player[0].ent = malloc(sizeof(entity_t));
+	player[0].enti.spri = malloc(sizeof(struct sprite));
+	player[0].enti.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");
+//	initMap(&map);
+//	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
+	VRS_LoadVRS(bakapee1, &player[0].enti, &gvar);
 
-	//	input!
+	// input!
 	IN_Default(0, &player,ctrl_Keyboard1);
 
 	// save the palette
@@ -92,14 +100,18 @@ void main(int argc, char *argv[])
 	modexPalSave(dpal);
 	modexFadeOff(4, dpal);
 #endif
-	textInit();
-	VGAmodeX(bakapee, 1, &gvar);
-#ifdef MODEXZ
+
+	VGAmodeX(1/*bakapee*/, 1, &gvar);
+
+	/* fix up the palette and everything */
 #ifdef FADE
 	modexPalBlack();	//reset the palette~
 #endif
-	CA_LoadFile("data/spri/chikyuu.pal", &pal, &gvar);
-	modexPalUpdate1(pal);
+
+	/* load color palette */
+	VL_LoadPalFile(bakapee1p, &gvar.video.palette);
+// 	CA_LoadFile("data/spri/"BAKAPEEFILE1".pal", &pal, &gvar);
+// 	modexPalUpdate1(pal);
 #ifdef FADE
 	gpal = modexNewPal();
 	modexPalSave(gpal);
@@ -109,51 +121,32 @@ 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;
-	}
-	player[0].ent->spri->x = player[0].ent->spri->y = 20;
+	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);
-#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);
+	mapGoTo(&mv, 0, 0);
 
-	i = set_anim_by_id(player[0].ent->spri, 11);
-	print_anim_ids(player[0].ent->spri);
-	if (i == -1)
+	ZC_playerXYpos(0, 0, &player, &mv, 0, 1);
+	EN_initplayer(&player, 0, &gvar.video);
+	//print_anim_ids(player[0].enti.spri);
+	if (gvar.video.sprifilei == -1)
 	{
 #ifdef FADE
 		modexFadeOff(4, gpal);
 #endif
-		Quit(&gvar, "Wrong");
+		Quit(&gvar, "Wrong ID for sprite");
 #ifdef FADE
 		modexFadeOn(4, dpal);
 #endif
-	exit(-4);
 	}
-	//++++animate_spri(&(player[0].ent->spri));
 
-	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.
+//	while(!IN_KeyDown(sc_Escape) && !IN_KeyDown(sc_Space) && !IN_KeyDown(sc_Enter)){ FUNCTIONKEYSHOWMV }
+	shinku(&gvar);
 #ifdef FADE
 	modexFadeOn(4, gpal);
 #endif
-	modexDrawSprite(mv[0].page, 16, 16, (player[0].data));
-	/*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)
+	while(!IN_KeyDown(sc_Escape) && player[0].enti.hp>0)
 	{
 		shinku(&gvar);
 		//top left corner & bottem right corner of map veiw be set as map edge trigger since maps are actually square
@@ -163,12 +156,16 @@ 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_walk2(player[0].ent, mv);
+			ZC_walk(&mv, &player, 0);
+		}else{
+			PANKEYFUNZC;
+			//printf("	player[0].enti.q: %d", player[0].enti.q);	printf("	player[0].d: %d\n", player[0].d);
 		}
 
 		//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))
+		//if(((player[0].enti.triggerx == TRIGGX && player[0].enti.triggery == TRIGGY) && IN_KeyDown(0x1C))||(player[0].enti.tx == 5 && player[0].enti.ty == 5))
+		if(((mv[0].map->data[(player[0].enti.triggerx-1)+(map.width*(player[0].enti.triggery-1))] == 0) && IN_KeyDown(0x1C))||(player[0].enti.tx == 5 && player[0].enti.ty == 5))
 		{
 			short i;
 			for(i=800; i>=400; i--)
@@ -177,56 +174,39 @@ void main(int argc, char *argv[])
 			}
 			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(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); } //p
-		if(IN_KeyDown(22)){
-			printf("2paloffset	=	%d\n", paloffset/3);
-			IN_UserInput(1,1);
-		}
-#endif
+		if(player[0].enti.q == (TILEWH/(player[0].enti.speed))+1 && player[0].info.dir != 2 && (player[0].enti.triggerx == 5 && player[0].enti.triggery == 5)){ player[0].enti.hp--; }
+		//debugging binds!
 
-		//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+72, 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);
-		}*/
+		if(IN_KeyDown(24)){ modexPalUpdate0(gpal); /*paloffset=0;*/ modexpdump(mv[0].page); IN_UserInput(1,1); } //o
+		if(IN_KeyDown(22)){ modexPalUpdate0(gpal); } //u
 
-		//9
+		FUNCTIONKEYFUNCTIONS
+		FUNCTIONKEYDRAWJUNK
+		if(IN_KeyDown(sc_L)){ modexClearRegion(&gvar.video.page[0], player[0].enti.x, player[0].enti.y, 16, 16, 1); }
+		if(IN_KeyDown(sc_J) || IN_KeyDown(sc_K))
+		{
+			if(IN_KeyDown(sc_J))
+			{
+				bakapee1=FILENAME_1;
+				bakapee1p=FILENAME_1P;
+				player[0].enti.overdraww=0;
+			}
+			if(IN_KeyDown(sc_K))
+			{
+				bakapee1=FILENAME_2;
+				bakapee1p=FILENAME_2P;
+				player[0].enti.overdraww=2;
+			}
+			//read_vrs(&gvar, bakapee1, player[0].enti.spri->spritesheet);
+			VRS_ReadVRS(bakapee1, &player[0].enti, &gvar);
+			VL_LoadPalFile(bakapee1p, &gvar.video.palette);
+		}//JK
 #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;
+		if(IN_KeyDown(sc_R)){ modexPalOverscan(rand()%56); } //r
+
+		if((player[0].enti.q==1) && !(player[0].enti.x%TILEWH==0 && player[0].enti.y%TILEWH==0)) Quit(&gvar, "PLAYER OFF THE RAILS!");//break;	//incase things go out of sync!
 	}
 
 	/* fade back to text mode */
@@ -236,19 +216,11 @@ void main(int argc, char *argv[])
 	modexSavePalFile("data/g.pal", gpal);
 	modexFadeOff(4, gpal);
 #endif
-	VGAmodeX(0, 1, &gvar);
 	Shutdown16(&gvar);
 	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