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/world.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/world.cpp')
| -rw-r--r-- | engines/wage/world.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/wage/world.cpp b/engines/wage/world.cpp index cead6ae49d..fbb72457a1 100644 --- a/engines/wage/world.cpp +++ b/engines/wage/world.cpp @@ -180,7 +180,7 @@ bool World::loadWorld(Common::MacResManager *resMan) { scene->_fontType = res->readUint16BE(); scene->_fontSize = res->readUint16BE(); - String text; + Common::String text; while (res->pos() < res->size()) { char c = res->readByte(); if (c == 0x0d) @@ -299,8 +299,8 @@ bool World::loadWorld(Common::MacResManager *resMan) { Common::StringArray *World::readMenu(Common::SeekableReadStream *res) { res->skip(10); int enableFlags = res->readUint32BE(); - String menuName = readPascalString(res); - String menuItem = readPascalString(res); + Common::String menuName = readPascalString(res); + Common::String menuItem = readPascalString(res); int menuItemNumber = 1; Common::String menu; byte itemData[4]; @@ -339,7 +339,7 @@ Common::StringArray *World::readMenu(Common::SeekableReadStream *res) { return result; } -void World::loadExternalSounds(String fname) { +void World::loadExternalSounds(Common::String fname) { Common::File in; in.open(fname); |