test

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

2 files changed, 12 insertions, 12 deletions

diff --git a/sdl-test/SDL_tuto/TestParserLemmingsLVL/fonctions_integrees.c b/sdl-test/SDL_tuto/TestParserLemmingsLVL/fonctions_integrees.c
index 0869d2b..d40638b 100644
--- a/sdl-test/SDL_tuto/TestParserLemmingsLVL/fonctions_integrees.c
+++ b/sdl-test/SDL_tuto/TestParserLemmingsLVL/fonctions_integrees.c
@@ -9,7 +9,7 @@ int init()
 	}
 
 	//Mise en place de l'écran
-	screen = SDL_SetVideoMode( SCREEN_WIDTH, SCREEN_HEIGHT, SCREEN_BPP, SDL_SWSURFACE | SDL_ASYNCBLIT);
+	screen = SDL_SetVideoMode( SCREEN_WIDTH, SCREEN_HEIGHT, SCREEN_BPP, SDL_DOUBLEBUF | SDL_HWSURFACE | SDL_ASYNCBLIT);
 
 	//-DEBUG-printf("DEBUG ludo :  screen->w==%i,  screen->h==%i\n",  screen->w,  screen->h);
 	//S'il y a une erreur lors de la mise en place de l'écran
@@ -18,38 +18,38 @@ int init()
 		return 2;
 	}
 
