Skip to content
Permalink
Browse files

Support Map::save_count_2k3e

  • Loading branch information...
fmatthew5876 committed Oct 13, 2018
1 parent 7bbbc0d commit efdb8704a54a233fd76508dc2d91c77bd0d583b6
Showing with 7 additions and 2 deletions.
  1. +7 −2 src/game_map.cpp
@@ -258,9 +258,14 @@ void Game_Map::SetupCommon(int _id, bool is_load_savegame) {
pan_wait = false;
pan_speed = 0;

auto map_save_count = map->save_count;
if (Player::IsRPG2k3() && map->save_count_2k3e > 0) {
map_save_count = map->save_count_2k3e;
}

//When loading a save game and versions have changed, we need to reset the running events.
if (is_load_savegame) {
if (location.map_save_count != map->save_count) {
if (location.map_save_count != map_save_count) {
Main_Data::game_data.common_events = {};
Main_Data::game_data.events = {};
Main_Data::game_data.map_info.events = {};
@@ -271,7 +276,7 @@ void Game_Map::SetupCommon(int _id, bool is_load_savegame) {

// Update the save counts so that if the player saves the game
// events will properly resume upon loading.
location.map_save_count = map->save_count;
location.map_save_count = map_save_count;
location.database_save_count = Data::system.save_count;

ResetEncounterSteps();

0 comments on commit efdb870

Please sign in to comment.
You can’t perform that action at this time.