X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fscroll.c;h=4e13f5d7e64d1f759e2356af151e23f8843a5547;hb=f3b2cbc51effb91a651abe469e0d3cec58a491e5;hp=f511073ca76ad7735fe9f89b2106ea47a30f0f2f;hpb=3c89cff81bd78546629af7fda864c3074f79ce38;p=16.git

diff --git a/src/scroll.c b/src/scroll.c
index f511073c..4e13f5d7 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -3,6 +3,7 @@
 #include <stdlib.h>
 #include "src\lib\dos_kb.h"
 #include "src\lib\wtest\wtest.c"
+#include "src\lib\ems.c"
 
 //word far *clock= (word far*) 0x046C; /* 18.2hz clock */
 
@@ -39,6 +40,8 @@ typedef struct {
 	int ty; //player tile position on the viewable map
 	int triggerx; //player's trigger box tile position on the viewable map
 	int triggery; //player's trigger box tile position on the viewable map
+	int setx; //NOT USED YET! player sprite sheet set on the image x
+	int sety; //NOT USED YET! player sprite sheet set on the image y
 	word q; //loop variable
 	word d; //direction
 	int hp; //hitpoints of the player
@@ -55,8 +58,7 @@ void mapGoTo(map_view_t *mv, int tx, int ty);
 void mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y);
 void mapDrawRow(map_view_t *mv, int tx, int ty, word y);
 void mapDrawCol(map_view_t *mv, int tx, int ty, word x);
-sword dpad(actor_t *qd);
-void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */short d1, short d2, int x, int y, int ls, int lp, bitmap_t *bmp);
+void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword d, short scrolloffsetswitch, int x, int y, int ls, int lp, bitmap_t *bmp);
 
 #define TILEWH 16
 #define QUADWH (TILEWH/4)
@@ -68,25 +70,19 @@ void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */short
 #define MAPY 150
 #define TRIGGX 10
 #define TRIGGY 9
