[Scummvm-cvs-logs] scummvm master -> 689cd3edef03afa5600f85c994b19665ecbffa38
wjp
wjp at usecode.org
Tue Nov 15 23:24:12 CET 2011
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
03a2352e30 DREAMWEB: setupemm is not a good place for early initialization
01a557702a DREAMWEB: Clean up getFilename
689cd3edef DREAMWEB: Clean up a few loop structures
Commit: 03a2352e307cfdc5bbc07e7e8d82c85dab06ad01
https://github.com/scummvm/scummvm/commit/03a2352e307cfdc5bbc07e7e8d82c85dab06ad01
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-11-15T14:21:50-08:00
Commit Message:
DREAMWEB: setupemm is not a good place for early initialization
Changed paths:
engines/dreamweb/stubs.cpp
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 7987721..011346e 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -28,6 +28,16 @@ namespace DreamGen {
void DreamGenContext::dreamweb() {
STACK_CHECK;
+
+ switch(engine->getLanguage()) {
+ case Common::EN_ANY:
+ case Common::EN_GRB:
+ case Common::EN_USA:
+ return;
+ default:
+ data.byte(kForeignrelease) = 1;
+ }
+
seecommandtail();
checkbasemem();
soundstartup();
@@ -505,15 +515,6 @@ void DreamGenContext::removeemm() {
}
void DreamGenContext::setupemm() {
- //good place for early initialization
- switch(engine->getLanguage()) {
- case Common::EN_ANY:
- case Common::EN_GRB:
- case Common::EN_USA:
- return;
- default:
- data.byte(kForeignrelease) = 1;
- }
}
void DreamGenContext::pitinterupt() {
Commit: 01a557702a0fdfc90cf00736c7c95f8666867997
https://github.com/scummvm/scummvm/commit/01a557702a0fdfc90cf00736c7c95f8666867997
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-11-15T14:21:50-08:00
Commit Message:
DREAMWEB: Clean up getFilename
Changed paths:
engines/dreamweb/stubs.cpp
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 011346e..6ddd01b 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -203,12 +203,8 @@ void DreamGenContext::dreamweb() {
}
static Common::String getFilename(Context &context) {
- uint16 name_ptr = context.dx;
- Common::String name;
- uint8 c;
- while((c = context.cs.byte(name_ptr++)) != 0)
- name += (char)c;
- return name;
+ const char *name = (const char *)context.cs.ptr(context.dx, 0);
+ return Common::String(name);
}
void DreamGenContext::seecommandtail() {
Commit: 689cd3edef03afa5600f85c994b19665ecbffa38
https://github.com/scummvm/scummvm/commit/689cd3edef03afa5600f85c994b19665ecbffa38
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-11-15T14:23:24-08:00
Commit Message:
DREAMWEB: Clean up a few loop structures
Changed paths:
engines/dreamweb/stubs.cpp
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 6ddd01b..9227385 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -669,7 +669,7 @@ void DreamGenContext::eraseoldobs() {
return;
Sprite *sprites = spritetable();
- for (size_t i=0; i < 16; ++i) {
+ for (size_t i = 0; i < 16; ++i) {
Sprite &sprite = sprites[i];
if (sprite.objData() != 0xffff) {
memset(&sprite, 0xff, sizeof(Sprite));
@@ -917,11 +917,7 @@ void DreamGenContext::dealwithspecial(uint8 firstParam, uint8 secondParam) {
void DreamGenContext::plotreel() {
Reel *reel = getreelstart();
- while (true) {
- if (reel->x < 220)
- break;
- if (reel->x == 255)
- break;
+ while (reel->x >= 220 && reel->x != 255) {
dealwithspecial(reel->x, reel->y);
++data.word(kReelpointer);
reel += 8;
@@ -1144,29 +1140,24 @@ void DreamGenContext::findormake() {
void DreamGenContext::findormake(uint8 index, uint8 value, uint8 type) {
Change *change = (Change *)segRef(data.word(kBuffers)).ptr(kListofchanges, sizeof(Change));
- while (true) {
- if (change->index == 0xff) {
- change->index = index;
- change->location = data.byte(kReallocation);
+ for (; change->index != 0xff; ++change) {
+ if (index == change->index && data.byte(kReallocation) == change->location && type == change->type) {
change->value = value;
- change->type = type;
return;
}
- if ((index == change->index) && (data.byte(kReallocation) == change->location) && (type == change->type)) {
- change->value = value;
- return;
- }
- ++change;
}
+
+ change->index = index;
+ change->location = data.byte(kReallocation);
+ change->value = value;
+ change->type = type;
}
void DreamGenContext::setallchanges() {
Change *change = (Change *)segRef(data.word(kBuffers)).ptr(kListofchanges, sizeof(Change));
- while (change->index != 0xff) {
+ for (; change->index != 0xff; ++change)
if (change->location == data.byte(kReallocation))
dochange(change->index, change->value, change->type);
- ++change;
- }
}
DynObject *DreamGenContext::getfreead(uint8 index) {
@@ -1301,7 +1292,7 @@ void DreamGenContext::getflagunderp(uint8 *flag, uint8 *flagEx) {
}
void DreamGenContext::walkandexamine() {
- if (! finishedwalkingCPP())
+ if (!finishedwalkingCPP())
return;
data.byte(kCommandtype) = data.byte(kWalkexamtype);
data.byte(kCommand) = data.byte(kWalkexamnum);
More information about the Scummvm-git-logs
mailing list