-	pTerrain = SDL_CreateRGBSurface(SDL_SWSURFACE, LEVEL_WIDTH, LEVEL_HEIGHT,
+	pTerrain = SDL_CreateRGBSurface(SDL_HWSURFACE|SDL_HWACCEL|SDL_ASYNCBLIT|SDL_RLEACCEL, LEVEL_WIDTH, LEVEL_HEIGHT,
 			SCREEN_BPP,0,0,0,0);//(ccc_black>> 16) & 0xff, (ccc_black>> 8)&0xff,(ccc_black& 0xff),0);
 	if( pTerrain == NULL ) {
 		return 3;
 	}
 
-	pSpr_Lem = SDL_CreateRGBSurface(SDL_SWSURFACE, LEVEL_WIDTH, LEVEL_HEIGHT,
+	pSpr_Lem = SDL_CreateRGBSurface(SDL_HWSURFACE|SDL_HWACCEL|SDL_ASYNCBLIT|SDL_RLEACCEL, LEVEL_WIDTH, LEVEL_HEIGHT,
 			SCREEN_BPP,0,0,0,0);
 
 	if( pSpr_Lem == NULL ) {
 		return 3;
 	}
 	
-	pSprLemBack = SDL_CreateRGBSurface(SDL_SWSURFACE , LEVEL_WIDTH, LEVEL_HEIGHT,
+	pSprLemBack = SDL_CreateRGBSurface(SDL_HWSURFACE|SDL_HWACCEL|SDL_ASYNCBLIT|SDL_RLEACCEL , LEVEL_WIDTH, LEVEL_HEIGHT,
 			SCREEN_BPP,0,0,0,0);
 
 	if( pSprLemBack == NULL ) {
 		return 3;
 	}
-	pStencil = SDL_CreateRGBSurface(SDL_SWSURFACE, LEVEL_WIDTH, LEVEL_HEIGHT,
+	pStencil = SDL_CreateRGBSurface(SDL_HWSURFACE|SDL_HWACCEL|SDL_ASYNCBLIT|SDL_RLEACCEL, LEVEL_WIDTH, LEVEL_HEIGHT,
 			SCREEN_BPP,0,0,0,0);
 	if( pStencil == NULL ) {
 		return 3;
 	}
 
-	pStencilFixe = SDL_CreateRGBSurface(SDL_SWSURFACE, LEVEL_WIDTH, LEVEL_HEIGHT,
+	pStencilFixe = SDL_CreateRGBSurface(SDL_HWSURFACE|SDL_HWACCEL|SDL_ASYNCBLIT|SDL_RLEACCEL, LEVEL_WIDTH, LEVEL_HEIGHT,
 			SCREEN_BPP,0,0,0,0);
 	if( pStencil == NULL ) {
 		return 3;
 	}
 	
-	pInterface = SDL_CreateRGBSurface(SDL_SWSURFACE, SCREEN_WIDTH, INTERFACE_HEIGHT,
+	pInterface = SDL_CreateRGBSurface(SDL_HWSURFACE|SDL_HWACCEL|SDL_ASYNCBLIT|SDL_RLEACCEL, SCREEN_WIDTH, INTERFACE_HEIGHT,
 			SCREEN_BPP,0,0,0,0);
 	if( pInterface == NULL ) {
 		return 3;
diff --git a/sdl-test/SDL_tuto/TestParserLemmingsLVL/fonctions_non_integrees.c b/sdl-test/SDL_tuto/TestParserLemmingsLVL/fonctions_non_integrees.c
index 1b80fa9..61b5513 100644
--- a/sdl-test/SDL_tuto/TestParserLemmingsLVL/fonctions_non_integrees.c
+++ b/sdl-test/SDL_tuto/TestParserLemmingsLVL/fonctions_non_integrees.c
@@ -1024,7 +1024,7 @@ int stateLemming(struct gameInit *gInit){
 		}
 		buf[p++] = value%10;
 
-		/* Render! */
+		// Render!
 		from.x = 0;
 		from.w = src->w;
 		from.h = src->h/10;
@@ -1812,7 +1812,7 @@ int stateLemming(struct gameInit *gInit){
 		gInit->l.ll->data.pl->cptBrick=0;
 		gInit->l.ll->data.pl->oldX=k->x; 
 		gInit->l.ll->data.pl->oldY=k->y;
-		gInit->l.ll->data.pl->imgF=SDL_CreateRGBSurface(SDL_SWSURFACE, 32, 20,
+		gInit->l.ll->data.pl->imgF=SDL_CreateRGBSurface(SDL_HWSURFACE|SDL_HWACCEL|SDL_ASYNCBLIT|SDL_RLEACCEL, 32, 20,
 			SCREEN_BPP,0,0,0,0);
 		SDL_SetColorKey(gInit->l.ll->data.pl->imgF, SDL_SRCCOLORKEY|SDL_RLEACCEL, 0);
 		//SDL_SetColorKey(gInit->l.ll->data.pl->imgF, SDL_SRCCOLORKEY|SDL_RLEACCEL, gInit->mapI.map.cmap.bgColor);
@@ -1856,7 +1856,7 @@ int stateLemming(struct gameInit *gInit){
 			gInit->l.ll->data.pl->cptBrick=0;
 			gInit->l.ll->data.pl->oldX=k->x; 
 			gInit->l.ll->data.pl->oldY=k->y;
-			gInit->l.ll->data.pl->imgF=SDL_CreateRGBSurface(SDL_SWSURFACE, 32, 20,
+			gInit->l.ll->data.pl->imgF=SDL_CreateRGBSurface(SDL_HWSURFACE|SDL_HWACCEL|SDL_ASYNCBLIT|SDL_RLEACCEL, 32, 20,
 			SCREEN_BPP,0,0,0,0);
 			SDL_SetColorKey(gInit->l.ll->data.pl->imgF, SDL_SRCCOLORKEY|SDL_RLEACCEL, 0);
 			//SDL_SetColorKey(gInit->l.ll->data.pl->imgF, SDL_SRCCOLORKEY|SDL_RLEACCEL, gInit->mapI.map.cmap.bgColor);
@@ -2049,7 +2049,7 @@ int stateLemming(struct gameInit *gInit){
 
 		//int cpt=0;
 
-		gInit->mapI.miniMapLem=SDL_CreateRGBSurface(SDL_SWSURFACE, 
+		gInit->mapI.miniMapLem=SDL_CreateRGBSurface(SDL_HWSURFACE|SDL_HWACCEL|SDL_ASYNCBLIT|SDL_RLEACCEL, 
 				MINIMAPLEM_MX, MINIMAPLEM_MY,
 				SCREEN_BPP,0,0,0,0);
 
@@ -3509,7 +3509,7 @@ int lancement (){
 	
 	SDL_WM_SetCaption( gInit.mapI.name , NULL );
 	
-	gInit.mapI.cross.imgC=SDL_CreateRGBSurface(SDL_SWSURFACE, gInit.mapI.map.tabGif[3]->w , gInit.mapI.map.tabGif[3]->h/8,
+	gInit.mapI.cross.imgC=SDL_CreateRGBSurface(SDL_HWSURFACE|SDL_HWACCEL|SDL_ASYNCBLIT|SDL_RLEACCEL, gInit.mapI.map.tabGif[3]->w , gInit.mapI.map.tabGif[3]->h/8,
 			SCREEN_BPP,0,0,0,0);
 	SDL_SetColorKey(pTerrain, SDL_SRCCOLORKEY|SDL_RLEACCEL, gInit.mapI.map.cmap.bgColor);
 	SDL_SetColorKey(pTerrain, SDL_SRCCOLORKEY|SDL_RLEACCEL, ccc_bgStencil);