diff --git a/TODO.txt b/TODO.txt index 0cc45c9..634aacb 100644 --- a/TODO.txt +++ b/TODO.txt @@ -131,10 +131,6 @@ level ideas: bugs: -- On desktop, SDL makes a high-pitched noise because of DC offset. Maybe put an - average DC offset for each track into assets so that music player can use this - to normalize the track? - done: - add headbob @@ -195,6 +191,11 @@ done: - Player jumps higher on lower FPS, is able to jump on 4 squares. Also check the distance jump. - disable transparency for walls for performance (setting)? +- On desktop, SDL makes a high-pitched noise because of DC offset. Maybe put an + average DC offset for each track into assets so that music player can use this + to normalize the track? +- Player is sometimes squeezed to death in door (appeared in level 9). + Investigate, fix. scratched: - option for disabling wall transparency, for performance? diff --git a/assets/level2.gif b/assets/level2.gif index 4bce074..4a49d7c 100644 Binary files a/assets/level2.gif and b/assets/level2.gif differ diff --git a/assets/level8.gif b/assets/level8.gif index fd491c4..8cc283c 100644 Binary files a/assets/level8.gif and b/assets/level8.gif differ diff --git a/game.h b/game.h index 6cd36c6..af7b63e 100755 --- a/game.h +++ b/game.h @@ -3623,14 +3623,20 @@ void SFG_gameStepPlaying() SFG_getMapRevealBit( SFG_player.squarePosition[0], SFG_player.squarePosition[1]); + + uint8_t properties; + + SFG_getMapTile(SFG_currentLevel.levelPointer,SFG_player.squarePosition[0], + SFG_player.squarePosition[1],&properties); if ( // squeezer check - (SFG_ceilingHeightAt( + (properties == SFG_TILE_PROPERTY_SQUEEZER) && + ((SFG_ceilingHeightAt( SFG_player.squarePosition[0],SFG_player.squarePosition[1]) - SFG_floorHeightAt( SFG_player.squarePosition[0],SFG_player.squarePosition[1])) < - (RCL_CAMERA_COLL_HEIGHT_ABOVE + RCL_CAMERA_COLL_HEIGHT_BELOW)) + (RCL_CAMERA_COLL_HEIGHT_ABOVE + RCL_CAMERA_COLL_HEIGHT_BELOW))) { SFG_LOG("player is squeezed"); SFG_player.health = 0; diff --git a/main_sdl.c b/main_sdl.c index e56aee6..1f7826a 100644 --- a/main_sdl.c +++ b/main_sdl.c @@ -29,8 +29,8 @@ // #define SFG_START_LEVEL 1 // #define SFG_IMMORTAL 1 - #define SFG_UNLOCK_DOOR 1 - #define SFG_REVEAL_MAP 1 +// #define SFG_UNLOCK_DOOR 1 +// #define SFG_REVEAL_MAP 1 // #define SFG_INFINITE_AMMO 1 #define SFG_SCREEN_RESOLUTION_X 800