git » fp-git.git » commit 2a0009f

nearer to compile

author ecalot
2004-08-15 01:29:40 UTC
committer ecalot
2004-08-15 01:29:40 UTC
parent d30839ec4aa9878ab7f96bcfae636ac2a851f801
nearer to compile
FP/src/conf/files.conf +3 -8
FP/src/conf/resources.conf +1 -2
FP/src/ker/kid.c +20 -20
FP/src/ker/object.c +20 -20 
diff --git a/FP/src/conf/files.conf b/FP/src/conf/files.conf
index 9c638e1..01deb73 100644
--- a/FP/src/conf/files.conf
+++ b/FP/src/conf/files.conf
@@ -3,15 +3,10 @@
 LEVEL	levels.dat
 KID	kid.dat
 PRINCE	prince.dat
-VDUNGEON	vdungeon.dat
+DUNGEON	vdungeon.dat
 PCSOUND	ibmsnd1.dat	ibmsnd2.dat
 TITLES	titles.dat
-
-
-
-
-
-
-
+GUARD   guard1.dat
+PV      pv.dat
 
 
diff --git a/FP/src/conf/resources.conf b/FP/src/conf/resources.conf
index 3964739..a6f9761 100644
--- a/FP/src/conf/resources.conf
+++ b/FP/src/conf/resources.conf
@@ -5,9 +5,8 @@
 
 #define             type file    resources
 MAP                  LVL LEVEL   2000
-ANIM_JUMP            IMG KID     400 481-499
 ANIM_CROUCH          IMG KID     400 518-530
-ANIM_JUMP            IMG KID     400 481-499 
+ANIM_JUMP            IMG KID     400 481-499
 ANIM_JUMPRUN         IMG KID     400 434-444
 ANIM_NORMAL          IMG KID     400 415 415 415 
 ANIM_RUN             IMG KID     400 407-414 
