diff options
author | Filippos Karapetis | 2011-12-26 21:30:02 +0200 |
---|---|---|
committer | Filippos Karapetis | 2011-12-26 21:30:02 +0200 |
commit | f5da710da4583624d81721f33bf0506edff0417d (patch) | |
tree | e4d71aed17f699da7b05605eaaf8ac4ca27deb41 /engines/dreamweb | |
parent | cb3eee86358e73251081d0d285ac2303db5aa775 (diff) | |
download | scummvm-rg350-f5da710da4583624d81721f33bf0506edff0417d.tar.gz scummvm-rg350-f5da710da4583624d81721f33bf0506edff0417d.tar.bz2 scummvm-rg350-f5da710da4583624d81721f33bf0506edff0417d.zip |
DREAMWEB: Remove more unused global variables
Diffstat (limited to 'engines/dreamweb')
-rw-r--r-- | engines/dreamweb/dreamgen.cpp | 36 | ||||
-rw-r--r-- | engines/dreamweb/dreamgen.h | 209 |
2 files changed, 119 insertions, 126 deletions
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp index a0e255547b..220304c405 100644 --- a/engines/dreamweb/dreamgen.cpp +++ b/engines/dreamweb/dreamgen.cpp @@ -38,7 +38,7 @@ void DreamGenContext::read() { return; okcom: es = cs; - di = 417; + di = 408; ax = data.word(kTextfile1); data.word(kMonsource) = ax; ds = ax; @@ -168,7 +168,7 @@ keyok2: ds = cs; si = offset_operand1+1; es = cs; - di = 417+1; + di = 408+1; cx = 12; _movsb(cx, true); monitorLogo(); @@ -250,7 +250,7 @@ void DreamGenContext::parser() { al = '='; _stosb(); ds = cs; - si = 492; + si = 483; notspace1: _lodsw(); _cmp(al, 32); @@ -318,26 +318,26 @@ 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, //0x0150: .... .... .... .... - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //0x0160: .... .... .... .... - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, - //0x0170: .... .... .... .... - 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x56, - //0x0180: .... ..DR EAMW EB.V - 0x39, 0x39, 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - //0x0190: 99. - 0x00, 0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x0d, - //0x01a0: ." .. - 0x0a, 0x0d, 0x0a, 0x24, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x01, 0x01, 0x01, 0x01, 0x01, - //0x01b0: ...$ .... .... .... - 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x44, 0x3a, 0x00, 0x00, - //0x01c0: .... .... .... D:.. + 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, + //0x01b0: .... .... .... .... + 0x02, 0x02, 0x02, 0x44, 0x3a, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -356,7 +356,7 @@ void DreamGenContext::__start() { //0x0240: .... .... .... .... 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //0x0250: .... .... .... .... - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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 492a8b3d02..6ee65ada68 100644 --- a/engines/dreamweb/dreamgen.h +++ b/engines/dreamweb/dreamgen.h @@ -32,7 +32,7 @@ namespace DreamGen { -static const uint16 offset_operand1 = 0x0193; +static const uint16 offset_operand1 = 0x018a; static const uint16 kStartvars = 0; static const uint16 kProgresspoints = 1; static const uint16 kWatchon = 2; @@ -215,113 +215,106 @@ static const uint16 kSymboltopdir = 228; static const uint16 kSymbolbotx = 229; static const uint16 kSymbolbotnum = 230; static const uint16 kSymbolbotdir = 231; -static const uint16 kSymboltolight = 232; -static const uint16 kSymbol1 = 233; -static const uint16 kSymbol2 = 234; -static const uint16 kSymbol3 = 235; -static const uint16 kSymbolnum = 236; -static const uint16 kDumpx = 237; -static const uint16 kDumpy = 239; -static const uint16 kWalkandexam = 241; -static const uint16 kWalkexamtype = 242; -static const uint16 kWalkexamnum = 243; -static const uint16 kCurslocx = 244; -static const uint16 kCurslocy = 246; -static const uint16 kCurpos = 248; -static const uint16 kMonadx = 250; -static const uint16 kMonady = 252; -static const uint16 kMonsource = 254; -static const uint16 kNumtodo = 256; -static const uint16 kTimecount = 258; -static const uint16 kCounttotimed = 260; -static const uint16 kTimedseg = 262; -static const uint16 kTimedoffset = 264; -static const uint16 kTimedy = 266; -static const uint16 kTimedx = 267; -static const uint16 kNeedtodumptimed = 268; -static const uint16 kLoadingorsave = 269; -static const uint16 kCurrentslot = 270; -static const uint16 kCursorpos = 271; -static const uint16 kColourpos = 272; -static const uint16 kFadedirection = 273; -static const uint16 kNumtofade = 274; -static const uint16 kFadecount = 275; -static const uint16 kAddtogreen = 276; -static const uint16 kAddtored = 277; -static const uint16 kAddtoblue = 278; -static const uint16 kLastsoundreel = 279; -static const uint16 kSpeechloaded = 281; -static const uint16 kSpeechlength = 282; -static const uint16 kVolume = 284; -static const uint16 kVolumeto = 285; -static const uint16 kVolumedirection = 286; -static const uint16 kVolumecount = 287; -static const uint16 kWongame = 288; -static const uint16 kLasthardkey = 289; -static const uint16 kBufferin = 290; -static const uint16 kBufferout = 292; -static const uint16 kExtras = 294; -static const uint16 kWorkspace = 296; -static const uint16 kMapstore = 298; -static const uint16 kCharset1 = 300; -static const uint16 kMainsprites = 302; -static const uint16 kBackdrop = 304; -static const uint16 kMapdata = 306; -static const uint16 kSounddata = 308; -static const uint16 kSounddata2 = 310; -static const uint16 kRecordspace = 312; -static const uint16 kFreedat = 314; -static const uint16 kSetdat = 316; -static const uint16 kReel1 = 318; -static const uint16 kReel2 = 320; -static const uint16 kReel3 = 322; -static const uint16 kRoomdesc = 324; -static const uint16 kFreedesc = 326; -static const uint16 kSetdesc = 328; -static const uint16 kBlockdesc = 330; -static const uint16 kSetframes = 332; -static const uint16 kFreeframes = 334; -static const uint16 kPeople = 336; -static const uint16 kReels = 338; -static const uint16 kCommandtext = 340; -static const uint16 kPuzzletext = 342; -static const uint16 kTraveltext = 344; -static const uint16 kTempgraphics = 346; -static const uint16 kTempgraphics2 = 348; -static const uint16 kTempgraphics3 = 350; -static const uint16 kTempsprites = 352; -static const uint16 kTextfile1 = 354; -static const uint16 kTextfile2 = 356; -static const uint16 kTextfile3 = 358; -static const uint16 kBlinkframe = 360; -static const uint16 kBlinkcount = 361; -static const uint16 kReasseschanges = 362; -static const uint16 kPointerspath = 363; -static const uint16 kManspath = 364; -static const uint16 kPointerfirstpath = 365; -static const uint16 kFinaldest = 366; -static const uint16 kDestination = 367; -static const uint16 kLinestartx = 368; -static const uint16 kLinestarty = 370; -static const uint16 kLineendx = 372; -static const uint16 kLineendy = 374; -static const uint16 kLinepointer = 376; -static const uint16 kLinedirection = 377; -static const uint16 kLinelength = 378; -static const uint16 kCh0blockstocopy = 379; -static const uint16 kCh0playing = 381; -static const uint16 kCh0repeat = 382; -static const uint16 kCh1playing = 383; -static const uint16 kCh1blockstocopy = 384; -static const uint16 kSoundbufferwrite = 386; -static const uint16 kCurrentsample = 388; -static const uint16 kRoomssample = 389; -static const uint16 kBasicsample = 390; -static const uint16 kCurrentfile = 417; -static const uint16 kInputline = 492; -static const uint16 kQuitrequested = 620; -static const uint16 kSubtitles = 621; -static const uint16 kForeignrelease = 622; +static const uint16 kDumpx = 232; +static const uint16 kDumpy = 234; +static const uint16 kWalkandexam = 236; +static const uint16 kWalkexamtype = 237; +static const uint16 kWalkexamnum = 238; +static const uint16 kCurslocx = 239; +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 kInputline = 483; +static const uint16 kQuitrequested = 611; +static const uint16 kSubtitles = 612; +static const uint16 kForeignrelease = 613; static const uint16 kBlocktextdat = (0); static const uint16 kPersonframes = (0); static const uint16 kDebuglevel1 = (0); |