diff options
| author | Paul Gilbert | 2018-02-21 21:19:09 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2018-02-23 15:23:20 -0500 |
| commit | ad7b947da324c7e3219e4fb2e47bce1006327d97 (patch) | |
| tree | fb57804bceb8033a1962042d94884d6b82024ab6 /engines/xeen/resources.cpp | |
| parent | 900ef91aca039dc23e4cf300070f7fa5f6f3a335 (diff) | |
| download | scummvm-rg350-ad7b947da324c7e3219e4fb2e47bce1006327d97.tar.gz scummvm-rg350-ad7b947da324c7e3219e4fb2e47bce1006327d97.tar.bz2 scummvm-rg350-ad7b947da324c7e3219e4fb2e47bce1006327d97.zip | |
XEEN: Change Resource String fields to const char *
All too many of the resource strings are used as parameters in
Common::String::format calls, and it proved too laborious trying
to add .c_str() suffixes everywhere it'd be appropriate. Easier
to simply change all the Reosucre fields back to being const char *
Diffstat (limited to 'engines/xeen/resources.cpp')
| -rw-r--r-- | engines/xeen/resources.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/xeen/resources.cpp b/engines/xeen/resources.cpp index 86dc4413f8..cd794a3603 100644 --- a/engines/xeen/resources.cpp +++ b/engines/xeen/resources.cpp @@ -52,7 +52,7 @@ Resources::Resources() { } void Resources::loadData() { - ResFile file; + ResFile file(_buffer); file.syncString(CREDITS); file.syncString(OPTIONS_TITLE); file.syncString(THE_PARTY_NEEDS_REST); @@ -61,7 +61,7 @@ void Resources::loadData() { file.syncString(WHATS_THE_PASSWORD); file.syncString(IN_NO_CONDITION); file.syncString(NOTHING_HERE); - file.syncStrings(TERRAIN_TYPES, 6); + file.syncStrings(&TERRAIN_TYPES[0], 6); file.syncStrings(OUTDOORS_WALL_TYPES, 16); file.syncStrings(SURFACE_NAMES, 16); file.syncStrings(WHO_ACTIONS, 32); @@ -136,7 +136,7 @@ void Resources::loadData() { file.syncNumbers2D((int *)MAKE_ITEM_ARR5, 8, 2); file.syncNumbers(OUTDOOR_DRAWSTRUCT_INDEXES, 44); file.syncNumbers2D((int *)TOWN_MAXES, 2, 11); - file.syncStrings2D((String *)TOWN_ACTION_MUSIC, 2, 7); + file.syncStrings2D(&TOWN_ACTION_MUSIC[0][0], 2, 7); file.syncStrings(TOWN_ACTION_SHAPES, 7); file.syncNumbers2D((int *)TOWN_ACTION_FILES, 2, 7); file.syncString(BANK_TEXT); @@ -376,7 +376,7 @@ void Resources::loadData() { file.syncString(CLOUDS_CONGRATULATIONS2); file.syncStrings(GOOBER, 3); file.syncStrings(MUSIC_FILES1, 5); - file.syncStrings2D((String *)MUSIC_FILES2, 6, 7); + file.syncStrings2D(&MUSIC_FILES2[0][0], 6, 7); } } // End of namespace Xeen |