author | ecalot
<ecalot> 2004-08-22 06:37:28 UTC |
committer | ecalot
<ecalot> 2004-08-22 06:37:28 UTC |
parent | 264bebc41be9b2988fd956e66c6ee6fb74740eb8 |
FP/src/include/input.h | +1 | -1 |
FP/src/ker/kernel.c | +9 | -0 |
FP/src/ker/room.c | +7 | -7 |
FP/src/out/input.c | +3 | -0 |
diff --git a/FP/src/include/input.h b/FP/src/include/input.h index a6a3296..b04bce6 100644 --- a/FP/src/include/input.h +++ b/FP/src/include/input.h @@ -33,7 +33,7 @@ input.h: Free Prince : Input devices handling #ifndef _INPUT_H_ #define _INPUT_H_ -typedef enum {none=0,quit,load,reload,passLevel,showUp,showLeft,showRight,showDown,moreTime,lessTime,addLive,addHitPoint,gotoTitles,kill,resurrect,other}tAction; +typedef enum {none=0,quit,load,reload,passLevel,showUp,showLeft,showRight,showDown,showScreens,moreTime,lessTime,addLive,addHitPoint,gotoTitles,kill,resurrect,other}tAction; /*#define inputIgnoreCtrl(a) (a&( ~(1<<1) ))*/ /* TODO: use inputIgnore* for each Set* */ diff --git a/FP/src/ker/kernel.c b/FP/src/ker/kernel.c index 3f01094..9f74096 100644 --- a/FP/src/ker/kernel.c +++ b/FP/src/ker/kernel.c @@ -105,6 +105,15 @@ int playgame(int optionflag,int level) { if ((roomId=room.links[eRight])) room=mapGetRoom(map,roomId); break; + case showScreens: + fprintf(stderr,"S%d L%d R%d A%d B%d\n", + room.id, + room.links[eLeft], + room.links[eRight], + room.links[eUp], + room.links[eDown] + ); + break; default: break; } diff --git a/FP/src/ker/room.c b/FP/src/ker/room.c index a60c8b8..58ba780 100644 --- a/FP/src/ker/room.c +++ b/FP/src/ker/room.c @@ -228,13 +228,13 @@ void drawBackPanel(tRoom* room,int x, int y) { roomGfx.torch->pFrames[ (((tMap*)(room->level))->time+2*x+y)%(roomGfx.torch->frames) ], - x*TILE_W+16, - y*TILE_H-38 + x*TILE_W+11, + y*TILE_H-39 ); outputDrawBitmap( /* base */ roomGfx.environment->pFrames[56], - x*TILE_W+8, - y*TILE_H-23 + x*TILE_W+3, + y*TILE_H-24 ); } /* empty_bricks/this */ @@ -442,13 +442,13 @@ void drawForePanel(tRoom* room,int x, int y) { (x-1)*TILE_W, y*TILE_H-54 ); - /* second row */ + /* Second row */ outputDrawBitmap( roomGfx.environment->pFrames[73+w2_sep(seed)], (x-1)*TILE_W+11+w2_offset(seed), - y*TILE_H-17 + y*TILE_H-18 ); - /* third row */ + /* Third row TODO: send to BottomTile */ outputDrawBitmap( roomGfx.environment->pFrames[73+w3_sep(seed)], (x-1)*TILE_W+3+w3_offset(seed), diff --git a/FP/src/out/input.c b/FP/src/out/input.c index fad74e9..aff8402 100644 --- a/FP/src/out/input.c +++ b/FP/src/out/input.c @@ -84,6 +84,9 @@ int editAction(tKey* key,SDLKey k) { case SDLK_j: key->actionPerformed=showRight; break; + case SDLK_c: + key->actionPerformed=showScreens; + break; default: break; }