[Scummvm-cvs-logs] scummvm master -> faf710c095861ebf84a7862a86c3c9abb84b131f
tramboi
bertrand_augereau at yahoo.fr
Thu Nov 17 18:35:48 CET 2011
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
faf710c095 DREAMWEB: Use of the terser 'standardload' in 'readsetdata'
Commit: faf710c095861ebf84a7862a86c3c9abb84b131f
https://github.com/scummvm/scummvm/commit/faf710c095861ebf84a7862a86c3c9abb84b131f
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-11-17T09:34:31-08:00
Commit Message:
DREAMWEB: Use of the terser 'standardload' in 'readsetdata'
Changed paths:
engines/dreamweb/stubs.cpp
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index c2dfa66..e824c4b 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)
More information about the Scummvm-git-logs
mailing list