diff options
| author | Eugene Sandulenko | 2016-01-27 11:11:02 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-02-14 17:12:53 +0100 |
| commit | 34f9a1375dec7bf6b42104fd5ffed0c36c112130 (patch) | |
| tree | 83162408ca872f30236fe4e515a55062e29fe8da /engines/wage/wage.cpp | |
| parent | 45afdbbd5c9e5ddb8ac470b0b05dcb65f1f75d39 (diff) | |
| download | scummvm-rg350-34f9a1375dec7bf6b42104fd5ffed0c36c112130.tar.gz scummvm-rg350-34f9a1375dec7bf6b42104fd5ffed0c36c112130.tar.bz2 scummvm-rg350-34f9a1375dec7bf6b42104fd5ffed0c36c112130.zip | |
WAGE: Get rid of Common::String import
Diffstat (limited to 'engines/wage/wage.cpp')
| -rw-r--r-- | engines/wage/wage.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/wage/wage.cpp b/engines/wage/wage.cpp index 6f3f4b28c9..de5f9e1526 100644 --- a/engines/wage/wage.cpp +++ b/engines/wage/wage.cpp @@ -196,11 +196,11 @@ void WageEngine::processEvents() { } } -void WageEngine::playSound(String soundName) { +void WageEngine::playSound(Common::String soundName) { warning("STUB: WageEngine::playSound(%s)", soundName.c_str()); } -void WageEngine::setMenu(String soundName) { +void WageEngine::setMenu(Common::String soundName) { warning("STUB: WageEngine::setMenu"); } @@ -268,7 +268,7 @@ void WageEngine::performInitialSetup() { for (uint i = 0; i < _world->_orderedObjs.size(); i++) { Obj *obj = _world->_orderedObjs[i]; if (!obj->_sceneOrOwner.equalsIgnoreCase(STORAGESCENE)) { - String location = obj->_sceneOrOwner; + Common::String location = obj->_sceneOrOwner; location.toLowercase(); if (_world->_scenes.contains(location)) { _world->move(obj, _world->_scenes[location]); @@ -288,7 +288,7 @@ void WageEngine::performInitialSetup() { for (uint i = 0; i < _world->_orderedChrs.size(); i++) { Chr *chr = _world->_orderedChrs[i]; if (!chr->_initialScene.equalsIgnoreCase(STORAGESCENE)) { - String key = chr->_initialScene; + Common::String key = chr->_initialScene; key.toLowercase(); if (_world->_scenes.contains(key)) { _world->move(chr, _world->_scenes[key]); @@ -313,7 +313,7 @@ void WageEngine::doClose() { warning("STUB: doClose()"); } -Scene *WageEngine::getSceneByName(String &location) { +Scene *WageEngine::getSceneByName(Common::String &location) { Scene *scene; if (location.equals("random@")) { scene = _world->getRandomScene(); @@ -354,7 +354,7 @@ void WageEngine::onMove(Designed *what, Designed *from, Designed *to) { if (to == _world->_storageScene) { int returnTo = chr->_returnTo; if (returnTo != Chr::RETURN_TO_STORAGE) { - String returnToSceneName; + Common::String returnToSceneName; if (returnTo == Chr::RETURN_TO_INITIAL_SCENE) { returnToSceneName = chr->_initialScene; returnToSceneName.toLowercase(); |