diff --git a/game.h b/game.h index 28b83eb..e0313c3 100755 --- a/game.h +++ b/game.h @@ -581,8 +581,6 @@ void SFG_gameLoad() if (result == 0) SFG_game.saved = SFG_CANT_SAVE; - - SFG_game.settings = SFG_game.save[1]; } /** diff --git a/main_pokitto.cpp b/main_pokitto.cpp index 3511595..a2a5fa5 100644 --- a/main_pokitto.cpp +++ b/main_pokitto.cpp @@ -82,22 +82,6 @@ void SFG_getMouseOffset(int16_t *x, int16_t *y) { } -void SFG_save(uint8_t data[SFG_SAVE_SIZE]) -{ - for (uint8_t i = 0; i < SFG_SAVE_SIZE; ++i) - save.data[i] = data[i]; - - save.saveCookie(); -} - -uint8_t SFG_load(uint8_t data[SFG_SAVE_SIZE]) -{ - for (uint8_t i = 0; i < SFG_SAVE_SIZE; ++i) - data[i] = save.data[i]; - - return 1; -} - uint8_t audioBuff[SFG_SFX_SAMPLE_COUNT]; uint16_t audioPos = 0; @@ -148,6 +132,27 @@ void timerInit(uint32_t samplingRate) #undef weirdNumber } +void SFG_save(uint8_t data[SFG_SAVE_SIZE]) +{ + for (uint8_t i = 0; i < SFG_SAVE_SIZE; ++i) + save.data[i] = data[i]; + + save.saveCookie(); + + /* ^ This causes sound to stop as it writes something to timer32, we need to + reinit the audio: */ + + timerInit(8000); +} + +uint8_t SFG_load(uint8_t data[SFG_SAVE_SIZE]) +{ + for (uint8_t i = 0; i < SFG_SAVE_SIZE; ++i) + data[i] = save.data[i]; + + return 1; +} + void SFG_playSound(uint8_t soundIndex, uint8_t volume) { uint8_t volumeShift = 7 - volume / 32;