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

diff --git a/src/zcroll.c b/src/zcroll.c
index e1b3c557..888a0034 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.
  *
@@ -25,146 +25,148 @@
 #include "src/lib/16render.h"
 #include "src/lib/16_dbg.h"
 
-#define MODEXZ
+#define FADE
 
-//bitmap_t p;
+//map_view_t mv[4];
 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;
+extern boolean pagenorendermap;	//default: 0
 unsigned int i;
-//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;
+//static word paloffset=0;
 #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/me.vrs"
+#define FILENAME_2P	"data/spri/me.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));
+	//----gvar.player[0].enti.spri.spritesheet = malloc(sizeof(struct vrs_container));
 
 	// create the map
 //	fprintf(stderr, "testing map load~	");
-	loadmap("data/test.map", &map);
+	CA_loadmap("data/test.map", &map, &gvar);
 	chkmap(&map, 0);
+//	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, &gvar.player[0].enti, &gvar);
 
-	//	input!
-	IN_Default(0, &player,ctrl_Keyboard1);
+	// input!
+	IN_Default(0, &gvar.player[0],ctrl_Keyboard1, &gvar);
 
 	// save the palette
 #ifdef FADE
-	dpal = modexNewPal();
-	modexPalSave(dpal);
-	modexFadeOff(4, dpal);
-#endif
-	//textInit();
-	VGAmodeX(bakapee, 1, &gvar);
-#ifdef MODEXZ
-#ifdef FADE
-	modexPalBlack();	//reset the palette~
+	modexPalSave(&gvar.video.dpal);
+	modexFadeOff(4, &gvar.video.dpal);
+	modexPalBlack();
 #endif
-	CA_LoadFile("data/spri/chikyuu.pal", &pal, &gvar);
-	modexPalUpdate1(pal);
+
+	VGAmodeX(1/*bakapee*/, 1, &gvar);
+
+	/* load color palette */
+	/*ptmp.offset=(paloffset/3);
+	modexPalUpdate(&ptmp, &paloffset, 0, 0);
+	//modexClearRegion(bg->page, 0, 0, 320, 240, 255);
+	//printf("	%d\n", sizeof(ptmp.data));
+	//printf("1:	%d\n", paloffset);
+	map.tiles->data->offset=(paloffset/3);
+	modexPalUpdate(map.tiles->data, &paloffset, 0, 0);*/
+	VL_LoadPalFile(bakapee1p, &gvar.video.palette);
+	//VL_LoadPalFile("data/default.pal", &gvar.video.palette);
+
 #ifdef FADE
-	gpal = modexNewPal();
-	modexPalSave(gpal);
-	modexSavePalFile("data/g.pal", gpal);
-	modexPalBlack();	//so player will not see loadings~
+	modexPalSave(&gvar.video.palette);
+	modexSavePalFile("data/g.pal", &gvar.video.palette);
+	modexPalBlack();	//so gvar.player will not see loadings~
 #endif
 
 	// 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 = TILEWH;