-//#define SWAP(a, b) tmp=a; a=b; b=tmp;
+
 void main() {
-	bitmap_t ptmp; // player sprite
+	bitmap_t ptmp;//, npctmp; // player sprite
 	const char *cpus;
 	static int persist_aniframe = 0;    /* gonna be increased to 1 before being used, so 0 is ok for default */
 	page_t screen, screen2, screen3;
 	map_t map;
 	map_view_t mv, mv2, mv3;
-	map_view_t *bg, *spri, *mask;//, *tmp;
+	map_view_t *bg, *spri, *mask;//, *tmp;
 	byte *pal;
 	byte *ptr;
 	actor_t player;
-
-
-	/* save the palette */
-	pal  = modexNewPal();
-	modexPalSave(pal);
-	modexFadeOff(4, pal);
-	modexPalBlack();
+	//actor_t npc0;
 
 	/* create the map */
 	map = allocMap(MAPX,MAPY); //20x15 is the resolution of the screen you can make maps smaller than 20x15 but the null space needs to be drawn properly
@@ -97,8 +93,16 @@ void main() {
 
 	/* draw the tiles */
 	ptr = map.data;
-	/*data\\*/
+	/* data */
 	ptmp = bitmapLoadPcx("ptmp.pcx"); // load sprite
+	//npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite
+
+	/* save the palette */
+	pal  = modexNewPal();
+	modexPalSave(pal);
+	modexFadeOff(4, pal);
+	modexPalBlack();
+
 	setkb(1);
 	modexEnter();
 	modexPalBlack();
@@ -124,52 +128,173 @@ void main() {
 	//mapGoTo(mask, 0, 0);
 
 	//TODO: put player in starting position of spot
-	//default player position on the viewable map
+	//default player position on the viewable map
 	player.tx = bg->tx + 10;
 	player.ty = bg->ty + 8;
 	player.x = player.tx*TILEWH;
 	player.y = player.ty*TILEWH;
 	player.triggerx = player.tx;
 	player.triggery = player.ty+1;
-	player.q=0;
+	player.q=1;
 	player.d=0;
+	player.hp=4;
+	//npc
+	/*npc0.tx = bg->tx + 1;
+	npc0.ty = bg->ty + 1;
+	npc0.x = npc0.tx*TILEWH;
+	npc0.y = npc0.ty*TILEWH;
+	npc0.triggerx = npc0.tx;
+	npc0.triggery = npc0.ty+1;
+	npc0.q=1;
+	npc0.d=0;
+	modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 64, 24, 32, &npctmp);*/
 	modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 64, 24, 32, &ptmp);
 
 	modexClearRegion(spri->page, player.triggerx*16, player.triggery*16, 16, 16, 1);
 	modexClearRegion(bg->page, player.triggerx*16, player.triggery*16, 16, 16, 1);
+
+	modexClearRegion(spri->page, 5*16, 5*16, 16, 16, 255);
+	modexClearRegion(bg->page, 5*16, 5*16, 16, 16, 255);
+
 	modexShowPage(spri->page);
-	while(!keyp(1))
+	while(!keyp(1) && player.hp!=0)
 	{
 	//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.tx or player.ty == 0 or player.tx == 20 or player.ty == 15 then stop because that is edge of map and you do not want to walk of the map
+	#define INC_PER_FRAME if(player.q&1) persist_aniframe++; if(persist_aniframe>4) persist_aniframe = 1;
+	/*#define INC_PER_FRAME_NPC if(npc0.q&1) persist_aniframe++; if(persist_aniframe>4) persist_aniframe = 1;
 
+	if(npc0.d == 0 && npc0.q == 1) npc0.d =rand()%8;
+	if(npc0.d>4)
+		npc0.d=0;
 
-	//TODO: make this better like rpg maker 2000 better
-	if(player.q <= 1)
+	//right movement
+	if(npc0.d == 2)
 	{
-		dpad(&player);
-		if(player.d>0) dpad(&player);
-		if(player.q<1) player.q++;
+		if(npc0.tx < MAPX && !(npc0.tx+1 == TRIGGX && npc0.ty == TRIGGY) && !(npc0.tx+1 == player.tx && npc0.ty == player.ty))
+		{
+			if(npc0.q<=(TILEWH/SPEED))
+			{
+				INC_PER_FRAME_NPC;
+				npc0.x+=SPEED;
+				//animatePlayer(bg, spri, mask, 1, 0, npc0.x, npc0.y, persist_aniframe, q, &npctmp);
+				animatePlayer(bg, spri, npc0.d-1, 0, npc0.x, npc0.y, persist_aniframe, npc0.q, &npctmp);
+				modexShowPage(spri->page);
+				npc0.q++;
+			} else { npc0.q = 1; npc0.d = 0; npc0.tx++; }
+		}
+		else
+		{
+			modexCopyPageRegion(spri->page, bg->page, npc0.x-4, npc0.y-TILEWH, npc0.x-4, npc0.y-TILEWH, 24, 32);
+			modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 32, 24, 32, &npctmp);
+			modexShowPage(spri->page);
+			npc0.d = 0;
+		}
+		npc0.triggerx = npc0.tx+1;
+		npc0.triggery = npc0.ty;
 	}
 
-	#define INC_PER_FRAME if(player.q&1) persist_aniframe++; if(persist_aniframe>4) persist_aniframe = 1;
+	//left movement
+	if(npc0.d == 4)
+	{
+		if(npc0.tx > 1 && !(npc0.tx-1 == TRIGGX && npc0.ty == TRIGGY) && !(npc0.tx-1 == player.tx && npc0.ty == player.ty))
+		{
+			if(npc0.q<=(TILEWH/SPEED))
+			{
+				INC_PER_FRAME_NPC;
+				npc0.x-=SPEED;
+				//animatePlayer(bg, spri, mask, 3, 0, npc0.x, npc0.y, persist_aniframe, q, &npctmp);
+				animatePlayer(bg, spri, npc0.d-1, 0, npc0.x, npc0.y, persist_aniframe, npc0.q, &npctmp);
+				modexShowPage(spri->page);
+				npc0.q++;
+			} else { npc0.q = 1; npc0.d = 0; npc0.tx--; }
+		}
+		else
+		{
+			modexCopyPageRegion(spri->page, bg->page, npc0.x-4, npc0.y-TILEWH, npc0.x-4, npc0.y-TILEWH, 24, 32);
+			modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 96, 24, 32, &npctmp);
+			modexShowPage(spri->page);
+			npc0.d = 0;
+		}
+		npc0.triggerx = npc0.tx-1;
+		npc0.triggery = npc0.ty;
+	}
+
+	//down movement
+	if(npc0.d == 3)
+	{
+		if(npc0.ty < MAPY && !(npc0.tx == TRIGGX && npc0.ty+1 == TRIGGY) && !(npc0.tx == player.tx && npc0.ty == player.ty+1))
+		{
+			if(npc0.q<=(TILEWH/SPEED))
+			{
+				INC_PER_FRAME_NPC;
+				npc0.y+=SPEED;
+				//animatePlayer(bg, spri, mask, 2, 0, npc0.x, npc0.y, persist_aniframe, q, &npctmp);
+				animatePlayer(bg, spri, npc0.d-1, 0, npc0.x, npc0.y, persist_aniframe, npc0.q, &npctmp);
+				modexShowPage(spri->page);
+				npc0.q++;
+			} else { npc0.q = 1; npc0.d = 0; npc0.ty++; }
+		}
+		else
+		{
+			modexCopyPageRegion(spri->page, bg->page, npc0.x-4, npc0.y-TILEWH, npc0.x-4, npc0.y-TILEWH, 24, 32);
+			modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 64, 24, 32, &npctmp);
+			modexShowPage(spri->page);
+			npc0.d = 0;
+		}
+		npc0.triggerx = npc0.tx;
+		npc0.triggery = npc0.ty+1;
+	}
 
-	if(player.d == 2)
+	//up movement
+	if(npc0.d == 1)
 	{
+		if(npc0.ty > 1 && !(npc0.tx == TRIGGX &&  npc0.ty-1 == TRIGGY) && !(npc0.tx+1 == player.tx && npc0.ty == player.ty-1))
+		{
+			if(npc0.q<=(TILEWH/SPEED))
+			{
+				INC_PER_FRAME_NPC;
+				npc0.y-=SPEED;
+				//animatePlayer(bg, spri, mask, 0, 0, npc0.x, npc0.y, persist_aniframe, q, &npctmp);
+				modexShowPage(spri->page);
+				animatePlayer(bg, spri, npc0.d-1, 0, npc0.x, npc0.y, persist_aniframe, npc0.q, &npctmp);
+				npc0.q++;
+			} else { npc0.q = 1; npc0.d = 0; npc0.ty--; }
+		}
+		else
+		{
+			modexCopyPageRegion(spri->page, bg->page, npc0.x-4, npc0.y-TILEWH, npc0.x-4, npc0.y-TILEWH, 24, 32);
+			modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 0, 24, 32, &npctmp);
+			modexShowPage(spri->page);
+			npc0.d = 0;
+		}
+		npc0.triggerx = npc0.tx;
+		npc0.triggery = npc0.ty-1;
+	}
+
+	if((npc0.triggery == player.ty && npc0.triggerx == player.tx) || (npc0.ty == player.ty && npc0.tx == player.tx)){ player.hp--; }
+*/
+
+	//player movement
+	//TODO: make movement into a function!
+	//right movement
+	if((keyp(77) && !keyp(75) && player.d == 0) || player.d == 2)
+	{
+		if(player.d == 0){ player.d = 2; }
 		if(bg->tx >= 0 && bg->tx+20 < MAPX && player.tx == bg->tx + 10 && !(player.tx+1 == TRIGGX && player.ty == TRIGGY))
 		{
 			if(player.q<=(TILEWH/SPEED))
 			{
 				INC_PER_FRAME;
 				//animatePlayer(bg, spri, mask, 1, 1, player.x, player.y, persist_aniframe, q, &ptmp);
-				animatePlayer(bg, spri, 1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp);
+				animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp);
 				mapScrollRight(bg, SPEED);
 				mapScrollRight(spri, SPEED);
 				//mapScrollRight(mask, SPEED);
 				modexShowPage(spri->page);
 				player.q++;
-			} else { player.q = 0; player.d = 0; player.tx++; }
+			} else { player.q = 1; player.d = 0; player.tx++; }
 		}
 		else if(player.tx < MAPX && !(player.tx+1 == TRIGGX && player.ty == TRIGGY))
 		{
@@ -178,10 +303,10 @@ void main() {
 				INC_PER_FRAME;
 				player.x+=SPEED;
 				//animatePlayer(bg, spri, mask, 1, 0, player.x, player.y, persist_aniframe, q, &ptmp);
-				animatePlayer(bg, spri, 1, 0, player.x, player.y, persist_aniframe, player.q, &ptmp);
+				animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, &ptmp);
 				modexShowPage(spri->page);
 				player.q++;
-			} else { player.q = 0; player.d = 0; player.tx++; }
+			} else { player.q = 1; player.d = 0; player.tx++; }
 		}
 		else
 		{
@@ -194,21 +319,23 @@ void main() {
 		player.triggery = player.ty;
 	}
 
-	if(player.d == 4)
+	//left movement
+	if((keyp(75) && !keyp(77) && player.d == 0) || player.d == 4)
 	{
+		if(player.d == 0){ player.d = 4; }
 		if(bg->tx > 0 && bg->tx+20 <= MAPX && player.tx == bg->tx + 10 && !(player.tx-1 == TRIGGX && player.ty == TRIGGY))
 		{
 			if(player.q<=(TILEWH/SPEED))
 			{
 				INC_PER_FRAME;
 				//animatePlayer(bg, spri, mask, 3, 1, player.x, player.y, persist_aniframe, q, &ptmp);
-				animatePlayer(bg, spri, 3, 1, player.x, player.y, persist_aniframe, player.q, &ptmp);
+				animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp);
 				mapScrollLeft(bg, SPEED);
 				mapScrollLeft(spri, SPEED);
 				//mapScrollLeft(mask, SPEED);
 				modexShowPage(spri->page);
 				player.q++;
-			} else { player.q = 0; player.d = 0; player.tx--; }
+			} else { player.q = 1; player.d = 0; player.tx--; }
 		}
 		else if(player.tx > 1 && !(player.tx-1 == TRIGGX && player.ty == TRIGGY))
 		{
@@ -217,10 +344,10 @@ void main() {
 				INC_PER_FRAME;
 				player.x-=SPEED;
 				//animatePlayer(bg, spri, mask, 3, 0, player.x, player.y, persist_aniframe, q, &ptmp);
-				animatePlayer(bg, spri, 3, 0, player.x, player.y, persist_aniframe, player.q, &ptmp);
+				animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, &ptmp);
 				modexShowPage(spri->page);
 				player.q++;
-			} else { player.q = 0; player.d = 0; player.tx--; }
+			} else { player.q = 1; player.d = 0; player.tx--; }
 		}
 		else
 		{
@@ -233,21 +360,23 @@ void main() {
 		player.triggery = player.ty;
 	}
 
-	if(player.d == 3)
+	//down movement
+	if((keyp(80) && !keyp(72) && player.d == 0) || player.d == 3)
 	{
+		if(player.d == 0){ player.d = 3; }
 		if(bg->ty >= 0 && bg->ty+15 < MAPY && player.ty == bg->ty + 8 && !(player.tx == TRIGGX && player.ty+1 == TRIGGY))
 		{
 			if(player.q<=(TILEWH/SPEED))
 			{
 				INC_PER_FRAME;
 				//animatePlayer(bg, spri, mask, 2, 1, player.x, player.y, persist_aniframe, q, &ptmp);
-				animatePlayer(bg, spri, 2, 1, player.x, player.y, persist_aniframe, player.q, &ptmp);
+				animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp);
 				mapScrollDown(bg, SPEED);
 				mapScrollDown(spri, SPEED);
 				//mapScrollDown(mask, SPEED);
 				modexShowPage(spri->page);
 				player.q++;
-			} else { player.q = 0; player.d = 0; player.ty++; }
+			} else { player.q = 1; player.d = 0; player.ty++; }
 		}
 		else if(player.ty < MAPY && !(player.tx == TRIGGX && player.ty+1 == TRIGGY))
 		{
@@ -256,10 +385,10 @@ void main() {
 				INC_PER_FRAME;
 				player.y+=SPEED;
 				//animatePlayer(bg, spri, mask, 2, 0, player.x, player.y, persist_aniframe, q, &ptmp);
-				animatePlayer(bg, spri, 2, 0, player.x, player.y, persist_aniframe, player.q, &ptmp);
+				animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, &ptmp);
 				modexShowPage(spri->page);
 				player.q++;
-			} else { player.q = 0; player.d = 0; player.ty++; }
+			} else { player.q = 1; player.d = 0; player.ty++; }
 		}
 		else
 		{
@@ -272,21 +401,23 @@ void main() {
 		player.triggery = player.ty+1;
 	}
 
-	if(player.d == 1)
+	//up movement
+	if((keyp(72) && !keyp(80) && player.d == 0) || player.d == 1)
 	{
+		if(player.d == 0){ player.d = 1; }
 		if(bg->ty > 0 && bg->ty+15 <= MAPY && player.ty == bg->ty + 8 && !(player.tx == TRIGGX && player.ty-1 == TRIGGY))
 		{
 			if(player.q<=(TILEWH/SPEED))
 			{
 				INC_PER_FRAME;
 				//animatePlayer(bg, spri, mask, 0, 1, player.x, player.y, persist_aniframe, q, &ptmp);
-				animatePlayer(bg, spri, 0, 1, player.x, player.y, persist_aniframe, player.q, &ptmp);
+				animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp);
 				mapScrollUp(bg, SPEED);
 				mapScrollUp(spri, SPEED);
 				//mapScrollUp(mask, SPEED);
 				modexShowPage(spri->page);
 				player.q++;
-			} else { player.q = 0; player.d = 0; player.ty--; }
+			} else { player.q = 1; player.d = 0; player.ty--; }
 		}
 		else if(player.ty > 1 && !(player.tx == TRIGGX &&  player.ty-1 == TRIGGY))
 		{
@@ -296,9 +427,9 @@ void main() {
 				player.y-=SPEED;
 				//animatePlayer(bg, spri, mask, 0, 0, player.x, player.y, persist_aniframe, q, &ptmp);
 				modexShowPage(spri->page);
-				animatePlayer(bg, spri, 0, 0, player.x, player.y, persist_aniframe, player.q, &ptmp);
+				animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, &ptmp);
 				player.q++;
-			} else { player.q = 0; player.d = 0; player.ty--; }
+			} else { player.q = 1; player.d = 0; player.ty--; }
 		}
 		else
 		{
@@ -312,15 +443,17 @@ void main() {
 	}
 	//modexClearRegion(mask->page, 66, 66, 2, 40, 0);
 
-	if((player.triggerx == TRIGGX && player.triggery == TRIGGY) && keyp(KEY_ENTER))
+	if(((player.triggerx == TRIGGX && player.triggery == TRIGGY) && keyp(0x1C))||(player.tx == 5 && player.ty == 5))
 	{
 		short i;
-		for(i=600; i>=400; i--)
+		for(i=800; i>=400; i--)
 		{
 			sound(i);
 		}
 		nosound();
 	}
+	if(player.q == (TILEWH/SPEED)+1 && player.d > 0 && (player.triggerx == 5 && player.triggery == 5)){ player.hp--; }
+	//if(keyp(0x0E)) while(1){ if(xmsmalloc(24)) break; }
 	}
 
 	/* fade back to text mode */
