indentation

git-svn-id: file:///var/svn/2010-netlemmings/trunk@132 077b3477-7977-48bd-8428-443f22f7bfda

2 files changed, 61 insertions, 61 deletions

diff --git a/sdl-test/SDL_tuto/TestParserLemmingsLVL/fonctions_non_integrees.c b/sdl-test/SDL_tuto/TestParserLemmingsLVL/fonctions_non_integrees.c
index b286a97..a493559 100644
--- a/sdl-test/SDL_tuto/TestParserLemmingsLVL/fonctions_non_integrees.c
+++ b/sdl-test/SDL_tuto/TestParserLemmingsLVL/fonctions_non_integrees.c
@@ -253,7 +253,7 @@ int checkPixelDOWN(int nbr, int x, int y){
 		if(err==ccc_error){return 113;}
 
 		//-DEBUG-printf("res %d\n",res);
-		
+
 		if((err==ccc_oNoDigLeft)||(err==ccc_oNoDigRight)){
 			return res;
 		}	
@@ -290,9 +290,9 @@ int checkPixelUP(int nbr, int x, int y, int size ){
 		err=get_pixel32(x,ym-res,pStencil);
 		if(err==ccc_error){return 113;}
 
-	if((err==ccc_oNoDigLeft)||(err==ccc_oNoDigRight)){
-		return res;
-	}
+		if((err==ccc_oNoDigLeft)||(err==ccc_oNoDigRight)){
+			return res;
+		}
 		if((err&0xbb)!=0xbb){// it's not an object
 			if((err&0xcb)!=0xcb){// it's not a blocker
 				if(err!=ccc_bgStencil){
@@ -337,11 +337,11 @@ int aboveGround(int x, int y) {
 
 		err=get_pixel32(x,y-res,pStencil);
 		if(err==ccc_error){return 114;}
-		
+
 		if(!((err==ccc_oNoDigLeft)||(err==ccc_oNoDigRight))){
-		if((err&0xbb)==0xbb){//it'an object
-			return res;
-		}
+			if((err&0xbb)==0xbb){//it'an object
+				return res;
+			}
 		}
 		if((err&0xcb)==0xcb){// it's a blocker
 			return res;			
@@ -379,7 +379,7 @@ int reachedPlateau(int x, int y, int size, int dir) {
 
 	err=get_pixel32(x,y,pStencil);
 	if(err==ccc_error){return 115;}
-	
+
 	if((err==ccc_oNoDigLeft)||(err==ccc_oNoDigRight)){
 		return 0;
 	}
@@ -393,7 +393,7 @@ int reachedPlateau(int x, int y, int size, int dir) {
 	if(err==ccc_bgStencil){
 		return 1;
 	}
-return 0;
+	return 0;
 }
 
 int explode(int x, int y, int size){
@@ -424,7 +424,7 @@ int turnedByStopper(int x, int y, int dir) {
 	if(err==ccc_error){return 116;}
 
 	//-DEBUG-printf("err %p\n",err);
-	
+
 	if (err == ccc_lStopperLeft && dir==1) {//Right
 		//LEFT;
 		return 0;
@@ -483,7 +483,7 @@ int stateLemming(struct gameInit *gInit){
 
 			lh=sfT->h/lState;
 			lw=sfT->w;
-			
+
 			oldX=k->x;
 			oldType=k->ID;
 			newType=k->ID;
@@ -513,7 +513,7 @@ int stateLemming(struct gameInit *gInit){
 			}
 			//if (selectCtr>0) {selectCtr--;}
 			if (flip) {k->data.pl->dir = (k->data.pl->dir==1) ? 0 : 1 ;}
-			
+
 
 			switch(k->ID){
 				case 3 : // climber_to_walker
@@ -524,10 +524,10 @@ int stateLemming(struct gameInit *gInit){
 						break;
 					}
 					if(k->data.pl->cptState>0)
-						{break;}
+					{break;}
 					else
-						{k->ID=1;}
-					
+					{k->ID=1;}
+
 				case 1 : // faller
 					{//-DEBUG-printf("faller ->");
 						if(boom){
@@ -2351,56 +2351,56 @@ int stateLemming(struct gameInit *gInit){
 
 		//DEBUT TEST: SPR
 		for(passage=0;passage<2;++passage){
-		k=gInit->o.lo;
-		while ( k !=NULL ) {
+			k=gInit->o.lo;
+			while ( k !=NULL ) {
 
-			sf = gInit->mapI.map.tabGif[gInit->mapI.map.tiles*2+k->ID*2+k->data.po->UD+ADD_OBJ];
+				sf = gInit->mapI.map.tabGif[gInit->mapI.map.tiles*2+k->ID*2+k->data.po->UD+ADD_OBJ];
 
-			type=gInit->mapI.map.tabDataSprO[k->ID].type;
-			
-			if(((passage==0)&&((type==3)||(type==4)))||
-				((passage==1)&&(type!=3)&&(type!=4))){
+				type=gInit->mapI.map.tabDataSprO[k->ID].type;
 
-			offset.x = k->x;
-			offset.y = k->y;
+				if(((passage==0)&&((type==3)||(type==4)))||
+						((passage==1)&&(type!=3)&&(type!=4))){
 
-			objetAnim.x = 0;
-			objetAnim.h = sf->h/gInit->mapI.map.tabDataSprO[k->ID].state;
-			objetAnim.y = (anim_objet(
-						gInit->mapI.map.tabDataSprO[k->ID].anim,
-						type,
-						cptFps,
-						gInit->mapI.map.tabDataSprO[k->ID].state,
-						&k->data.po->cptState,
-						gInit)
-				      )*(objetAnim.h);
-			objetAnim.w = sf->w;
+					offset.x = k->x;
+					offset.y = k->y;
 
-			rStencil.x=k->x ;
-			rStencil.y=k->y ;
-			rStencil.h=objetAnim.h;
-			rStencil.w=objetAnim.w;
+					objetAnim.x = 0;
+					objetAnim.h = sf->h/gInit->mapI.map.tabDataSprO[k->ID].state;
+					objetAnim.y = (anim_objet(
+								gInit->mapI.map.tabDataSprO[k->ID].anim,
+								type,
+								cptFps,
+								gInit->mapI.map.tabDataSprO[k->ID].state,
+								&k->data.po->cptState,
+								gInit)
+						      )*(objetAnim.h);
+					objetAnim.w = sf->w;
 
-			mode=k->data.po->paintMode;
+					rStencil.x=k->x ;
+					rStencil.y=k->y ;
+					rStencil.h=objetAnim.h;
+					rStencil.w=objetAnim.w;
 
-			// check combi impossible
-			if((mode!=8)&&((type==3)||(type==4))){
-				//-DEBUG-printf("Construction impossible: mode!=%d(8) && type=%d(3 ou 4)\n",mode,type);
-				return 56;
-			}
-			if((mode==8)&&(type==5)){
-				//-DEBUG-printf("Construction impossible: mode==%d(8) && type=%d(5)\n",mode,type);
-				return 57;
-			}
-			// fin check
-			rStencil.x=0 ;
-			rStencil.y=objetAnim.y ;
-			if((err=paint_manip(sf,rStencil,pSpr_Lem,offset,gInit->mapI.map.cmap.bgColor,ccc_keyGif,mode,NULL))!=0){
-				return err;
-			}
+					mode=k->data.po->paintMode;
+
+					// check combi impossible
+					if((mode!=8)&&((type==3)||(type==4))){
+						//-DEBUG-printf("Construction impossible: mode!=%d(8) && type=%d(3 ou 4)\n",mode,type);
+						return 56;
+					}
+					if((mode==8)&&(type==5)){
+						//-DEBUG-printf("Construction impossible: mode==%d(8) && type=%d(5)\n",mode,type);
+						return 57;
+					}
+					// fin check
+					rStencil.x=0 ;
+					rStencil.y=objetAnim.y ;
+					if((err=paint_manip(sf,rStencil,pSpr_Lem,offset,gInit->mapI.map.cmap.bgColor,ccc_keyGif,mode,NULL))!=0){
+						return err;
+					}
+				}
+				k=k->next;
 			}
-			k=k->next;
-		}
 		}//for passage
 		///FIN TEST: SPR
 		return 0;
@@ -3221,8 +3221,6 @@ int lancement (){
 
 	SDL_SetColorKey(pTerrain, SDL_SRCCOLORKEY|SDL_RLEACCEL, gInit.mapI.map.cmap.bgColor);
 
-	err=print_num(screen, gInit.mapI.map.tabGif[1], screen->w-37, screen->h-10, FPS);
-	if(err!=0){return err;}
 
 	test_blit(pStencil, NULL, pStencilFixe, NULL);
 	SDL_SetColorKey(pStencilFixe, SDL_SRCCOLORKEY, ccc_bgStencil);
@@ -3383,6 +3381,8 @@ int lancement (){
 		err=print_num(screen, gInit.mapI.map.tabGif[1], screen->w-87, screen->h-10, fps);
 		if(err!=0){return err;}
 
+		err=print_num(screen, gInit.mapI.map.tabGif[1], screen->w-37, screen->h-10, FPS);
+		if(err!=0){return err;}
 		//Mise à jour de l'écran
 		if( SDL_Flip( screen ) == -1 ) {
 			return 4;
diff --git a/sdl-test/SDL_tuto/TestParserLemmingsLVL/parse_ini.yy b/sdl-test/SDL_tuto/TestParserLemmingsLVL/parse_ini.yy
index 9ad0a09..b6ae4e5 100644
--- a/sdl-test/SDL_tuto/TestParserLemmingsLVL/parse_ini.yy
+++ b/sdl-test/SDL_tuto/TestParserLemmingsLVL/parse_ini.yy
@@ -555,7 +555,7 @@
 	int miniMap (SDL_Surface *s, int x0, int y0, float coefX, float coefY);
 
 	int paint_stencil=0;
-	
+
 	%}
 
 	%parse-param { struct gameInit *gInit }