git » fp-git.git » commit 10fa558

diff --git a/FP/src/Makefile b/FP/src/Makefile
index 5633573..26b0c8e 100644
--- a/FP/src/Makefile
+++ b/FP/src/Makefile
@@ -163,7 +163,7 @@ kid.o: ker/kid.c include/kid.h include/resources.h include/res_conf.h\
        include/states.h $(GENERATEDRESHEADERS)\
 			 $(GENERATEDSTAHEADERS) $(GENERATEDTILHEADERS) include/res_conf.h\
        include/types.h include/tiles.h include/tiles_conf.h
-	$(INFO) Compiling kernel kid object...
+	$(INFO) Compiling kernel object support...
 	$(CC) -c ker/kid.c $(OPTIONS)
 
 titles.o: ker/titles.c include/resources.h include/res_conf.h\
diff --git a/FP/src/conf/awk/tiles_conf_groups.awk b/FP/src/conf/awk/tiles_conf_groups.awk
index 947878e..21db164 100644
--- a/FP/src/conf/awk/tiles_conf_groups.awk
+++ b/FP/src/conf/awk/tiles_conf_groups.awk
@@ -73,7 +73,7 @@ END {
 	}
 	printf "}\n"
 	for (group in offsets) {
-		printf "#define TILES_%s %d\n",group,offsets[group]
+		printf "#define TILES_%s %d\n",group,offsets[group]+32
 	}
 }
 
diff --git a/FP/src/ker/room.c b/FP/src/ker/room.c
index 8710db5..cdedce4 100644
--- a/FP/src/ker/room.c
+++ b/FP/src/ker/room.c
@@ -362,7 +362,7 @@ void drawBackPanel(tRoom* room,int x, int y) {
 		);
 	}
 	/* chopper/this */
-	if (isIn(tile,TILES_CHOPPER)) {
+	if (isIn(tile,TILE_CHOPPER)) {
 		drawChopper((x-1)*TILE_W,y*TILE_H,room->level->time%8,layCBack);
 	}
 	/* empty_bricks/this */
@@ -471,7 +471,7 @@ void drawBackPanel(tRoom* room,int x, int y) {
 		);
 	}
 	/* chopper/this /
-	if (isIn(tile,TILES_CHOPPER)) {
+	if (isIn(tile,TILE_CHOPPER)) {
 		outputDrawBitmap(
 			roomGfx.environment->pFrames[9],
 			(x-1)*TILE_W,
diff --git a/FP/src/res/tiles.c b/FP/src/res/tiles.c
index ed4a8b0..7feea71 100644
--- a/FP/src/res/tiles.c
+++ b/FP/src/res/tiles.c
@@ -34,9 +34,12 @@ tiles.c: FreePrince : Tile functions
 
 int isInGroup(unsigned char tile,unsigned char backtile,short group) {
 	static unsigned char tileList[]=TILE_GROUP_LIST;
-	unsigned char* i=tileList+group;
+	unsigned char* i;
 	int docontinue;
+
 	tile=tile&0x1F; /* get the last 5 bits and clear the beginning */
+	if (group<32) return (tile==group);
+	i=tileList+(group-32);
 	tile++;
 	do {
 		docontinue=0;