git » fp-git.git » commit 61fa55e

Added walls

author ecalot
2004-08-16 06:32:50 UTC
committer ecalot
2004-08-16 06:32:50 UTC
parent d20662fc63c65e11d44f87932941b3426b06360a

Added walls

FP/src/conf/resources.conf +1 -1
FP/src/ker/room.c +9 -0

diff --git a/FP/src/conf/resources.conf b/FP/src/conf/resources.conf
index b24ce01..76a45f6 100644
--- a/FP/src/conf/resources.conf
+++ b/FP/src/conf/resources.conf
@@ -18,7 +18,7 @@ ANIM_TURNING         IMG KID     400 445-451
 ANIM_WALKING         IMG KID     400 534-544 
 GUARD_1              IMG PRINCE  GUARD 100 101
 IMG_BACKGROUND       IMG PV      950 951
-IMG_ENV_DUNGEON      IMG DUNGEON 200 297 298 300 1327 1333 1230 1231 241-243 269-274 235 296 236 347 348 232 292-295
+IMG_ENV_DUNGEON      IMG DUNGEON 200 297 298 300 1327 1333 1230 1231 241-243 269-274 235 296 236 347 348 232 292-295 361 364 366 368
 IMG_MAIN_BACKGROUND  IMG TITLES  50-55 
 IMG_TEXT_BACKGROUND  IMG TITLES  40-45
 
diff --git a/FP/src/ker/room.c b/FP/src/ker/room.c
index 693b9c6..d84b9f9 100644
--- a/FP/src/ker/room.c
+++ b/FP/src/ker/room.c
@@ -71,6 +71,7 @@ tTile roomGetTile(tRoom* room,int x, int y) {
 	
 	switch (result.code) { /* TODO: use arrays and a better algorithm */
 	case T_EMPTY:
+		result.hasPillar=0;
 		result.walkable=0;
 		result.block=0;
 		result.hasTorch=0;
@@ -94,6 +95,7 @@ tTile roomGetTile(tRoom* room,int x, int y) {
 		result.hasSword=(result.code==T_SWORD);
 		break;
 	case T_WALL:
+		result.hasPillar=0;
 		result.walkable=0;
 		result.block=1;
 		result.hasTorch=0;
@@ -148,6 +150,13 @@ void roomDrawBackground(tRoom* room) {
 					y*TILE_H+2
 				);
 			}
+			if (tile.isWall) {
+				outputDrawBitmap(
+					roomGfx.environment->pFrames[29],
+					x*TILE_W+TILE_W,
+					y*TILE_H+1
+				);
+			}
 			if (tile.walkable) {
 				outputDrawBitmap(
 					roomGfx.environment->pFrames[8],