aboutsummaryrefslogtreecommitdiff
path: root/sword2/controls.cpp
diff options
context:
space:
mode:
authorTorbjörn Andersson2003-10-12 14:40:04 +0000
committerTorbjörn Andersson2003-10-12 14:40:04 +0000
commit1b52e11d559aa7c8df48bb114d4dd4dfb02a0770 (patch)
tree0ba7823c0b821fa787c2c35a88e53a35163d394c /sword2/controls.cpp
parentc38ca923d8c8646fda3df4da2b5934feffe5395b (diff)
downloadscummvm-rg350-1b52e11d559aa7c8df48bb114d4dd4dfb02a0770.tar.gz
scummvm-rg350-1b52e11d559aa7c8df48bb114d4dd4dfb02a0770.tar.bz2
scummvm-rg350-1b52e11d559aa7c8df48bb114d4dd4dfb02a0770.zip
Moved the "router" code into a new Router class. I'm hoping this is
analogous to the SkyAutoRoute class. svn-id: r10754
Diffstat (limited to 'sword2/controls.cpp')
-rw-r--r--sword2/controls.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/sword2/controls.cpp b/sword2/controls.cpp
index 28adfe2246..ced13f899b 100644
--- a/sword2/controls.cpp
+++ b/sword2/controls.cpp
@@ -893,7 +893,7 @@ int32 OptionsDialog::writeOptionSettings(void) {
SaveFile *fp;
SaveFileManager *mgr = g_system->get_savefile_manager();
- sprintf(filename, "%s-settings.dat", g_sword2->_game_name);
+ sprintf(filename, "%s-settings.dat", g_sword2->_gameName);
buff[0] = g_sound->getMusicVolume();
buff[1] = g_sound->getSpeechVolume();
@@ -1435,7 +1435,7 @@ void Gui::restartControl(void) {
DEMO = temp_demo_flag;
// free all the route memory blocks from previous game
- FreeAllRouteMem();
+ router.freeAllRouteMem();
// call the same function that first started us up
g_sword2->Start_game();
@@ -1483,7 +1483,7 @@ int32 Gui::readOptionSettings(void) {
SaveFile *fp;
SaveFileManager *mgr = g_system->get_savefile_manager();
- sprintf(filename, "%s-settings.dat", g_sword2->_game_name);
+ sprintf(filename, "%s-settings.dat", g_sword2->_gameName);
if (!(fp = mgr->open_savefile(filename, g_sword2->getSavePath(), false)))
return 1;