[Scummvm-cvs-logs] scummvm master -> 9a7b8340c5c77b04b4eaf934b6c9093cf66c2e43
wjp
wjp at usecode.org
Tue Dec 6 21:52:32 CET 2011
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
adaea53c19 DREAMWEB: Fix warnings
0193ef590d DREAMWEB: Cleanup end of namespace comments
3840e86d0d DREAMWEB: Paranoia range check
7cff0111ca DREAMWEB: Declare namespace *after* all #includes
9a7b8340c5 DREAMWEB: Fix generated namespace comments
Commit: adaea53c19503fb66d3b331cb16fb0d48c72b6eb
https://github.com/scummvm/scummvm/commit/adaea53c19503fb66d3b331cb16fb0d48c72b6eb
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-12-06T12:48:58-08:00
Commit Message:
DREAMWEB: Fix warnings
Changed paths:
engines/dreamweb/sprite.cpp
engines/dreamweb/stubs.cpp
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index 978c05d..c2997cf 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -1157,7 +1157,7 @@ void DreamGenContext::soundOnReels() {
}
if (data.word(kReelpointer) != data.word(kLastsoundreel))
- data.word(kLastsoundreel) = -1;
+ data.word(kLastsoundreel) = (uint16)-1;
}
void DreamGenContext::clearBeforeLoad() {
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index a06e2fc..d6ee89e 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -3322,7 +3322,7 @@ void DreamGenContext::intro() {
clearPalette();
loadIntroRoom();
data.byte(kVolume) = 7;
- data.byte(kVolumedirection) = -1;
+ data.byte(kVolumedirection) = (uint8)-1;
data.byte(kVolumeto) = 4;
playChannel0(12, 255);
fadeScreenUps();
Commit: 0193ef590da121ca4053510d53aad0b3d6b7052a
https://github.com/scummvm/scummvm/commit/0193ef590da121ca4053510d53aad0b3d6b7052a
Author: Max Horn (max at quendi.de)
Date: 2011-12-06T12:49:41-08:00
Commit Message:
DREAMWEB: Cleanup end of namespace comments
Changed paths:
engines/dreamweb/backdrop.cpp
engines/dreamweb/keypad.cpp
engines/dreamweb/monitor.cpp
engines/dreamweb/object.cpp
engines/dreamweb/pathfind.cpp
engines/dreamweb/people.cpp
engines/dreamweb/print.cpp
engines/dreamweb/runtime.h
engines/dreamweb/saveload.cpp
engines/dreamweb/sprite.cpp
engines/dreamweb/structs.h
engines/dreamweb/stubs.cpp
engines/dreamweb/talk.cpp
engines/dreamweb/use.cpp
engines/dreamweb/vgafades.cpp
engines/dreamweb/vgagrafx.cpp
diff --git a/engines/dreamweb/backdrop.cpp b/engines/dreamweb/backdrop.cpp
index 96d36e4..065ce63 100644
--- a/engines/dreamweb/backdrop.cpp
+++ b/engines/dreamweb/backdrop.cpp
@@ -325,5 +325,4 @@ void DreamGenContext::showAllEx() {
}
}
-} /*namespace dreamgen */
-
+} // End of namespace DreamGen
diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp
index 5e1c54b..cfb7973 100644
--- a/engines/dreamweb/keypad.cpp
+++ b/engines/dreamweb/keypad.cpp
@@ -228,5 +228,4 @@ void DreamGenContext::showOuterPad() {
showFrame(tempGraphics(), kKeypadx+74, kKeypady+76, 37, 0);
}
-} /*namespace dreamgen */
-
+} // End of namespace DreamGen
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index be39d6a..c813037 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -312,5 +312,4 @@ void DreamGenContext::loadCart() {
data.word(kTextfile3) = standardLoad("DREAMWEB.T24"); // monitor file 24
}
-} /*namespace dreamgen */
-
+} // End of namespace DreamGen
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 845b5fb..02526b5 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -263,5 +263,4 @@ void DreamGenContext::getBackFromOb() {
blank();
}
-} /*namespace dreamgen */
-
+} // End of namespace DreamGen
diff --git a/engines/dreamweb/pathfind.cpp b/engines/dreamweb/pathfind.cpp
index 1dd616f..986cdbe 100644
--- a/engines/dreamweb/pathfind.cpp
+++ b/engines/dreamweb/pathfind.cpp
@@ -276,5 +276,4 @@ void DreamGenContext::bresenhams() {
}
}
-} /*namespace dreamgen */
-
+} // End of namespace DreamGen
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index 8b83b60..ed04a54 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -464,5 +464,4 @@ void DreamGenContext::foghornSound(ReelRoutine &routine) {
void DreamGenContext::train(ReelRoutine &routine) {
}
-} /*namespace dreamgen */
-
+} // End of namespace DreamGen
diff --git a/engines/dreamweb/print.cpp b/engines/dreamweb/print.cpp
index 3a6b69d..3e6e2df 100644
--- a/engines/dreamweb/print.cpp
+++ b/engines/dreamweb/print.cpp
@@ -277,5 +277,4 @@ const char *DreamGenContext::monPrint(const char *string) {
return iterator;
}
-} /*namespace dreamgen */
-
+} // End of namespace DreamGen
diff --git a/engines/dreamweb/runtime.h b/engines/dreamweb/runtime.h
index 38599d2..2a23c3e 100644
--- a/engines/dreamweb/runtime.h
+++ b/engines/dreamweb/runtime.h
@@ -596,6 +596,6 @@ public:
# define STACK_CHECK do {} while (0)
#endif
-}
+} // End of namespace DreamWeb
#endif
diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index 1a10d5b..9bc24f2 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -436,5 +436,4 @@ void DreamGenContext::loadSaveBox() {
loadIntoTemp("DREAMWEB.G08");
}
-} /*namespace dreamgen */
-
+} // End of namespace DreamGen
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index c2997cf..fd6d2dc 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -1191,5 +1191,4 @@ void DreamGenContext::liftNoise(uint8 index) {
playChannel1(index);
}
-} /*namespace dreamgen */
-
+} // End of namespace DreamGen
diff --git a/engines/dreamweb/structs.h b/engines/dreamweb/structs.h
index b9e3b3e..aeda472 100644
--- a/engines/dreamweb/structs.h
+++ b/engines/dreamweb/structs.h
@@ -290,7 +290,7 @@ struct Atmosphere {
uint8 _repeat;
};
-}
+} // End of namespace DreamWeb
#endif
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index d6ee89e..0598230 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -3769,4 +3769,4 @@ void DreamGenContext::putBackObStuff() {
delPointer();
}
-} /*namespace dreamgen */
+} // End of namespace DreamGen
diff --git a/engines/dreamweb/talk.cpp b/engines/dreamweb/talk.cpp
index 35001a1..42fc352 100644
--- a/engines/dreamweb/talk.cpp
+++ b/engines/dreamweb/talk.cpp
@@ -36,5 +36,4 @@ void DreamGenContext::convIcons() {
showFrame(frame, 234, 2, frameNumber, 0);
}
-} /*namespace dreamgen */
-
+} // End of namespace DreamGen
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index a2b5e7f..96dfc26 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -905,7 +905,6 @@ void DreamGenContext::useObject() {
useRoutine();
}
-
void DreamGenContext::useWinch() {
al = 40;
ah = 1;
@@ -1033,4 +1032,4 @@ void DreamGenContext::hotelControl() {
putBackObStuff();
}
-} /*namespace dreamgen */
+} // End of namespace DreamGen
diff --git a/engines/dreamweb/vgafades.cpp b/engines/dreamweb/vgafades.cpp
index 8e499ba..a0d92c5 100644
--- a/engines/dreamweb/vgafades.cpp
+++ b/engines/dreamweb/vgafades.cpp
@@ -160,5 +160,4 @@ void DreamGenContext::clearPalette() {
dumpCurrent();
}
-} /*namespace dreamgen */
-
+} // End of namespace DreamGen
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index 4848e14..39142db 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -496,5 +496,4 @@ void DreamGenContext::createPanel2() {
showFrame(engine->icons2(), 160, 0, 5, 2);
}
-} /*namespace dreamgen */
-
+} // End of namespace DreamGen
Commit: 3840e86d0d3267a80c96ad52606267c94c46f688
https://github.com/scummvm/scummvm/commit/3840e86d0d3267a80c96ad52606267c94c46f688
Author: Max Horn (max at quendi.de)
Date: 2011-12-06T12:50:37-08:00
Commit Message:
DREAMWEB: Paranoia range check
Changed paths:
engines/dreamweb/vgagrafx.cpp
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index 39142db..3e1d97e 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -182,6 +182,7 @@ void DreamGenContext::doShake() {
0, -2, 3, -2, 0, 2, 4, -1,
1, -3, 3, 0,
};
+ assert(counter < ARRAYSIZE(shakeTable));
int offset = shakeTable[counter];
engine->setShakePos(offset >= 0 ? offset : -offset);
}
Commit: 7cff0111ca2cb631cbb109c62d0cf7ede96e9012
https://github.com/scummvm/scummvm/commit/7cff0111ca2cb631cbb109c62d0cf7ede96e9012
Author: Max Horn (max at quendi.de)
Date: 2011-12-06T12:50:42-08:00
Commit Message:
DREAMWEB: Declare namespace *after* all #includes
Changed paths:
engines/dreamweb/dreamweb.h
diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index 62db94a..b8fb315 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -40,10 +40,10 @@
#include "dreamweb/dreamgen.h"
#include "dreamweb/console.h"
-namespace DreamGen {
-
#include "dreamweb/structs.h"
+namespace DreamGen {
+
// These are for ReelRoutine::reelPointer, which is a callback field.
const uint16 addr_backobject = 0xc170;
const uint16 addr_mainman = 0xc138;
Commit: 9a7b8340c5c77b04b4eaf934b6c9093cf66c2e43
https://github.com/scummvm/scummvm/commit/9a7b8340c5c77b04b4eaf934b6c9093cf66c2e43
Author: Max Horn (max at quendi.de)
Date: 2011-12-06T12:51:16-08:00
Commit Message:
DREAMWEB: Fix generated namespace comments
Changed paths:
devtools/tasmrecover/tasm/cpp.py
engines/dreamweb/dreamgen.cpp
engines/dreamweb/dreamgen.h
diff --git a/devtools/tasmrecover/tasm/cpp.py b/devtools/tasmrecover/tasm/cpp.py
index df5a71d..a302fa1 100644
--- a/devtools/tasmrecover/tasm/cpp.py
+++ b/devtools/tasmrecover/tasm/cpp.py
@@ -563,7 +563,7 @@ namespace %s {
fd.write("void %sContext::%s() {\n\t::error(\"%s\");\n}\n\n" %(self.namespace, self.function_name_remapping[p], self.function_name_remapping[p]))
else:
fd.write("void %sContext::%s() {\n\t::error(\"%s\");\n}\n\n" %(self.namespace, p, p))
- fd.write("} /*namespace %s */\n" %self.namespace)
+ fd.write("} // End of namespace %s\n" %self.namespace)
fd.close()
@@ -659,7 +659,7 @@ public:
else:
self.hd.write("\tvoid %s();\n" %p)
- self.hd.write("};\n}\n\n#endif\n")
+ self.hd.write("};\n\n} // End of namespace DreamGen\n\n#endif\n")
self.hd.close()
self.fd.write("void %sContext::__start() { %s\t%s(); \n}\n" %(self.namespace, data_impl, start))
@@ -672,5 +672,5 @@ public:
self.fd.write("\t\tdefault: ::error(\"invalid call to %04x dispatched\", (uint16)ax);")
self.fd.write("\n\t}\n}")
- self.fd.write("\n} /*namespace*/\n")
+ self.fd.write("\n} // End of namespace DreamGen\n")
self.fd.close()
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 33f1939..1ab7af0 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -8584,4 +8584,4 @@ void DreamGenContext::__start() {
dreamweb();
}
-} /*namespace*/
+} // End of namespace DreamGen
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index a24c631..58c19c5 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -784,6 +784,7 @@ public:
void createFile();
void fadeToWhite();
};
-}
+
+} // End of namespace DreamGen
#endif
More information about the Scummvm-git-logs
mailing list