git » fp-git.git » commit 685cbc3

renamed RES_MOD_RIGHT to RES_MOD_INVERT

author ecalot
2004-08-18 08:11:00 UTC
committer ecalot
2004-08-18 08:11:00 UTC
parent b434f73e0634ea55cc5eb27c63cee0873150fc96
renamed RES_MOD_RIGHT to RES_MOD_INVERT
FP/src/conf/mods.conf +1 -2
FP/src/ker/kid.c +20 -20
FP/src/ker/object.c +20 -20
FP/src/res/resources.c +2 -1 
diff --git a/FP/src/conf/mods.conf b/FP/src/conf/mods.conf
index fd919c3..bfa4635 100644
--- a/FP/src/conf/mods.conf
+++ b/FP/src/conf/mods.conf
@@ -1,5 +1,4 @@
-LEFT   0x00
-RIGHT  0x01
+INVERT 0x01
 BW     0x02
 HAS_D  0x04
 HAS_L  0x08
diff --git a/FP/src/ker/kid.c b/FP/src/ker/kid.c
index ff43b85..6a80ba6 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_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);
+	kidGfx.turning[DIR_LEFT]=resLoad(RES_ANIM_TURNING);
+	kidGfx.turning[DIR_RIGHT]=resLoad(RES_ANIM_TURNING|RES_MODS_INVERT);
+	kidGfx.normal[DIR_LEFT]=resLoad(RES_ANIM_NORMAL);
+	kidGfx.normal[DIR_RIGHT]=resLoad(RES_ANIM_NORMAL|RES_MODS_INVERT);
+	kidGfx.walking[DIR_LEFT]=resLoad(RES_ANIM_WALKING);
+	kidGfx.walking[DIR_RIGHT]=resLoad(RES_ANIM_WALKING|RES_MODS_INVERT);
+	kidGfx.couching[DIR_LEFT]=resLoad(RES_ANIM_CROUCH);
+	kidGfx.couching[DIR_RIGHT]=resLoad(RES_ANIM_CROUCH|RES_MODS_INVERT);
+	kidGfx.jumping[DIR_LEFT]=resLoad(RES_ANIM_JUMP);
+	kidGfx.jumping[DIR_RIGHT]=resLoad(RES_ANIM_JUMP|RES_MODS_INVERT);
+	kidGfx.running[DIR_LEFT]=resLoad(RES_ANIM_RUN);
+	kidGfx.running[DIR_RIGHT]=resLoad(RES_ANIM_RUN|RES_MODS_INVERT);
+	kidGfx.startrunning[DIR_LEFT]=resLoad(RES_ANIM_RUN_START);
+	kidGfx.startrunning[DIR_RIGHT]=resLoad(RES_ANIM_RUN_START|RES_MODS_INVERT);
+	kidGfx.stoprunning[DIR_LEFT]=resLoad(RES_ANIM_RUN_STOP);
+	kidGfx.stoprunning[DIR_RIGHT]=resLoad(RES_ANIM_RUN_STOP|RES_MODS_INVERT);
+	kidGfx.turnrunning[DIR_LEFT]=resLoad(RES_ANIM_RUN_TURN);
+	kidGfx.turnrunning[DIR_RIGHT]=resLoad(RES_ANIM_RUN_TURN|RES_MODS_INVERT);
+	kidGfx.jumprunning[DIR_LEFT]=resLoad(RES_ANIM_JUMPRUN);
+	kidGfx.jumprunning[DIR_RIGHT]=resLoad(RES_ANIM_JUMPRUN|RES_MODS_INVERT);
 }
 
 void kidFree() {
diff --git a/FP/src/ker/object.c b/FP/src/ker/object.c
index ff43b85..6a80ba6 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_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);
+	kidGfx.turning[DIR_LEFT]=resLoad(RES_ANIM_TURNING);
+	kidGfx.turning[DIR_RIGHT]=resLoad(RES_ANIM_TURNING|RES_MODS_INVERT);
+	kidGfx.normal[DIR_LEFT]=resLoad(RES_ANIM_NORMAL);
+	kidGfx.normal[DIR_RIGHT]=resLoad(RES_ANIM_NORMAL|RES_MODS_INVERT);
+	kidGfx.walking[DIR_LEFT]=resLoad(RES_ANIM_WALKING);
+	kidGfx.walking[DIR_RIGHT]=resLoad(RES_ANIM_WALKING|RES_MODS_INVERT);
+	kidGfx.couching[DIR_LEFT]=resLoad(RES_ANIM_CROUCH);
+	kidGfx.couching[DIR_RIGHT]=resLoad(RES_ANIM_CROUCH|RES_MODS_INVERT);
+	kidGfx.jumping[DIR_LEFT]=resLoad(RES_ANIM_JUMP);
+	kidGfx.jumping[DIR_RIGHT]=resLoad(RES_ANIM_JUMP|RES_MODS_INVERT);
+	kidGfx.running[DIR_LEFT]=resLoad(RES_ANIM_RUN);
+	kidGfx.running[DIR_RIGHT]=resLoad(RES_ANIM_RUN|RES_MODS_INVERT);
+	kidGfx.startrunning[DIR_LEFT]=resLoad(RES_ANIM_RUN_START);
+	kidGfx.startrunning[DIR_RIGHT]=resLoad(RES_ANIM_RUN_START|RES_MODS_INVERT);
+	kidGfx.stoprunning[DIR_LEFT]=resLoad(RES_ANIM_RUN_STOP);
+	kidGfx.stoprunning[DIR_RIGHT]=resLoad(RES_ANIM_RUN_STOP|RES_MODS_INVERT);
+	kidGfx.turnrunning[DIR_LEFT]=resLoad(RES_ANIM_RUN_TURN);
+	kidGfx.turnrunning[DIR_RIGHT]=resLoad(RES_ANIM_RUN_TURN|RES_MODS_INVERT);
+	kidGfx.jumprunning[DIR_LEFT]=resLoad(RES_ANIM_JUMPRUN);
+	kidGfx.jumprunning[DIR_RIGHT]=resLoad(RES_ANIM_JUMPRUN|RES_MODS_INVERT);
 }
 
 void kidFree() {
diff --git a/FP/src/res/resources.c b/FP/src/res/resources.c
index fe4bd18..21148a2 100644
--- a/FP/src/res/resources.c
+++ b/FP/src/res/resources.c
@@ -168,6 +168,7 @@ tData* resLoad(long id) {
 			int has_L=((mask&RES_MODS_HAS_L)?1:0);
 			int has_R=((mask&RES_MODS_HAS_R)?1:0);
 			int down,left,right;
+			int invert=((mask&(RES_MODS_INVERT))==(RES_MODS_INVERT));
 
 			result=(tData*)malloc(sizeof(tData));
 			result->frames=total-2; /* drop filename and palette */
@@ -206,7 +207,7 @@ tData* resLoad(long id) {
 				printf("resLoad: Allocating an image framed %d by offsets d=%d,l=%d,r=%d\n",total,down,left,right);
 				result->pFrames[total]=(void*)outputLoadBitmap(
 					image.pix,image.widthInBytes*image.height,pal,image.height,image.width,
-					(mask&(RES_MODS_RIGHT))==(RES_MODS_RIGHT),1
+					invert,1/*,down,invert?right:left*/
         );
 
 				/* free intermediate image data */