@@ -331,17 +464,24 @@ void main() {
 	printf("Project 16 scroll.exe\n");
 	printf("tx: %d\n", bg->tx);
 	printf("ty: %d\n", bg->ty);
-	printf("player.x: %d\n", player.x);
-	printf("player.y: %d\n", player.y);
+	printf("player.x: %d", player.x);
+	if(player.hp==0) printf("%d wwww\n", player.y+8);
+	else printf("\nplayer.y: %d\n", player.y);
 	printf("player.tx: %d\n", player.tx);
 	printf("player.ty: %d\n", player.ty);
 	printf("player.triggx: %d\n", player.triggerx);
 	printf("player.triggy: %d\n", player.triggery);
+	printf("player.hp: %d\n", player.hp);
 	printf("player.q: %d\n", player.q);
 	printf("player.d: %d\n", player.d);
 	printf("temporary player sprite 0: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=45556867\n");
 	printf("temporary player sprite 1: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=44606385\n");
-	printf("\n");
+	printf("\n");
+	//xmsfree(&map);
+	//xmsfree(bg);
+	//xmsfree(spri);
+	//xmsfree(mask);
+	//xmsreport();
 	switch(detectcpu())
 	{
 		case 0: cpus = "8086/8088 or 186/88"; break;
@@ -361,7 +501,9 @@ allocMap(int w, int h) {
 
 	result.width =w;
 	result.height=h;
+	if(!isEMS())
 	result.data = malloc(sizeof(byte) * w * h);
+	else result.data = (byte *)alloc_emem(sizeof(byte) * w * h);
 
 	return result;
 }
@@ -373,13 +515,19 @@ initMap(map_t *map) {
 	int x, y;
 	int i;
 	int tile = 1;
+	if(!isEMS())
 	map->tiles = malloc(sizeof(tiles_t));
+	else map->tiles = (tiles_t *)alloc_emem(sizeof(tiles_t));
 
 	/* create the tile set */
+	if(!isEMS())
 	map->tiles->data = malloc(sizeof(bitmap_t));
+	else map->tiles->data = (bitmap_t *)alloc_emem(sizeof(bitmap_t));
 	map->tiles->data->width = (TILEWH*2);
 	map->tiles->data->height= TILEWH;
+	if(!isEMS())
 	map->tiles->data->data = malloc((TILEWH*2)*TILEWH);
+	else map->tiles->data->data = (byte *)alloc_emem((TILEWH*2)*TILEWH);
 	map->tiles->tileHeight = TILEWH;
 	map->tiles->tileWidth =TILEWH;
 	map->tiles->rows = 1;
@@ -571,51 +719,20 @@ mapDrawCol(map_view_t *mv, int tx, int ty, word x) {
 	}
 }
 
-sword
-dpad(actor_t *qd)
-{
-	if((keyp(75) && !keyp(77))) qd->d = 4; //left
-	if((keyp(80) && !keyp(72))) qd->d = 3; //down
-	if((keyp(77) && !keyp(75))) qd->d = 2; //right
-	if((keyp(72) && !keyp(80))) qd->d = 1; //up
-/*	if(qd->d==0)
-	{
-		//if((keyp(80) || keyp(72)))
-		//{
-			if((keyp(72) && !keyp(80))&&qd->d==0) qd->d = 1; //up
-			if((keyp(80) && !keyp(72))&&qd->d==0) qd->d = 3; //down
-		//}
-		//if((keyp(75) || keyp(77)))
-		//{
-			if((keyp(75) && !keyp(77))&&qd->d==0) qd->d = 4; //left
-			if((keyp(77) && !keyp(75))&&qd->d==0) qd->d = 2; //right
-		//}
-	}
-	else
-	{
-	if((qd->d==2 || qd->d==4))
-	{
-		if(keyp(72) && !keyp(80)) qd->d = 1; //up
-		if(keyp(80) && !keyp(72)) qd->d = 3; //down
-	}
-	else if((qd->d==1 || qd->d==3))
-	{
-		if(keyp(75) && !keyp(77)) qd->d = 4; //left
-		if(keyp(77) && !keyp(75)) qd->d = 2; //right
-	}
-	}*/
-	return qd->d;
-}
+/*void npcmove(map_view_t bg, map_view_t fg, )
+{
+	
+}*/
 
 void
-animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */short d1, short d2, int x, int y, int ls, int lp, bitmap_t *bmp)
+animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword d, short scrolloffsetswitch, int x, int y, int ls, int lp, bitmap_t *bmp)
 {
-	short dire=32*d1; //direction
-	short qq; //scroll offset
+	sword dire=32*d; //direction
+	sword qq; //scroll offset
 
-	if(d2==0) qq = 0;
+	if(scrolloffsetswitch==0) qq = 0;
 	else qq = ((lp)*SPEED);
-	switch (d1)
+	switch (d)
 	{
 		case 0:
 			//up