[Scummvm-cvs-logs] SF.net SVN: scummvm:[33923] scummvm/branches/gsoc2008-rtl/engines/ parallaction
cpage88 at users.sourceforge.net
cpage88 at users.sourceforge.net
Sat Aug 16 06:15:11 CEST 2008
Revision: 33923
http://scummvm.svn.sourceforge.net/scummvm/?rev=33923&view=rev
Author: cpage88
Date: 2008-08-16 04:15:11 +0000 (Sat, 16 Aug 2008)
Log Message:
-----------
Fixes for Parallaction loading from launcher
Modified Paths:
--------------
scummvm/branches/gsoc2008-rtl/engines/parallaction/gui_ns.cpp
scummvm/branches/gsoc2008-rtl/engines/parallaction/parallaction_ns.cpp
Modified: scummvm/branches/gsoc2008-rtl/engines/parallaction/gui_ns.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/parallaction/gui_ns.cpp 2008-08-16 02:57:30 UTC (rev 33922)
+++ scummvm/branches/gsoc2008-rtl/engines/parallaction/gui_ns.cpp 2008-08-16 04:15:11 UTC (rev 33923)
@@ -23,6 +23,7 @@
*
*/
+#include "common/config-manager.h"
#include "common/system.h"
#include "common/hashmap.h"
@@ -116,7 +117,9 @@
public:
ChooseLanguageInputState_NS(Parallaction_ns *vm, MenuInputHelper *helper) : MenuInputState("chooselanguage", helper), _vm(vm) {
_allowChoice = false;
- _nextState = "selectgame";
+
+ if (ConfMan.getInt("save_slot") < 0 || ConfMan.getInt("save_slot") > 99)
+ _nextState = "selectgame";
if (_vm->getPlatform() == Common::kPlatformAmiga) {
if (!(_vm->getFeatures() & GF_LANG_MULT)) {
Modified: scummvm/branches/gsoc2008-rtl/engines/parallaction/parallaction_ns.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/parallaction/parallaction_ns.cpp 2008-08-16 02:57:30 UTC (rev 33922)
+++ scummvm/branches/gsoc2008-rtl/engines/parallaction/parallaction_ns.cpp 2008-08-16 04:15:11 UTC (rev 33923)
@@ -29,6 +29,7 @@
#include "parallaction/parallaction.h"
#include "parallaction/gui.h"
+#include "parallaction/gui_ns.cpp"
#include "parallaction/input.h"
#include "parallaction/sound.h"
@@ -220,7 +221,7 @@
renameOldSavefiles();
_globalTable = _disk->loadTable("global");
-/*
+
// If requested, load a savegame instead of showing the intro
if (ConfMan.hasKey("save_slot")) {
_gameToLoad = ConfMan.getInt("save_slot");
@@ -234,13 +235,13 @@
_menuHelper = new MenuInputHelper;
assert(_menuHelper);
-
new ChooseLanguageInputState_NS(this, _menuHelper);
+ _menuHelper->setState("chooselanguage");
+
+ _input->_inputMode = Input::kInputModeMenu;
doLoadGame(_gameToLoad);
}
-*/
- startGui();
-
+
while (!quit()) {
runGame();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list