aboutsummaryrefslogtreecommitdiff
path: root/engines/lure/game.cpp
diff options
context:
space:
mode:
authorMax Horn2010-01-19 23:48:55 +0000
committerMax Horn2010-01-19 23:48:55 +0000
commitbce959e0465fd6d5f92b05f338ffde24820bb1ed (patch)
treede23504e583c940309dc4f5b1d35638a84f47dbd /engines/lure/game.cpp
parentdc5e08e623453aef8bbd92c484dde26d67d91d1e (diff)
downloadscummvm-rg350-bce959e0465fd6d5f92b05f338ffde24820bb1ed.tar.gz
scummvm-rg350-bce959e0465fd6d5f92b05f338ffde24820bb1ed.tar.bz2
scummvm-rg350-bce959e0465fd6d5f92b05f338ffde24820bb1ed.zip
LURE: Remove evil 'using namespace' from header files
svn-id: r47396
Diffstat (limited to 'engines/lure/game.cpp')
-rw-r--r--engines/lure/game.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/lure/game.cpp b/engines/lure/game.cpp
index 10db7b0613..36d423251b 100644
--- a/engines/lure/game.cpp
+++ b/engines/lure/game.cpp
@@ -349,7 +349,7 @@ void Game::playerChangeRoom() {
uint16 roomNum = fields.playerNewPos().roomNumber;
fields.playerNewPos().roomNumber = 0;
- Point &newPos = fields.playerNewPos().position;
+ Common::Point &newPos = fields.playerNewPos().position;
delayList.clear();
@@ -991,9 +991,9 @@ bool Game::getYN() {
Common::Language l = LureEngine::getReference().getLanguage();
Common::KeyCode y = Common::KEYCODE_y;
- if (l == FR_FRA) y = Common::KEYCODE_o;
- else if ((l == DE_DEU) || (l == NL_NLD)) y = Common::KEYCODE_j;
- else if ((l == ES_ESP) || (l == IT_ITA)) y = Common::KEYCODE_s;
+ if (l == Common::FR_FRA) y = Common::KEYCODE_o;
+ else if ((l == Common::DE_DEU) || (l == Common::NL_NLD)) y = Common::KEYCODE_j;
+ else if ((l == Common::ES_ESP) || (l == Common::IT_ITA)) y = Common::KEYCODE_s;
bool vKbdFlag = g_system->hasFeature(OSystem::kFeatureVirtualKeyboard);
if (!vKbdFlag)
@@ -1055,12 +1055,12 @@ bool Game::isMenuAvailable() {
return true;
}
-void Game::saveToStream(WriteStream *stream) {
+void Game::saveToStream(Common::WriteStream *stream) {
stream->writeByte(_fastTextFlag);
stream->writeByte(_soundFlag);
}
-void Game::loadFromStream(ReadStream *stream) {
+void Game::loadFromStream(Common::ReadStream *stream) {
Menu &menu = Menu::getReference();
StringList &sl = Resources::getReference().stringList();