diff options
| author | Bertrand Augereau | 2011-11-17 18:34:31 +0100 |
|---|---|---|
| committer | Bertrand Augereau | 2011-11-17 18:34:31 +0100 |
| commit | faf710c095861ebf84a7862a86c3c9abb84b131f (patch) | |
| tree | 8ae765de1397291ca225a85ee09e12d748f0b32c | |
| parent | 088ec69949b60e6398a447c3b37fbb5064fa8d46 (diff) | |
| download | scummvm-rg350-faf710c095861ebf84a7862a86c3c9abb84b131f.tar.gz scummvm-rg350-faf710c095861ebf84a7862a86c3c9abb84b131f.tar.bz2 scummvm-rg350-faf710c095861ebf84a7862a86c3c9abb84b131f.zip | |
DREAMWEB: Use of the terser 'standardload' in 'readsetdata'
| -rw-r--r-- | engines/dreamweb/stubs.cpp | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp index c2dfa6644f..e824c4b6d6 100644 --- a/engines/dreamweb/stubs.cpp +++ b/engines/dreamweb/stubs.cpp @@ -2067,24 +2067,12 @@ void DreamGenContext::loadroomssample() { } void DreamGenContext::readsetdata() { - dx = kCharacterset1; - standardload(); - data.word(kCharset1) = ax; - dx = kIcongraphics0; - standardload(); - data.word(kIcons1) = ax; - dx = kIcongraphics1; - standardload(); - data.word(kIcons2) = ax; - dx = kSpritename1; - standardload(); - data.word(kMainsprites) = ax; - dx = kPuzzletextname; - standardload(); - data.word(kPuzzletext) = ax; - dx = kCommandtextname; - standardload(); - data.word(kCommandtext) = ax; + data.word(kCharset1) = standardload((const char *)cs.ptr(kCharacterset1, 0)); + data.word(kIcons1) = standardload((const char *)cs.ptr(kIcongraphics0, 0)); + data.word(kIcons2) = standardload((const char *)cs.ptr(kIcongraphics1, 0)); + data.word(kMainsprites) = standardload((const char *)cs.ptr(kSpritename1, 0)); + data.word(kPuzzletext) = standardload((const char *)cs.ptr(kPuzzletextname, 0)); + data.word(kCommandtext) = standardload((const char *)cs.ptr(kCommandtextname, 0)); ax = data.word(kCharset1); data.word(kCurrentset) = ax; if (data.byte(kSoundint) == 0xff) |