git » fp-git.git » commit 120a890

diff --git a/FP/src/conf/awk/room_conf.awk b/FP/src/conf/awk/room_conf.awk
index 5e3e3f3..89be669 100644
--- a/FP/src/conf/awk/room_conf.awk
+++ b/FP/src/conf/awk/room_conf.awk
@@ -42,7 +42,14 @@
 }
 
 /[\t ]*draw/ {
-	printf("%s\\\n",$0);
+	f=$1
+	x=$2
+	y=$3
+	$1=$2=$3=""
+	r=$0
+	comma=","
+	if ($0~/^[\t ]*$/) comma=""
+	printf("%s((x)+(%s),(y)+(%s)%s%s);\\\n",f,x,y,comma,r);
 }
 
 END {
diff --git a/FP/src/conf/room.conf b/FP/src/conf/room.conf
index 0996f25..1f01ffe 100644
--- a/FP/src/conf/room.conf
+++ b/FP/src/conf/room.conf
@@ -1,235 +1,235 @@
 XX AllLeft
 	# Gate/left
 	if (isIn(left,TILES_DOOR)) 
-		drawAll((x)+0,(y)+2,15);
-		drawGate((x)+0,(y)-TILE_H+3,gateGetFrame(left));
+		drawAll	0	2	15
+		drawGate	0	-TILE_H+3	gateGetFrame(left)
 	
 	# normal/left
 	if (isIn(left,TILES_FLOOR)) 
-		drawAll((x)+0,(y)+2,10);
+		drawAll	0	2	10
 	# loose moving/left
 	if (isIn(left,TILES_LOOSEMOVING)) 
-		drawLoose((x)+0,(y)+2,looseGetFrame(left),layTritop);
+		drawLoose	0	2	looseGetFrame(left),layTritop
 	# exit_left/left
 	if (isIn(left,TILE_EXIT_RIGHT)) 
-		drawAll((x)+0,(y)+2,7);
+		drawAll	0	2	7
 	# pillar/left
 	if (isIn(left,TILES_PILLAR)) 
-		drawAll((x)+0,(y)+2,44);
+		drawAll	0	2	44
 	# pillar_big_up/left
 	if (isIn(left,TILE_BP_BOTTOM)) 
-		drawAll((x)+0,(y)+2,83);
+		drawAll	0	2	83
 	if (isIn(left,TILE_BP_TOP)) 
-		drawAll((x)+0,(y)+3,85);
+		drawAll	0	3	85
 	# pressable/left
 	if (isIn(left,TILES_RAISE_PRESSED)) 
-		drawAll((x)+0,(y)+2,10);
+		drawAll	0	2	10
 	if (isIn(left,TILES_RAISE_UNPRESSED)) 
-		drawAll((x)+0,(y)+1,10);
+		drawAll	0	1	10
 	if (isIn(left,TILES_DROP_PRESSED)) 
-		drawAll((x)+0,(y)+3,10);
+		drawAll	0	3	10
 	if (isIn(left,TILES_DROP_UNPRESSED)) 
-		drawAll((x)+0,(y)+2,10);
+		drawAll	0	2	10
 	# debris/left
 	if (isIn(left,TILES_BROKENTILE)) 
-		drawAll((x)+0,(y)+2,49);
+		drawAll	0	2	49
 	# spikes/left
 	if (isIn(left,TILES_SPIKES)) 
-		drawAll((x)+0,(y)+2,107);
-		drawSpike((x)-TILE_W+0,(y),spikeGetFrame(left),layRight);
+		drawAll	0	2	107
+		drawSpike	-TILE_W	0	spikeGetFrame(left),layRight
 	
 	# skeleton/left
 	if (isIn(left,TILES_SKELETON)) 
-		drawAll((x)+0,(y)+2,81);
+		drawAll	0	2	81
 	# sword/left
 	if (isIn(left,TILES_SWORD)) 
-		drawSword((x)-15,(y)-4);
+		drawSword -15 -4
 	# potion base/left
 	if (isIn(left,TILES_SMALLPOTION))
-		drawPotionSmallBase((x)-15,(y)-4);
+		drawPotionSmallBase	15	-4
 	if ((isIn(left,TILES_BIGPOTION))) 
-		drawPotionBigBase((x)-15,(y)-4);
+		drawPotionBigBase	15	-4
 	# potion animation/left
 	if (isIn(left,TILES_REDPOTION))
-		drawPotionRedBubbles((x)+3-15,(y)-15,isIn(left,TILES_BIGPOTION));
+		drawPotionRedBubbles	3-15	-15	isIn(left,TILES_BIGPOTION)
 	if (isIn(left,TILES_GREENPOTION))
-		drawPotionGreenBubbles((x)+3-15,(y)-15,isIn(left,TILES_BIGPOTION));
+		drawPotionGreenBubbles	3-15	-15	isIn(left,TILES_BIGPOTION)
 	if (isIn(left,TILES_BLUEPOTION))
-		drawPotionBlueBubbles((x)+3-15,(y)-15,isIn(left,TILES_BIGPOTION));
+		drawPotionBlueBubbles	3-15	-15	isIn(left,TILES_BIGPOTION)
 
 XX AllTile
 	# Wall/left
 	if ((!isIn(tile,TILES_WALL))&&(isIn(left,TILES_WALL))) 
-		drawAll((x)+0,(y)+2,63);
+		drawAll	0	2	63
 	# torch/this
 	if (isIn(tile,TILES_TORCH))
 	# animation
-		drawTorchFire((x)+11+TILE_W,(y)-39); 
+		drawTorchFire	11+TILE_W	-39
 		# base
-		drawAll((x)+3+TILE_W,(y)-24,56);
+		drawAll	3+TILE_W	-24	56
 	
 	# chopper/this
 	if (isIn(tile,TILE_CHOPPER)) 
-		drawChopper((x)+0,(y),chopperGetFrame(tile),layCBack);
+		drawChopper	0	0	chopperGetFrame(tile),layCBack
 	# empty_bricks/this
 	if (isIn(tile,TILES_BRICKE1)) 
-		drawAll((x)+TILE_W+0,(y)-18,52);
+		drawAll	TILE_W+0	-18	52
 	if (isIn(tile,TILES_BRICKE2)) 
-		drawAll((x)+TILE_W+0,(y)-18,53);
+		drawAll	TILE_W+0	-18	53
 	if (isIn(tile,TILES_WINDOW)) 
-		drawAll((x)+TILE_W+0,(y)-18,54);
+		drawAll	TILE_W+0	-18	54
 	# floor_bricks/this
 	if (isIn(tile,TILES_BRICKF1)) 
-		drawAll((x)+TILE_W+0,(y)-18,12);
+		drawAll	TILE_W+0	-18	12
 	if (isIn(tile,TILES_BRICKF2)) 
-		drawAll((x)+TILE_W+0,(y)-18,13);
+		drawAll	TILE_W+0	-18	13
 	# gate/this
 	if (isIn(tile,TILES_DOOR)) 
-		drawAll((x)+0,(y)+0,14);
+		drawAll	0	0	14
 	# gate_frame/this
 	if (isIn(tile,TILES_GATEFRAME)) 
-		drawAll((x)+24,(y)+0,17);
+		drawAll	24	0	17
 	# normal/this
 	if (isIn(tile,TILES_FLOOR)) 
-		drawAll((x)+0,(y)+0,9);
+		drawAll	0	0	9
 	# loose moving/this
 	if (isIn(tile,TILES_LOOSEMOVING)) 
-		drawLoose((x)+0,(y)+0,looseGetFrame(tile),layTribot);
+		drawLoose	0	0	looseGetFrame(tile),layTribot
 	# exit_left/this
 	if (isIn(tile,TILE_EXIT_RIGHT)) 
-		drawAll((x)+0,(y)+0,5);
+		drawAll	0	0	5
 	if (isIn(tile,TILE_EXIT_LEFT)) 
-		drawAll((x)+0,(y)+0,9);
-		drawExit((x)+TILE_W+8,(y)-TILE_H-1,gateGetFrame(tile));
+		drawAll	0	0	9
+		drawExit	TILE_W+8	-TILE_H-1	gateGetFrame(tile)
 	
 	# pillar/this
 	if (isIn(tile,TILES_PILLAR)) 
-		drawAll((x)+0,(y)+0,43);
+		drawAll	0	0	43
 	# big_pillar/this
 	if (isIn(tile,TILE_BP_BOTTOM)) 
-		drawAll((x)+0,(y)+0,82);
+		drawAll	0	0	82
 	if (isIn(tile,TILE_BP_TOP)) 
-		drawAll((x)+8,(y)+3,87);
+		drawAll	8	3	87
 	# pressable/this
 	# TODO: use boolean algebra to simplify this
 	if (isIn(tile,TILES_RAISE_UNPRESSED)&&isIn(left,TILES_WALKABLE)&&(!isIn(left,TILES_RAISE)))
-		drawAll((x)+0,(y),57);
+		drawAll	0	0	57
 	if ((isIn(tile,TILES_RAISE)&&((!isIn(tile,TILES_UNPRESSED))||(!isIn(left,TILES_WALKABLE))||isIn(left,TILES_RAISE)))&&(isIn(tile,TILES_UNPRESSED))) 
-		drawAll((x)+0,(y),58);
+		drawAll	0	0	58
 	if (((isIn(tile,TILES_RAISE)&&((!isIn(tile,TILES_UNPRESSED))||(!isIn(left,TILES_WALKABLE))||isIn(left,TILES_RAISE)))&&(!isIn(tile,TILES_UNPRESSED)))||isIn(tile,TILES_DROP_UNPRESSED))
-		drawAll((x)+0,(y)+1,58);
+		drawAll	0	1	58
 	if (isIn(tile,TILES_DROP_PRESSED)) 
-		drawAll((x)+0,(y)+2,58);
+		drawAll	0	2	58
 	# debris/this
 	if (isIn(tile,TILES_BROKENTILE)) 
-		drawAll((x)+0,(y)+0,48);
+		drawAll	0	0	48
 	# spikes/this
 	if (isIn(tile,TILES_SPIKES)) 
-		drawAll((x)+0,(y)+0,101);
-		drawSpike((x)+0,(y),spikeGetFrame(tile),layBack);
+		drawAll	0	0	101
+		drawSpike	0	0	spikeGetFrame(tile),layBack
 	
 	# skeleton/this
 	if (isIn(tile,TILES_SKELETON)) 
-		drawAll((x)+0,(y)+0,80);
+		drawAll	0	0	80
 
 XX AllBack
 	# loose moving
 	if (isIn(tile,TILES_LOOSEMOVING)) 
-		drawLoose((x)+0,(y)+3,looseGetFrame(tile),layBase);
+		drawLoose	0	3	looseGetFrame(tile),layBase
 	# normal
 	if (isIn(tile,TILES_UNPRESSED)) 
 		# TODO: drop has resource 59 for unpressed/raise 47? checkgame
-		drawAll((x)+0,(y)+3,59);
+		drawAll	0	3	59
 	if (isIn(tile,TILES_PRESSED)) 
-		drawAll((x)+0,(y)+4,59);
+		drawAll	0	4	59
 	if (isIn(tile,TILES_WALKABLE)&&(!isIn(tile,TILES_LOOSEMOVING))&&(!isIn(tile,TILES_PRESSABLE)))
-		drawAll((x)+0,(y)+3,11);
+		drawAll	0	3	11
 	# wall
 	# there are 4 cases
 	if (wallCase(WALL_LOC_WWW))
-		drawAll((x)+0,(y)+3,65);
+		drawAll	0	3	65
 	if (wallCase(WALL_LOC_SWW))
-		drawAll((x)+0,(y)+3,71);
+		drawAll	0	3	71
 	if (wallCase(WALL_LOC_WWS))
-		drawAll((x)+0,(y)+3,67);
+		drawAll	0	3	67
 	if (wallCase(WALL_LOC_SWS))
-		drawAll((x)+0,(y)+3,69);
+		drawAll	0	3	69
 	# empty/gate_frame/this
 	if (isIn(tile,TILES_SPACE)&&isIn(tile,TILES_GATEFRAME)) 
-		drawAll((x)+0,(y)+3,42);
+		drawAll	0	3	42
 	# empty/gate/left
 	if (isIn(tile,TILES_SPACE)&&isIn(dleft,TILES_DOOR)) 
-		drawAll((x)+0,(y)+3,16);
+		drawAll	0	3	16
 	# empty/big_pillar/left
 	if (isIn(tile,TILES_SPACE)&&isIn(dleft,TILE_BP_TOP)) 
-		drawAll((x)+0,(y)+3,86);
+		drawAll	0	3	86
 	# empty/pillar/left
 	if (isIn(tile,TILES_SPACE)&&isIn(dleft,TILES_PILLAR)) 
-		drawAll((x)+0,(y)+3,45);
+		drawAll	0	3	45
 	# empty/wall/left
 	if (isIn(tile,TILES_SPACE)&&isIn(dleft,TILES_WALL)) 
-		drawAll((x)+0,(y)+3,64);
+		drawAll	0	3	64
 
 	# upper objects
 	if (isIn(tile,TILE_EXIT_LEFT)) 
-		drawAll((x)+0+TILE_W,(y)-TILE_H+3,6);
+		drawAll	0+TILE_W	-TILE_H+3	6
 	if (isIn(tile,TILE_EXIT_RIGHT)) 
-		drawAll((x)+0+TILE_W,(y)-TILE_H+3,8);
+		drawAll	0+TILE_W	-TILE_H+3	8
 
 
 XX AllFore
 	# pillar
 	if (isIn(tile,TILES_PILLAR)) 
-		drawAll((x)+8,(y)+0,46);
+		drawAll	8	0	46
 	# big pillar
 	if (isIn(tile,TILE_BP_BOTTOM)) 
-		drawAll((x)+8,(y)+0,84);
+		drawAll	8	0	84
 	# wall
 	# there are 4 cases
 	if (wallCase(WALL_LOC_WWW))
-		drawAll((x)+0,(y)+0,66);
+		drawAll	0	0	66
 	if (wallCase(WALL_LOC_SWW))
-		drawAll((x)+0,(y)+0,72);
+		drawAll	0	0	72
 	if (wallCase(WALL_LOC_WWS))
-		drawAll((x)+0,(y)+0,68);
+		drawAll	0	0	68
 	if (wallCase(WALL_LOC_SWS))
-		drawAll((x)+0,(y)+0,70);
+		drawAll	0	0	70
 		
 	# the seed generation algorithm
 	# Upper row
 	if (wallGetInfo(WALL_TABLE_LINE1_DARKER))
-		drawAll((x)+0,(y)-39,75);
+		drawAll	0	-39	75
 	if (wallGetInfo(WALL_TABLE_LINE1_LEFT_DOWN))
-		drawAll((x)+0,(y)-39,77);
+		drawAll	0	-39	77
 	if (wallGetInfo(WALL_TABLE_LINE1_RIGHT_DOWN))
-		drawAll((x)+24,(y)-39,79);
+		drawAll	24	-39	79
 	if (wallGetInfo(WALL_TABLE_LINE1_RIGHT_UP))
-		drawAll((x)+24,(y)-49,78);
+		drawAll	24	-49	78
 	if (wallGetInfo(WALL_TABLE_LINE1_LEFT_UP))
-		drawAll((x)+0,(y)-54,76);
+		drawAll	0	-54	76
 	# Second row
 	if (isIn(tile,TILES_WALL))
-		drawAll((x)+7+wallGetInfo(WALL_TABLE_LINE2_OFFSET),(y)-18,74-wallGetInfo(WALL_TABLE_LINE2_SEP));
+		drawAll	7+wallGetInfo(WALL_TABLE_LINE2_OFFSET)	-18	74-wallGetInfo(WALL_TABLE_LINE2_SEP)
 	if (wallGetInfo(WALL_TABLE_LINE2_LEFT_DOWN))
-		drawAll((x)+7+wallGetInfo(WALL_TABLE_LINE2_OFFSET)+5,(y)-39+21,77);
+		drawAll	7+wallGetInfo(WALL_TABLE_LINE2_OFFSET)+5	-39+21	77
 	if (wallGetInfo(WALL_TABLE_LINE2_RIGHT_DOWN))
-		drawAll((x)+24+7+wallGetInfo(WALL_TABLE_LINE2_OFFSET)-32+5,(y)-39+21,79);
+		drawAll	24+7+wallGetInfo(WALL_TABLE_LINE2_OFFSET)-32+5	-39+21	79
 	if (wallGetInfo(WALL_TABLE_LINE2_RIGHT_UP))
-		drawAll((x)+24+7+wallGetInfo(WALL_TABLE_LINE2_OFFSET)-32+5,(y)-49+21,78);
+		drawAll	24+7+wallGetInfo(WALL_TABLE_LINE2_OFFSET)-32+5	-49+21	78
 	if (wallGetInfo(WALL_TABLE_LINE2_LEFT_UP))
-		drawAll((x)+7+wallGetInfo(WALL_TABLE_LINE2_OFFSET)+5,(y)-54+21,76);
+		drawAll	7+wallGetInfo(WALL_TABLE_LINE2_OFFSET)+5	-54+21	76
 	# Third row TODO: send to BottomTile
 	if (isIn(tile,TILES_WALL))
-		drawAll((x)+3+wallGetInfo(WALL_TABLE_LINE3_OFFSET),(y)+3,74-wallGetInfo(WALL_TABLE_LINE3_SEP));
+		drawAll	3+wallGetInfo(WALL_TABLE_LINE3_OFFSET)	3	74-wallGetInfo(WALL_TABLE_LINE3_SEP)
 	if (wallGetInfo(WALL_TABLE_LINE3_LEFT_UP))
-		drawAll((x)+5+wallGetInfo(WALL_TABLE_LINE3_OFFSET)+5,(y)-55+21*2,76);
+		drawAll	5+wallGetInfo(WALL_TABLE_LINE3_OFFSET)+5	-55+21*2	76
 
 	# debris/this foreground layer
 	if (isIn(tile,TILES_BROKENTILE)) 
-		drawAll((x)+0,(y)+0,51);
+		drawAll	0	0	51
 	# spikes/this foreground layer
 	if (isIn(tile,TILES_SPIKES)) 
-		drawSpike((x)+0,(y)+0,spikeGetFrame(tile),layFore);
+		drawSpike	0	0	spikeGetFrame(tile),layFore
 
 
 
diff --git a/FP/src/include/kernel.h b/FP/src/include/kernel.h
index 23abba4..956276b 100644
--- a/FP/src/include/kernel.h
+++ b/FP/src/include/kernel.h
@@ -43,7 +43,7 @@ kernel.h: Princed Resources : Resource Handler headers
 #define hasFlag(a) (optionflag&(a))
 #define setFlag(a) optionflag|=(a)
 
-#define FP_VERSION "0.4-pre-alpha-shadow-of-the-castle"
+#define FP_VERSION "0.4-pre-alpha-rata"
 
 int kernel(int optionflag,int level);
 /* level=-1 is default