[Scummvm-cvs-logs] scummvm master -> 35d88d498cbb4d5e94befc1d976539c1079dd5bf
tramboi
bertrand_augereau at yahoo.fr
Fri Sep 2 17:16:05 CEST 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:
35d88d498c DREAMWEB: Fix : getexpos has a return value AND a side-effect
Commit: 35d88d498cbb4d5e94befc1d976539c1079dd5bf
https://github.com/scummvm/scummvm/commit/35d88d498cbb4d5e94befc1d976539c1079dd5bf
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-09-01T16:05:32-07:00
Commit Message:
DREAMWEB: Fix : getexpos has a return value AND a side-effect
Changed paths:
engines/dreamweb/stubs.cpp
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index bb05a2b..9e98fd0 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1255,10 +1255,12 @@ void DreamGenContext::getexpos() {
const DynObject *objects = (const DynObject *)segRef(data.word(kExtras)).ptr(kExdata, sizeof(DynObject));
for (size_t i = 0; i < kNumexobjects; ++i) {
if (objects[i].mapad[0] == 0xff) {
+ data.byte(kExpos) = i;
di = kExdata + i * sizeof(DynObject);
return;
}
}
+ data.byte(kExpos) = kNumexobjects;
di = kExdata + kNumexobjects * sizeof(DynObject);
}
More information about the Scummvm-git-logs
mailing list