summaryrefslogtreecommitdiff
path: root/sdl-test
diff options
context:
space:
mode:
authorDamien Appert <dappert>2010-11-26 17:12:22 +0000
committerDamien Appert <dappert>2010-11-26 17:12:22 +0000
commit3588d30ae18157e2b54f43945ad8909142c72343 (patch)
tree3ed7b432dafcd040d276dab2b170421d8b92397a /sdl-test
parent97a0f629ae5072931f422574320d4d3680c0752e (diff)
download2010-netlemmings-3588d30ae18157e2b54f43945ad8909142c72343.tar.gz
2010-netlemmings-3588d30ae18157e2b54f43945ad8909142c72343.tar.bz2
2010-netlemmings-3588d30ae18157e2b54f43945ad8909142c72343.zip
spec lem
git-svn-id: file:///var/svn/2010-netlemmings/trunk@176 077b3477-7977-48bd-8428-443f22f7bfda
Diffstat (limited to 'sdl-test')
-rw-r--r--sdl-test/SDL_tuto/TestParserLemmingsLVL/SpecLemming.odtbin0 -> 20911 bytes
-rw-r--r--sdl-test/SDL_tuto/TestParserLemmingsLVL/fonctions_non_integrees.c17
2 files changed, 10 insertions, 7 deletions
diff --git a/sdl-test/SDL_tuto/TestParserLemmingsLVL/SpecLemming.odt b/sdl-test/SDL_tuto/TestParserLemmingsLVL/SpecLemming.odt
new file mode 100644
index 0000000..675e2c9
--- /dev/null
+++ b/sdl-test/SDL_tuto/TestParserLemmingsLVL/SpecLemming.odt
Binary files differ
diff --git a/sdl-test/SDL_tuto/TestParserLemmingsLVL/fonctions_non_integrees.c b/sdl-test/SDL_tuto/TestParserLemmingsLVL/fonctions_non_integrees.c
index 6d9386c..4a1f7c1 100644
--- a/sdl-test/SDL_tuto/TestParserLemmingsLVL/fonctions_non_integrees.c
+++ b/sdl-test/SDL_tuto/TestParserLemmingsLVL/fonctions_non_integrees.c
@@ -2065,6 +2065,8 @@ int stateLemming(struct gameInit *gInit){
//test_FillRect( screen, &screen->clip_rect, SDL_MapRGB( screen->format, 0x0, 0x0, 0x0 ) ); test_blit(pTerrain, &camera, screen, NULL); if( SDL_Flip( screen ) == -1 ) { return 1;} //scanf("%d",&pas);
}
// elimination des pixel remove
+
+
for(ty=0;ty<LEVEL_HEIGHT;++ty){
for(tx=0;tx<LEVEL_WIDTH;++tx){
color = get_pixel32(tx,ty,pStencil);
@@ -2079,7 +2081,7 @@ int stateLemming(struct gameInit *gInit){
}
}
}
-
+
// //-DEBUG-printf("LES STEEL : ");
k=gInit->s.ls;
@@ -2319,6 +2321,7 @@ int stateLemming(struct gameInit *gInit){
Uint32 ccc_temp=0x00000000;
Uint32 ccc_temp2=0x00000000;
Uint32 ccc_temp3=0x00000000;
+
//FULL
if(mode==0){
err=test_blit(spr,&from, t,&to,0);
@@ -2329,25 +2332,25 @@ int stateLemming(struct gameInit *gInit){
if(from.y<0 || from.y > spr->h) {
//-DEBUG-
- printf("paint_manip(1), from.x==%4i, FROM.Y==%4i, from.h==%4i, from.w==%4i, from to.x==%4i, to.y==%4i\n", from.x, from.y, from.h, from.w, to.x, to.y);
+ printf("paint_manip(1) rectFrom_Y out, from.x==%4i, FROM.Y==%4i, from.h==%4i, from.w==%4i, from to.x==%4i, to.y==%4i\n", from.x, from.y, from.h, from.w, to.x, to.y);
return 0;
}
if(from.x<0 || from.x > spr->w) {
//-DEBUG-
- printf("paint_manip(2), FROM.X==%4i, from.y==%4i, from.h==%4i, from.w==%4i, from to.x==%4i, to.y==%4i\n", from.x, from.y, from.h, from.w, to.x, to.y);
+ printf("paint_manip(2) rectFrom_X out, FROM.X==%4i, from.y==%4i, from.h==%4i, from.w==%4i, from to.x==%4i, to.y==%4i\n", from.x, from.y, from.h, from.w, to.x, to.y);
return 0;
}
if(to.y<0 || to.y > t->h) {
//-DEBUG-
- printf("paint_manip(3), from.x==%4i, from.y==%4i, from.h==%4i, from.w==%4i, from to.x==%4i, TO.Y==%4i\n", from.x, from.y, from.h, from.w, to.x, to.y);
+ printf("paint_manip(3) rectTO_Y out, from.x==%4i, from.y==%4i, from.h==%4i, from.w==%4i, from to.x==%4i, TO.Y==%4i\n", from.x, from.y, from.h, from.w, to.x, to.y);
return 0;
}
if(to.x<0 || to.x > t->w) {
//-DEBUG-
- printf("paint_manip(4), from.x==%4i, from.y==%4i, from.h==%4i, from.w==%4i, from TO.X==%4i, to.y==%4i\n", from.x, from.y, from.h, from.w, to.x, to.y);
+ printf("paint_manip(4) rectTO_X out, from.x==%4i, from.y==%4i, from.h==%4i, from.w==%4i, from TO.X==%4i, to.y==%4i\n", from.x, from.y, from.h, from.w, to.x, to.y);
return 0;
}
@@ -3754,8 +3757,8 @@ int lancement (){
switch(event.key.keysym.sym){
case SDLK_HOME : gInit.tps.boostFps = 500-FPS; break;
case SDLK_END : gInit.tps.boostFps = -(FPS-11); break;
- case SDLK_PAGEUP : if(gInit.tps.boostFps>0){gInit.tps.boostFps -=1;}break;
- case SDLK_PAGEDOWN : if(gInit.tps.boostFps<(FPS-1)){gInit.tps.boostFps +=1;}break;
+ case SDLK_PAGEUP : if(gInit.tps.boostFps<(500-FPS)){gInit.tps.boostFps +=1;}break;
+ case SDLK_PAGEDOWN : if(gInit.tps.boostFps>(-FPS+1)){gInit.tps.boostFps -=1;}break;
case SDLK_w : paint_stencil= (paint_stencil==0)? 1 : ((paint_stencil==1)? 2 : ((paint_stencil==2)? 3 : 0)) ;permission=0;break;
case SDLK_x : switchMiniMapMode= (switchMiniMapMode==0)? 1 : ((switchMiniMapMode==1)? 2 : ((switchMiniMapMode==2)? 3 : 0)) ;permission=0;break;
case SDLK_p :{