DREAMWEB: Remove the now unused 'keynum' and 'newlogonum' variables from the data blob

1 files changed, 133 insertions, 135 deletions

diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 47be37a20a..6e06941d18 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -32,9 +32,9 @@
 
 namespace DreamGen {
 
-static const uint16 offset_keys = 0x01c6;
-static const uint16 offset_rootdir = 0x023e;
-static const uint16 offset_operand1 = 0x0230;
+static const uint16 offset_rootdir = 0x023c;
+static const uint16 offset_operand1 = 0x022e;
+static const uint16 offset_keys = 0x01c4;
 static const uint16 kStartvars = 0;
 static const uint16 kProgresspoints = 1;
 static const uint16 kWatchon = 2;
@@ -236,137 +236,135 @@ static const uint16 kTimer3to = 255;
 static const uint16 kWatchdump = 256;
 static const uint16 kLogonum = 257;
 static const uint16 kOldlogonum = 258;
-static const uint16 kNewlogonum = 259;
-static const uint16 kNetseg = 260;
-static const uint16 kNetpoint = 262;
-static const uint16 kKeynum = 264;
-static const uint16 kCursorstate = 265;
-static const uint16 kPressed = 266;
-static const uint16 kPresspointer = 267;
-static const uint16 kGraphicpress = 269;
-static const uint16 kPresscount = 270;
-static const uint16 kLightcount = 271;
-static const uint16 kFolderpage = 272;
-static const uint16 kDiarypage = 273;
-static const uint16 kMenucount = 274;
-static const uint16 kSymboltopx = 275;
-static const uint16 kSymboltopnum = 276;
-static const uint16 kSymboltopdir = 277;
-static const uint16 kSymbolbotx = 278;
-static const uint16 kSymbolbotnum = 279;
-static const uint16 kSymbolbotdir = 280;
-static const uint16 kSymboltolight = 281;
-static const uint16 kSymbol1 = 282;
-static const uint16 kSymbol2 = 283;
-static const uint16 kSymbol3 = 284;
-static const uint16 kSymbolnum = 285;
-static const uint16 kDumpx = 286;
-static const uint16 kDumpy = 288;
-static const uint16 kWalkandexam = 290;
-static const uint16 kWalkexamtype = 291;
-static const uint16 kWalkexamnum = 292;
-static const uint16 kCurslocx = 293;
-static const uint16 kCurslocy = 295;
-static const uint16 kCurpos = 297;
-static const uint16 kMonadx = 299;
-static const uint16 kMonady = 301;
-static const uint16 kMonsource = 303;
-static const uint16 kNumtodo = 305;
-static const uint16 kTimecount = 307;
-static const uint16 kCounttotimed = 309;
-static const uint16 kTimedseg = 311;
-static const uint16 kTimedoffset = 313;
-static const uint16 kTimedy = 315;
-static const uint16 kTimedx = 316;
-static const uint16 kNeedtodumptimed = 317;
-static const uint16 kLoadingorsave = 318;
-static const uint16 kCurrentslot = 319;
-static const uint16 kCursorpos = 320;
-static const uint16 kColourpos = 321;
-static const uint16 kFadedirection = 322;
-static const uint16 kNumtofade = 323;
-static const uint16 kFadecount = 324;
-static const uint16 kAddtogreen = 325;
-static const uint16 kAddtored = 326;
-static const uint16 kAddtoblue = 327;
-static const uint16 kLastsoundreel = 328;
-static const uint16 kSpeechloaded = 330;
-static const uint16 kSpeechlength = 331;
-static const uint16 kVolume = 333;
-static const uint16 kVolumeto = 334;
-static const uint16 kVolumedirection = 335;
-static const uint16 kVolumecount = 336;
-static const uint16 kWongame = 337;
-static const uint16 kLasthardkey = 338;
-static const uint16 kBufferin = 339;
-static const uint16 kBufferout = 341;
-static const uint16 kExtras = 343;
-static const uint16 kWorkspace = 345;
-static const uint16 kMapstore = 347;
-static const uint16 kCharset1 = 349;
-static const uint16 kBuffers = 351;
-static const uint16 kMainsprites = 353;
-static const uint16 kBackdrop = 355;
-static const uint16 kMapdata = 357;
-static const uint16 kSounddata = 359;
-static const uint16 kSounddata2 = 361;
-static const uint16 kRecordspace = 363;
-static const uint16 kFreedat = 365;
-static const uint16 kSetdat = 367;
-static const uint16 kReel1 = 369;
-static const uint16 kReel2 = 371;
-static const uint16 kReel3 = 373;
-static const uint16 kRoomdesc = 375;
-static const uint16 kFreedesc = 377;
-static const uint16 kSetdesc = 379;
-static const uint16 kBlockdesc = 381;
-static const uint16 kSetframes = 383;
-static const uint16 kFreeframes = 385;
-static const uint16 kPeople = 387;
-static const uint16 kReels = 389;
-static const uint16 kCommandtext = 391;
-static const uint16 kPuzzletext = 393;
-static const uint16 kTraveltext = 395;
-static const uint16 kTempgraphics = 397;
-static const uint16 kTempgraphics2 = 399;
-static const uint16 kTempgraphics3 = 401;
-static const uint16 kTempsprites = 403;
-static const uint16 kTextfile1 = 405;
-static const uint16 kTextfile2 = 407;
-static const uint16 kTextfile3 = 409;
-static const uint16 kBlinkframe = 411;
-static const uint16 kBlinkcount = 412;
-static const uint16 kReasseschanges = 413;
-static const uint16 kPointerspath = 414;
-static const uint16 kManspath = 415;
-static const uint16 kPointerfirstpath = 416;
-static const uint16 kFinaldest = 417;
-static const uint16 kDestination = 418;
-static const uint16 kLinestartx = 419;
-static const uint16 kLinestarty = 421;
-static const uint16 kLineendx = 423;
-static const uint16 kLineendy = 425;
-static const uint16 kLinepointer = 427;
-static const uint16 kLinedirection = 428;
-static const uint16 kLinelength = 429;
-static const uint16 kCh0blockstocopy = 430;
-static const uint16 kCh0playing = 432;
-static const uint16 kCh0repeat = 433;
-static const uint16 kCh1playing = 434;
-static const uint16 kCh1blockstocopy = 435;
-static const uint16 kSoundbufferwrite = 437;
-static const uint16 kCurrentsample = 439;
-static const uint16 kRoomssample = 440;
-static const uint16 kBasicsample = 441;
-static const uint16 kCurrentfile = 588;
-static const uint16 kRoomscango = 663;
-static const uint16 kRoompics = 679;
-static const uint16 kOplist = 694;
-static const uint16 kInputline = 697;
-static const uint16 kPresslist = 825;
-static const uint16 kQuitrequested = 831;
-static const uint16 kSubtitles = 832;
-static const uint16 kForeignrelease = 833;
+static const uint16 kNetseg = 259;
+static const uint16 kNetpoint = 261;
+static const uint16 kCursorstate = 263;
+static const uint16 kPressed = 264;
+static const uint16 kPresspointer = 265;
+static const uint16 kGraphicpress = 267;
+static const uint16 kPresscount = 268;
+static const uint16 kLightcount = 269;
+static const uint16 kFolderpage = 270;
+static const uint16 kDiarypage = 271;
+static const uint16 kMenucount = 272;
+static const uint16 kSymboltopx = 273;
+static const uint16 kSymboltopnum = 274;
+static const uint16 kSymboltopdir = 275;
+static const uint16 kSymbolbotx = 276;
+static const uint16 kSymbolbotnum = 277;
+static const uint16 kSymbolbotdir = 278;
+static const uint16 kSymboltolight = 279;
+static const uint16 kSymbol1 = 280;
+static const uint16 kSymbol2 = 281;
+static const uint16 kSymbol3 = 282;
+static const uint16 kSymbolnum = 283;
+static const uint16 kDumpx = 284;
+static const uint16 kDumpy = 286;
+static const uint16 kWalkandexam = 288;
+static const uint16 kWalkexamtype = 289;
+static const uint16 kWalkexamnum = 290;
+static const uint16 kCurslocx = 291;
+static const uint16 kCurslocy = 293;
+static const uint16 kCurpos = 295;
+static const uint16 kMonadx = 297;
+static const uint16 kMonady = 299;
+static const uint16 kMonsource = 301;
+static const uint16 kNumtodo = 303;
+static const uint16 kTimecount = 305;
+static const uint16 kCounttotimed = 307;
+static const uint16 kTimedseg = 309;
+static const uint16 kTimedoffset = 311;
+static const uint16 kTimedy = 313;
+static const uint16 kTimedx = 314;
+static const uint16 kNeedtodumptimed = 315;
+static const uint16 kLoadingorsave = 316;
+static const uint16 kCurrentslot = 317;
+static const uint16 kCursorpos = 318;
+static const uint16 kColourpos = 319;
+static const uint16 kFadedirection = 320;
+static const uint16 kNumtofade = 321;
+static const uint16 kFadecount = 322;
+static const uint16 kAddtogreen = 323;
+static const uint16 kAddtored = 324;
+static const uint16 kAddtoblue = 325;
+static const uint16 kLastsoundreel = 326;
+static const uint16 kSpeechloaded = 328;
+static const uint16 kSpeechlength = 329;
+static const uint16 kVolume = 331;
+static const uint16 kVolumeto = 332;
+static const uint16 kVolumedirection = 333;
+static const uint16 kVolumecount = 334;
+static const uint16 kWongame = 335;
+static const uint16 kLasthardkey = 336;
+static const uint16 kBufferin = 337;
+static const uint16 kBufferout = 339;
+static const uint16 kExtras = 341;
+static const uint16 kWorkspace = 343;
+static const uint16 kMapstore = 345;
+static const uint16 kCharset1 = 347;
+static const uint16 kBuffers = 349;
+static const uint16 kMainsprites = 351;
+static const uint16 kBackdrop = 353;
+static const uint16 kMapdata = 355;
+static const uint16 kSounddata = 357;
+static const uint16 kSounddata2 = 359;
+static const uint16 kRecordspace = 361;
+static const uint16 kFreedat = 363;
+static const uint16 kSetdat = 365;
+static const uint16 kReel1 = 367;
+static const uint16 kReel2 = 369;
+static const uint16 kReel3 = 371;
+static const uint16 kRoomdesc = 373;
+static const uint16 kFreedesc = 375;
+static const uint16 kSetdesc = 377;
+static const uint16 kBlockdesc = 379;
+static const uint16 kSetframes = 381;
+static const uint16 kFreeframes = 383;
+static const uint16 kPeople = 385;
+static const uint16 kReels = 387;
+static const uint16 kCommandtext = 389;
+static const uint16 kPuzzletext = 391;
+static const uint16 kTraveltext = 393;
+static const uint16 kTempgraphics = 395;
+static const uint16 kTempgraphics2 = 397;
+static const uint16 kTempgraphics3 = 399;
+static const uint16 kTempsprites = 401;
+static const uint16 kTextfile1 = 403;
+static const uint16 kTextfile2 = 405;
+static const uint16 kTextfile3 = 407;
+static const uint16 kBlinkframe = 409;
+static const uint16 kBlinkcount = 410;
+static const uint16 kReasseschanges = 411;
+static const uint16 kPointerspath = 412;
+static const uint16 kManspath = 413;
+static const uint16 kPointerfirstpath = 414;
+static const uint16 kFinaldest = 415;
+static const uint16 kDestination = 416;
+static const uint16 kLinestartx = 417;
+static const uint16 kLinestarty = 419;
+static const uint16 kLineendx = 421;
+static const uint16 kLineendy = 423;
+static const uint16 kLinepointer = 425;
+static const uint16 kLinedirection = 426;
+static const uint16 kLinelength = 427;
+static const uint16 kCh0blockstocopy = 428;
+static const uint16 kCh0playing = 430;
+static const uint16 kCh0repeat = 431;
+static const uint16 kCh1playing = 432;
+static const uint16 kCh1blockstocopy = 433;
+static const uint16 kSoundbufferwrite = 435;
+static const uint16 kCurrentsample = 437;
+static const uint16 kRoomssample = 438;
+static const uint16 kBasicsample = 439;
+static const uint16 kCurrentfile = 586;
+static const uint16 kRoomscango = 661;
+static const uint16 kRoompics = 677;
+static const uint16 kOplist = 692;
+static const uint16 kInputline = 695;
+static const uint16 kPresslist = 823;
+static const uint16 kQuitrequested = 829;
+static const uint16 kSubtitles = 830;
+static const uint16 kForeignrelease = 831;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
@@ -375,13 +373,13 @@ static const uint16 kPlayback = (0);
 static const uint16 kMap = (0);
 static const uint16 kSettextdat = (0);
 static const uint16 kSpanish = (0);
-static const uint16 kFramedata = (0);
 static const uint16 kRecording = (0);
 static const uint16 kFlags = (0);
 static const uint16 kGerman = (0);
 static const uint16 kTextunder = (0);
 static const uint16 kPathdata = (0);
 static const uint16 kDemo = (0);
+static const uint16 kFramedata = (0);
 static const uint16 kExframedata = (0);
 static const uint16 kIntextdat = (0);
 static const uint16 kFreetextdat = (0);