X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fzcroll.c;h=147555b8dd90e1c814e0579b7fa532a3fa88655b;hb=d03215b6373268416dd879c8bb5b0b1f0c8e9309;hp=a02ae0da9590a0299568a56e833e35a8c4f925bd;hpb=cfba60702c8aa81180bb10781950ad7eab914bcc;p=16.git

diff --git a/src/zcroll.c b/src/zcroll.c
index a02ae0da..147555b8 100755
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -43,6 +43,8 @@ byte *gpal;
 byte *ptr;
 memptr pal;
 
+bitmap_t	*ptmpdata;
+
 void main(int argc, char *argv[])
 {
 	static global_game_variables_t gvar;
@@ -135,7 +137,7 @@ void main(int argc, char *argv[])
 	/*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].enti.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
@@ -202,6 +204,8 @@ void main(int argc, char *argv[])
 		}
 		FUNCTIONKEYFUNCTIONS;
 		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)){ read_vrs(&gvar, "data/spri/ptmp.vrs", player[0].enti.spri->spritesheet);	*ptmpdata = bitmapLoadPcx("data/ptmp.pcx", &gvar);	modexPalUpdate1(ptmpdata->palette); }
+		if(IN_KeyDown(sc_K)){ read_vrs(&gvar, "data/spri/chikyuu.vrs", player[0].enti.spri->spritesheet);	PCXBMP = bitmapLoadPcx("data/chikyuu.pcx", &gvar);	modexPalUpdate1(&PCXBMP->palette); }
 
 		//9
 #ifdef FADE
@@ -210,7 +214,6 @@ void main(int argc, char *argv[])
 		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)) break;	//incase things go out of sync!
-		player[0].enti.hp = 0;
 	}
 
 	/* fade back to text mode */