[Scummvm-cvs-logs] scummvm master -> 74537d9eee171a1b7b02922320eae0252e6ed514
bluegr
md5 at scummvm.org
Tue Dec 27 01:09:42 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:
74537d9eee DREAMWEB: The monsource global is no longer used. Also, added a missing comment in dirFile()
Commit: 74537d9eee171a1b7b02922320eae0252e6ed514
https://github.com/scummvm/scummvm/commit/74537d9eee171a1b7b02922320eae0252e6ed514
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-26T16:08:15-08:00
Commit Message:
DREAMWEB: The monsource global is no longer used. Also, added a missing comment in dirFile()
Changed paths:
devtools/tasmrecover/tasm-recover
engines/dreamweb/dreamgen.cpp
engines/dreamweb/dreamgen.h
engines/dreamweb/monitor.cpp
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 822896a..ac818c4 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -221,6 +221,7 @@ p = parser(skip_binary_data = [
'symbol2',
'symbol3',
'symbolnum',
+ 'monsource',
# vgagrafx.asm
'cityname',
'extragraphics1',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 13cb425..1f8d25f 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -67,29 +67,29 @@ void DreamGenContext::__start() {
//0x0110: .... .... .... ....
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
//0x0120: .... .... .... ....
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
//0x0130: .... .... .... ....
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
//0x0140: .... .... .... ....
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17,
//0x0150: .... .... .... ....
- 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
//0x0160: .... .... .... ....
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x44, 0x52, 0x45,
- //0x0170: .... .... .... .DRE
- 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x56, 0x39, 0x39, 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
- //0x0180: AMWE B.V9 9.
- 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
- //0x0190: . "
- 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x10, 0x12, 0x12, 0x11, 0x10,
- //0x01a0: ... ..$. ....
- 0x10, 0x10, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d,
+ //0x0170: .... .... ...D REAM
+ 0x57, 0x45, 0x42, 0x2e, 0x56, 0x39, 0x39, 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+ //0x0180: WEB. V99.
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+ //0x0190: ."
+ 0x20, 0x20, 0x20, 0x00, 0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10,
+ //0x01a0: . .... $... ....
+ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
//0x01b0: .... .... .... ....
- 0x02, 0x02, 0x02, 0x44, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- //0x01c0: ...D :... .... ....
+ 0x02, 0x44, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ //0x01c0: .D:. .... .... ....
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
//0x01d0: .... .... .... ....
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+ 0x00, 0x00, 0x00, 0x00, };
ds.assign(src, src + sizeof(src));
dreamweb();
}
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index d477869..a5d504b 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -32,7 +32,7 @@
namespace DreamGen {
-static const uint16 offset_operand1 = 0x018a;
+static const uint16 offset_operand1 = 0x0188;
static const uint16 kStartvars = 0;
static const uint16 kProgresspoints = 1;
static const uint16 kWatchon = 2;
@@ -225,95 +225,94 @@ static const uint16 kCurslocy = 241;
static const uint16 kCurpos = 243;
static const uint16 kMonadx = 245;
static const uint16 kMonady = 247;
-static const uint16 kMonsource = 249;
-static const uint16 kNumtodo = 251;
-static const uint16 kTimecount = 253;
-static const uint16 kCounttotimed = 255;
-static const uint16 kTimedseg = 257;
-static const uint16 kTimedoffset = 259;
-static const uint16 kTimedy = 261;
-static const uint16 kTimedx = 262;
-static const uint16 kNeedtodumptimed = 263;
-static const uint16 kLoadingorsave = 264;
-static const uint16 kCurrentslot = 265;
-static const uint16 kCursorpos = 266;
-static const uint16 kColourpos = 267;
-static const uint16 kFadedirection = 268;
-static const uint16 kNumtofade = 269;
-static const uint16 kFadecount = 270;
-static const uint16 kAddtogreen = 271;
-static const uint16 kAddtored = 272;
-static const uint16 kAddtoblue = 273;
-static const uint16 kLastsoundreel = 274;
-static const uint16 kSpeechloaded = 276;
-static const uint16 kVolume = 277;
-static const uint16 kVolumeto = 278;
-static const uint16 kVolumedirection = 279;
-static const uint16 kVolumecount = 280;
-static const uint16 kWongame = 281;
-static const uint16 kLasthardkey = 282;
-static const uint16 kBufferin = 283;
-static const uint16 kBufferout = 285;
-static const uint16 kExtras = 287;
-static const uint16 kWorkspace = 289;
-static const uint16 kMapstore = 291;
-static const uint16 kCharset1 = 293;
-static const uint16 kMainsprites = 295;
-static const uint16 kBackdrop = 297;
-static const uint16 kMapdata = 299;
-static const uint16 kSounddata = 301;
-static const uint16 kSounddata2 = 303;
-static const uint16 kRecordspace = 305;
-static const uint16 kFreedat = 307;
-static const uint16 kSetdat = 309;
-static const uint16 kReel1 = 311;
-static const uint16 kReel2 = 313;
-static const uint16 kReel3 = 315;
-static const uint16 kRoomdesc = 317;
-static const uint16 kFreedesc = 319;
-static const uint16 kSetdesc = 321;
-static const uint16 kBlockdesc = 323;
-static const uint16 kSetframes = 325;
-static const uint16 kFreeframes = 327;
-static const uint16 kPeople = 329;
-static const uint16 kReels = 331;
-static const uint16 kCommandtext = 333;
-static const uint16 kPuzzletext = 335;
-static const uint16 kTraveltext = 337;
-static const uint16 kTempgraphics = 339;
-static const uint16 kTempgraphics2 = 341;
-static const uint16 kTempgraphics3 = 343;
-static const uint16 kTempsprites = 345;
-static const uint16 kTextfile1 = 347;
-static const uint16 kTextfile2 = 349;
-static const uint16 kTextfile3 = 351;
-static const uint16 kBlinkframe = 353;
-static const uint16 kBlinkcount = 354;
-static const uint16 kReasseschanges = 355;
-static const uint16 kPointerspath = 356;
-static const uint16 kManspath = 357;
-static const uint16 kPointerfirstpath = 358;
-static const uint16 kFinaldest = 359;
-static const uint16 kDestination = 360;
-static const uint16 kLinestartx = 361;
-static const uint16 kLinestarty = 363;
-static const uint16 kLineendx = 365;
-static const uint16 kLineendy = 367;
-static const uint16 kLinepointer = 369;
-static const uint16 kLinedirection = 370;
-static const uint16 kLinelength = 371;
-static const uint16 kCh0blockstocopy = 372;
-static const uint16 kCh0playing = 374;
-static const uint16 kCh0repeat = 375;
-static const uint16 kCh1playing = 376;
-static const uint16 kCh1blockstocopy = 377;
-static const uint16 kCurrentsample = 379;
-static const uint16 kRoomssample = 380;
-static const uint16 kBasicsample = 381;
-static const uint16 kCurrentfile = 408;
-static const uint16 kQuitrequested = 483;
-static const uint16 kSubtitles = 484;
-static const uint16 kForeignrelease = 485;
+static const uint16 kNumtodo = 249;
+static const uint16 kTimecount = 251;
+static const uint16 kCounttotimed = 253;
+static const uint16 kTimedseg = 255;
+static const uint16 kTimedoffset = 257;
+static const uint16 kTimedy = 259;
+static const uint16 kTimedx = 260;
+static const uint16 kNeedtodumptimed = 261;
+static const uint16 kLoadingorsave = 262;
+static const uint16 kCurrentslot = 263;
+static const uint16 kCursorpos = 264;
+static const uint16 kColourpos = 265;
+static const uint16 kFadedirection = 266;
+static const uint16 kNumtofade = 267;
+static const uint16 kFadecount = 268;
+static const uint16 kAddtogreen = 269;
+static const uint16 kAddtored = 270;
+static const uint16 kAddtoblue = 271;
+static const uint16 kLastsoundreel = 272;
+static const uint16 kSpeechloaded = 274;
+static const uint16 kVolume = 275;
+static const uint16 kVolumeto = 276;
+static const uint16 kVolumedirection = 277;
+static const uint16 kVolumecount = 278;
+static const uint16 kWongame = 279;
+static const uint16 kLasthardkey = 280;
+static const uint16 kBufferin = 281;
+static const uint16 kBufferout = 283;
+static const uint16 kExtras = 285;
+static const uint16 kWorkspace = 287;
+static const uint16 kMapstore = 289;
+static const uint16 kCharset1 = 291;
+static const uint16 kMainsprites = 293;
+static const uint16 kBackdrop = 295;
+static const uint16 kMapdata = 297;
+static const uint16 kSounddata = 299;
+static const uint16 kSounddata2 = 301;
+static const uint16 kRecordspace = 303;
+static const uint16 kFreedat = 305;
+static const uint16 kSetdat = 307;
+static const uint16 kReel1 = 309;
+static const uint16 kReel2 = 311;
+static const uint16 kReel3 = 313;
+static const uint16 kRoomdesc = 315;
+static const uint16 kFreedesc = 317;
+static const uint16 kSetdesc = 319;
+static const uint16 kBlockdesc = 321;
+static const uint16 kSetframes = 323;
+static const uint16 kFreeframes = 325;
+static const uint16 kPeople = 327;
+static const uint16 kReels = 329;
+static const uint16 kCommandtext = 331;
+static const uint16 kPuzzletext = 333;
+static const uint16 kTraveltext = 335;
+static const uint16 kTempgraphics = 337;
+static const uint16 kTempgraphics2 = 339;
+static const uint16 kTempgraphics3 = 341;
+static const uint16 kTempsprites = 343;
+static const uint16 kTextfile1 = 345;
+static const uint16 kTextfile2 = 347;
+static const uint16 kTextfile3 = 349;
+static const uint16 kBlinkframe = 351;
+static const uint16 kBlinkcount = 352;
+static const uint16 kReasseschanges = 353;
+static const uint16 kPointerspath = 354;
+static const uint16 kManspath = 355;
+static const uint16 kPointerfirstpath = 356;
+static const uint16 kFinaldest = 357;
+static const uint16 kDestination = 358;
+static const uint16 kLinestartx = 359;
+static const uint16 kLinestarty = 361;
+static const uint16 kLineendx = 363;
+static const uint16 kLineendy = 365;
+static const uint16 kLinepointer = 367;
+static const uint16 kLinedirection = 368;
+static const uint16 kLinelength = 369;
+static const uint16 kCh0blockstocopy = 370;
+static const uint16 kCh0playing = 372;
+static const uint16 kCh0repeat = 373;
+static const uint16 kCh1playing = 374;
+static const uint16 kCh1blockstocopy = 375;
+static const uint16 kCurrentsample = 377;
+static const uint16 kRoomssample = 378;
+static const uint16 kBasicsample = 379;
+static const uint16 kCurrentfile = 406;
+static const uint16 kQuitrequested = 481;
+static const uint16 kSubtitles = 482;
+static const uint16 kForeignrelease = 483;
static const uint16 kBlocktextdat = (0);
static const uint16 kPersonframes = (0);
static const uint16 kDebuglevel1 = (0);
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index ddf1277..eca0ff5 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -529,7 +529,7 @@ void DreamGenContext::dirFile() {
monMessage(10);
byte curChar;
- found += 1 + 2 + 1;
+ found += 4; // originally adjusted in getKeyAndLogo()
while (true) {
curChar = found[0];
More information about the Scummvm-git-logs
mailing list