aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/gui
diff options
context:
space:
mode:
authorFilippos Karapetis2009-12-27 12:54:03 +0000
committerFilippos Karapetis2009-12-27 12:54:03 +0000
commitfabe51c129ef9d85e6f3c0f73ad16e66f7b3623b (patch)
treec8bd4b653501f753b920e1f9ff1691546b2b373f /engines/sci/gui
parentf01a6c9adf5e4303b92aba82d15169a6d0c97095 (diff)
downloadscummvm-rg350-fabe51c129ef9d85e6f3c0f73ad16e66f7b3623b.tar.gz
scummvm-rg350-fabe51c129ef9d85e6f3c0f73ad16e66f7b3623b.tar.bz2
scummvm-rg350-fabe51c129ef9d85e6f3c0f73ad16e66f7b3623b.zip
Renamed gameName -> gameId, to keep the same vocabulary everywhere
svn-id: r46635
Diffstat (limited to 'engines/sci/gui')
-rw-r--r--engines/sci/gui/gui.cpp2
-rw-r--r--engines/sci/gui/gui_windowmgr.cpp4
-rw-r--r--engines/sci/gui/gui_windowmgr.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/gui/gui.cpp b/engines/sci/gui/gui.cpp
index a5be962870..33d124cc54 100644
--- a/engines/sci/gui/gui.cpp
+++ b/engines/sci/gui/gui.cpp
@@ -89,7 +89,7 @@ void SciGui::init(bool usesOldGfxFunctions) {
_usesOldGfxFunctions = usesOldGfxFunctions;
_gfx->init(_text);
- _windowMgr->init(_s->_gameName);
+ _windowMgr->init(_s->_gameId);
_menu->init(_s->gfx_state);
initPriorityBands();
}
diff --git a/engines/sci/gui/gui_windowmgr.cpp b/engines/sci/gui/gui_windowmgr.cpp
index b957abde14..d2defb9d35 100644
--- a/engines/sci/gui/gui_windowmgr.cpp
+++ b/engines/sci/gui/gui_windowmgr.cpp
@@ -52,7 +52,7 @@ SciGuiWindowMgr::~SciGuiWindowMgr() {
// TODO: Clear _windowList and delete all stuff in it?
}
-void SciGuiWindowMgr::init(Common::String gameName) {
+void SciGuiWindowMgr::init(Common::String gameId) {
int16 offTop = 10;
_wmgrPort = new GuiPort(0);
@@ -61,7 +61,7 @@ void SciGuiWindowMgr::init(Common::String gameName) {
// Jones sierra sci was called with parameter -Nw 0 0 200 320
// this actually meant not skipping the first 10 pixellines in windowMgrPort
- if (gameName == "jones")
+ if (gameId == "jones")
offTop = 0;
_gfx->OpenPort(_wmgrPort);
diff --git a/engines/sci/gui/gui_windowmgr.h b/engines/sci/gui/gui_windowmgr.h
index 09c8951717..483df9efc5 100644
--- a/engines/sci/gui/gui_windowmgr.h
+++ b/engines/sci/gui/gui_windowmgr.h
@@ -36,7 +36,7 @@ public:
SciGuiWindowMgr(SciGui *gui, SciGuiScreen *screen, SciGuiGfx *gfx, SciGuiText *text);
~SciGuiWindowMgr();
- void init(Common::String gameName);
+ void init(Common::String gameId);
int16 isFrontWindow(GuiWindow *wnd);
void BeginUpdate(GuiWindow *wnd);