diff --git a/FP/src/ker/kid.c b/FP/src/ker/kid.c
index 88f8df3..24fd5a6 100644
--- a/FP/src/ker/kid.c
+++ b/FP/src/ker/kid.c
@@ -49,26 +49,26 @@ static struct {
 } kidGfx;
 
 void loadGfx() {
-	kidGfx.turning[DIR_LEFT]=resLoad(RES_ANIM_TURNING|RES_MOD_LEFT);
-	kidGfx.turning[DIR_RIGHT]=resLoad(RES_ANIM_TURNING|RES_MOD_RIGHT);
-	kidGfx.normal[DIR_LEFT]=resLoad(RES_ANIM_NORMAL|RES_MOD_LEFT);
-	kidGfx.normal[DIR_RIGHT]=resLoad(RES_ANIM_NORMAL|RES_MOD_RIGHT);
-	kidGfx.walking[DIR_LEFT]=resLoad(RES_ANIM_WALKING|RES_MOD_LEFT);
-	kidGfx.walking[DIR_RIGHT]=resLoad(RES_ANIM_WALKING|RES_MOD_RIGHT);
-	kidGfx.couching[DIR_LEFT]=resLoad(RES_ANIM_COUCH|RES_MOD_LEFT);
-	kidGfx.couching[DIR_RIGHT]=resLoad(RES_ANIM_COUCH|RES_MOD_RIGHT);
-	kidGfx.jumping[DIR_LEFT]=resLoad(RES_ANIM_JUMP|RES_MOD_LEFT);
-	kidGfx.jumping[DIR_RIGHT]=resLoad(RES_ANIM_JUMP|RES_MOD_RIGHT);
-	kidGfx.running[DIR_LEFT]=resLoad(RES_ANIM_RUN|RES_MOD_LEFT);
-	kidGfx.running[DIR_RIGHT]=resLoad(RES_ANIM_RUN|RES_MOD_RIGHT);
-	kidGfx.startrunning[DIR_LEFT]=resLoad(RES_ANIM_RUN_START|RES_MOD_LEFT);
-	kidGfx.startrunning[DIR_RIGHT]=resLoad(RES_ANIM_RUN_START|RES_MOD_RIGHT);
-	kidGfx.stoprunning[DIR_LEFT]=resLoad(RES_ANIM_RUN_STOP|RES_MOD_LEFT);
-	kidGfx.stoprunning[DIR_RIGHT]=resLoad(RES_ANIM_RUN_STOP|RES_MOD_RIGHT);
-	kidGfx.turnrunning[DIR_LEFT]=resLoad(RES_ANIM_RUN_TURN|RES_MOD_LEFT);
-	kidGfx.turnrunning[DIR_RIGHT]=resLoad(RES_ANIM_RUN_TURN|RES_MOD_RIGHT);
-	kidGfx.jumprunning[DIR_LEFT]=resLoad(RES_ANIM_JUMPRUN|RES_MOD_LEFT);
-	kidGfx.jumprunning[DIR_RIGHT]=resLoad(RES_ANIM_JUMPRUN|RES_MOD_RIGHT);
+	kidGfx.turning[DIR_LEFT]=resLoad(RES_ANIM_TURNING|RES_MODS_LEFT);
+	kidGfx.turning[DIR_RIGHT]=resLoad(RES_ANIM_TURNING|RES_MODS_RIGHT);
+	kidGfx.normal[DIR_LEFT]=resLoad(RES_ANIM_NORMAL|RES_MODS_LEFT);
+	kidGfx.normal[DIR_RIGHT]=resLoad(RES_ANIM_NORMAL|RES_MODS_RIGHT);
+	kidGfx.walking[DIR_LEFT]=resLoad(RES_ANIM_WALKING|RES_MODS_LEFT);
+	kidGfx.walking[DIR_RIGHT]=resLoad(RES_ANIM_WALKING|RES_MODS_RIGHT);
+	kidGfx.couching[DIR_LEFT]=resLoad(RES_ANIM_CROUCH|RES_MODS_LEFT);
+	kidGfx.couching[DIR_RIGHT]=resLoad(RES_ANIM_CROUCH|RES_MODS_RIGHT);
+	kidGfx.jumping[DIR_LEFT]=resLoad(RES_ANIM_JUMP|RES_MODS_LEFT);
+	kidGfx.jumping[DIR_RIGHT]=resLoad(RES_ANIM_JUMP|RES_MODS_RIGHT);
+	kidGfx.running[DIR_LEFT]=resLoad(RES_ANIM_RUN|RES_MODS_LEFT);
+	kidGfx.running[DIR_RIGHT]=resLoad(RES_ANIM_RUN|RES_MODS_RIGHT);
+	kidGfx.startrunning[DIR_LEFT]=resLoad(RES_ANIM_RUN_START|RES_MODS_LEFT);
+	kidGfx.startrunning[DIR_RIGHT]=resLoad(RES_ANIM_RUN_START|RES_MODS_RIGHT);
+	kidGfx.stoprunning[DIR_LEFT]=resLoad(RES_ANIM_RUN_STOP|RES_MODS_LEFT);
+	kidGfx.stoprunning[DIR_RIGHT]=resLoad(RES_ANIM_RUN_STOP|RES_MODS_RIGHT);
+	kidGfx.turnrunning[DIR_LEFT]=resLoad(RES_ANIM_RUN_TURN|RES_MODS_LEFT);
+	kidGfx.turnrunning[DIR_RIGHT]=resLoad(RES_ANIM_RUN_TURN|RES_MODS_RIGHT);
+	kidGfx.jumprunning[DIR_LEFT]=resLoad(RES_ANIM_JUMPRUN|RES_MODS_LEFT);
+	kidGfx.jumprunning[DIR_RIGHT]=resLoad(RES_ANIM_JUMPRUN|RES_MODS_RIGHT);
 }
 
 void kidFree() {
diff --git a/FP/src/ker/object.c b/FP/src/ker/object.c
index 88f8df3..24fd5a6 100644
--- a/FP/src/ker/object.c
+++ b/FP/src/ker/object.c
@@ -49,26 +49,26 @@ static struct {
 } kidGfx;
 
 void loadGfx() {
-	kidGfx.turning[DIR_LEFT]=resLoad(RES_ANIM_TURNING|RES_MOD_LEFT);
-	kidGfx.turning[DIR_RIGHT]=resLoad(RES_ANIM_TURNING|RES_MOD_RIGHT);
-	kidGfx.normal[DIR_LEFT]=resLoad(RES_ANIM_NORMAL|RES_MOD_LEFT);
-	kidGfx.normal[DIR_RIGHT]=resLoad(RES_ANIM_NORMAL|RES_MOD_RIGHT);
-	kidGfx.walking[DIR_LEFT]=resLoad(RES_ANIM_WALKING|RES_MOD_LEFT);
-	kidGfx.walking[DIR_RIGHT]=resLoad(RES_ANIM_WALKING|RES_MOD_RIGHT);
-	kidGfx.couching[DIR_LEFT]=resLoad(RES_ANIM_COUCH|RES_MOD_LEFT);
-	kidGfx.couching[DIR_RIGHT]=resLoad(RES_ANIM_COUCH|RES_MOD_RIGHT);
-	kidGfx.jumping[DIR_LEFT]=resLoad(RES_ANIM_JUMP|RES_MOD_LEFT);
-	kidGfx.jumping[DIR_RIGHT]=resLoad(RES_ANIM_JUMP|RES_MOD_RIGHT);
-	kidGfx.running[DIR_LEFT]=resLoad(RES_ANIM_RUN|RES_MOD_LEFT);
-	kidGfx.running[DIR_RIGHT]=resLoad(RES_ANIM_RUN|RES_MOD_RIGHT);
-	kidGfx.startrunning[DIR_LEFT]=resLoad(RES_ANIM_RUN_START|RES_MOD_LEFT);
-	kidGfx.startrunning[DIR_RIGHT]=resLoad(RES_ANIM_RUN_START|RES_MOD_RIGHT);
-	kidGfx.stoprunning[DIR_LEFT]=resLoad(RES_ANIM_RUN_STOP|RES_MOD_LEFT);
-	kidGfx.stoprunning[DIR_RIGHT]=resLoad(RES_ANIM_RUN_STOP|RES_MOD_RIGHT);
-	kidGfx.turnrunning[DIR_LEFT]=resLoad(RES_ANIM_RUN_TURN|RES_MOD_LEFT);
-	kidGfx.turnrunning[DIR_RIGHT]=resLoad(RES_ANIM_RUN_TURN|RES_MOD_RIGHT);
-	kidGfx.jumprunning[DIR_LEFT]=resLoad(RES_ANIM_JUMPRUN|RES_MOD_LEFT);
-	kidGfx.jumprunning[DIR_RIGHT]=resLoad(RES_ANIM_JUMPRUN|RES_MOD_RIGHT);
+	kidGfx.turning[DIR_LEFT]=resLoad(RES_ANIM_TURNING|RES_MODS_LEFT);
+	kidGfx.turning[DIR_RIGHT]=resLoad(RES_ANIM_TURNING|RES_MODS_RIGHT);
+	kidGfx.normal[DIR_LEFT]=resLoad(RES_ANIM_NORMAL|RES_MODS_LEFT);
+	kidGfx.normal[DIR_RIGHT]=resLoad(RES_ANIM_NORMAL|RES_MODS_RIGHT);
+	kidGfx.walking[DIR_LEFT]=resLoad(RES_ANIM_WALKING|RES_MODS_LEFT);
+	kidGfx.walking[DIR_RIGHT]=resLoad(RES_ANIM_WALKING|RES_MODS_RIGHT);
+	kidGfx.couching[DIR_LEFT]=resLoad(RES_ANIM_CROUCH|RES_MODS_LEFT);
+	kidGfx.couching[DIR_RIGHT]=resLoad(RES_ANIM_CROUCH|RES_MODS_RIGHT);
+	kidGfx.jumping[DIR_LEFT]=resLoad(RES_ANIM_JUMP|RES_MODS_LEFT);
+	kidGfx.jumping[DIR_RIGHT]=resLoad(RES_ANIM_JUMP|RES_MODS_RIGHT);
+	kidGfx.running[DIR_LEFT]=resLoad(RES_ANIM_RUN|RES_MODS_LEFT);
+	kidGfx.running[DIR_RIGHT]=resLoad(RES_ANIM_RUN|RES_MODS_RIGHT);
+	kidGfx.startrunning[DIR_LEFT]=resLoad(RES_ANIM_RUN_START|RES_MODS_LEFT);
+	kidGfx.startrunning[DIR_RIGHT]=resLoad(RES_ANIM_RUN_START|RES_MODS_RIGHT);
+	kidGfx.stoprunning[DIR_LEFT]=resLoad(RES_ANIM_RUN_STOP|RES_MODS_LEFT);
+	kidGfx.stoprunning[DIR_RIGHT]=resLoad(RES_ANIM_RUN_STOP|RES_MODS_RIGHT);
+	kidGfx.turnrunning[DIR_LEFT]=resLoad(RES_ANIM_RUN_TURN|RES_MODS_LEFT);
+	kidGfx.turnrunning[DIR_RIGHT]=resLoad(RES_ANIM_RUN_TURN|RES_MODS_RIGHT);
+	kidGfx.jumprunning[DIR_LEFT]=resLoad(RES_ANIM_JUMPRUN|RES_MODS_LEFT);
+	kidGfx.jumprunning[DIR_RIGHT]=resLoad(RES_ANIM_JUMPRUN|RES_MODS_RIGHT);
 }
 
 void kidFree() {