diff options
| author | Max Horn | 2009-12-30 23:01:16 +0000 |
|---|---|---|
| committer | Max Horn | 2009-12-30 23:01:16 +0000 |
| commit | a753f606ec105a287b6eda5ffbfa2b4d6342bb84 (patch) | |
| tree | 346cfa23e727fe4e3804d4786aa725359e980114 /engines/mohawk/riven.cpp | |
| parent | d083e02215c9ef2309f436284c750c78005df6c7 (diff) | |
| download | scummvm-rg350-a753f606ec105a287b6eda5ffbfa2b4d6342bb84.tar.gz scummvm-rg350-a753f606ec105a287b6eda5ffbfa2b4d6342bb84.tar.bz2 scummvm-rg350-a753f606ec105a287b6eda5ffbfa2b4d6342bb84.zip | |
MOHAWK: Stop using String::emptyString
svn-id: r46780
Diffstat (limited to 'engines/mohawk/riven.cpp')
| -rw-r--r-- | engines/mohawk/riven.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp index 8653329fc9..bf98c64bdb 100644 --- a/engines/mohawk/riven.cpp +++ b/engines/mohawk/riven.cpp @@ -434,7 +434,7 @@ Common::String MohawkEngine_Riven::getHotspotName(uint16 hotspot) { assert(hotspot < _hotspotCount); if (_hotspots[hotspot].name_resource < 0) - return Common::String::emptyString; + return Common::String(); return getName(HotspotNames, _hotspots[hotspot].name_resource); } @@ -488,7 +488,7 @@ Common::String MohawkEngine_Riven::getName(uint16 nameResource, uint16 nameID) { Common::SeekableReadStream* nameStream = getRawData(ID_NAME, nameResource); uint16 fieldCount = nameStream->readUint16BE(); uint16* stringOffsets = new uint16[fieldCount]; - Common::String name = Common::String::emptyString; + Common::String name; char c; if (nameID < fieldCount) { |