+	ZC_MVSetup(&gvar.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
+	mapGoTo(&gvar.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;
-	IN_initplayer(&player, 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, &gvar.player, &gvar.mv, 0, 1);
+	EN_initPlayer(&gvar.player[0], &gvar.video);
+	//print_anim_ids(gvar.player[0].enti.spri);
+	if (gvar.video.sprifilei == -1)
 	{
 #ifdef FADE
-		modexFadeOff(4, gpal);
+		modexFadeOff(4, &gvar.video.palette);
 #endif
-		Quit(&gvar, "Wrong");
+		Quit(&gvar, "Wrong ID for sprite");
 #ifdef FADE
-		modexFadeOn(4, dpal);
+		modexFadeOn(4, &gvar.video.dpal);
 #endif
 	}
-	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.
+//	while(!IN_KeyDown(sc_Escape) && !IN_KeyDown(sc_Space) && !IN_KeyDown(sc_Enter)){ FUNCTIONKEYSHOWMV }
+	gvar.video.page[0].tlx=gvar.mv[0].tx*TILEWH;
+	gvar.video.page[0].tly=gvar.mv[0].ty*TILEWH;
+	shinku(&gvar);
+//modexpdump(gvar.mv[0].page);
 #ifdef FADE
-	modexFadeOn(4, gpal);
+	modexFadeOn(4, &gvar.video.palette);
 #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)
+	while(!IN_KeyDown(sc_Escape) && gvar.player[0].enti.hp>0)
 	{
+		gvar.video.page[0].tlx=gvar.mv[0].tx*TILEWH;
+		gvar.video.page[0].tly=gvar.mv[0].ty*TILEWH;
 		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
+		//to stop scrolling and have the gvar.player position data move to the edge of the screen with respect to the direction
+		//when gvar.player[0].tx or gvar.player[0].ty == 0 or gvar.player[0].tx == 20 or gvar.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);
+		//gvar.player movement
+		IN_ReadControl(&gvar.player[0], &gvar);
 		if(!panswitch){
-			//ZC_walk(player[0].ent, mv);
-			walk(mv, &player, 0);
+			//ZC_walk2(gvar.player[0].ent, mv);
+			ZC_walk(&gvar.mv, &gvar.player, 0);
+		}else{
+			TAIL_PANKEYFUNZC;
+			//printf("	gvar.player[0].enti.q: %d", gvar.player[0].enti.q);	printf("	gvar.player[0].d: %d\n", gvar.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(((gvar.player[0].enti.triggerx == TRIGGX && gvar.player[0].enti.triggery == TRIGGY) && IN_KeyDown(0x1C))||(gvar.player[0].enti.tx == 5 && gvar.player[0].enti.ty == 5))
+		if(((gvar.mv[0].map->layerdata[0].data[(gvar.player[0].enti.triggerx-1)+(map.width*(gvar.player[0].enti.triggery-1))] == 0) && IN_KeyDown(0x1C))||(gvar.player[0].enti.tx == 5 && gvar.player[0].enti.ty == 5))
 		{
 			short i;
 			for(i=800; i>=400; i--)
@@ -173,79 +175,54 @@ 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
-
-		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
-		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
+		if(gvar.player[0].enti.q == (TILEWH/(gvar.player[0].enti.speed))+1 && gvar.player[0].info.dir != 2 && (gvar.player[0].enti.triggerx == 5 && gvar.player[0].enti.triggery == 5)){ gvar.player[0].enti.hp--; }
+		//debugging binds!
+
+		if(IN_KeyDown(24)){ modexPalUpdate0(&gvar.video.palette); /*paloffset=0;*/ modexpdump(gvar.mv[0].page); IN_UserInput(1, &gvar); } //o
+		if(IN_KeyDown(22)){ modexPalUpdate0(&gvar.video.palette); } //u
+
+		TAIL_FUNCTIONKEYFUNCTIONS
+		TAIL_FUNCTIONKEYDRAWJUNK
+		if(IN_KeyDown(sc_L)){ modexClearRegion(&gvar.video.page[0], gvar.player[0].enti.x, gvar.player[0].enti.y, 16, 16, 1); }
+		if(IN_KeyDown(sc_J) || IN_KeyDown(sc_K))
 		{
-//			modexDrawSprite(mv[0].page, 16, 16, &p);
-//			modexDrawSprite(mv[0].page, 32+72, 16, (player[0].data));
-			switch(i)
+			if(IN_KeyDown(sc_J))
 			{
-				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;
+				bakapee1=FILENAME_1;
+				bakapee1p=FILENAME_1P;
+				gvar.player[0].enti.overdraww=0;
 			}
-		}
-		//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(sc_K))
+			{
+				bakapee1=FILENAME_2;
+				bakapee1p=FILENAME_2P;
+				gvar.player[0].enti.overdraww=2;
+			}
+			//read_vrs(&gvar, bakapee1, gvar.player[0].enti.spri->spritesheet);
+			VRS_ReadVRS(bakapee1, &gvar.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(10)){ modexPalOverscan(rand()%56); modexPalUpdate(gvar.video.dpal); IN_UserInput(1, &gvar); }
 #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;
+		if((gvar.player[0].enti.q==1) && !(gvar.player[0].enti.x%TILEWH==0 && gvar.player[0].enti.y%TILEWH==0)) Quit(&gvar, "PLAYER OFF THE RAILS!");//break;	//incase things go out of sync!
 	}
 
 	/* fade back to text mode */
 	/* but 1st lets save the game palette~ */
 #ifdef FADE
-	modexPalSave(gpal);
-	modexSavePalFile("data/g.pal", gpal);
-	modexFadeOff(4, gpal);
+	modexPalSave(&gvar.video.palette);
+	modexSavePalFile("data/g.pal", &gvar.video.palette);
+	modexFadeOff(4, &gvar.video.palette);
 #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;
 	WCPU_cpufpumesg();
 #ifdef FADE
-	modexFadeOn(4, dpal);
+	modexFadeOn(4, gvar.video.dpal);
 #endif
 }