DREAMWEB: 'readCityPic' ported to C++

1 files changed, 47 insertions, 48 deletions

diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 204c171ffb..5c11bd9ff5 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -36,23 +36,23 @@ public:
 	void __start();
 #include "stubs.h" // Allow hand-reversed functions to have a signature different than void f()
 
-	static const uint16 offset_keys = 0x05cd;
-	static const uint16 offset_decidelist = 0x06ec;
-	static const uint16 offset_destlist = 0x0553;
-	static const uint16 offset_diarylist = 0x0669;
-	static const uint16 offset_operand1 = 0x0637;
-	static const uint16 offset_rootdir = 0x0645;
-	static const uint16 offset_openchangesize = 0x051b;
-	static const uint16 offset_comlist = 0x0591;
-	static const uint16 offset_speechfile = 0x071c;
-	static const uint16 offset_quitlist = 0x053d;
-	static const uint16 offset_money1poke = 0x0661;
-	static const uint16 offset_speechfilename = 0x0716;
-	static const uint16 offset_money2poke = 0x0666;
-	static const uint16 offset_talklist = 0x051d;
-	static const uint16 offset_discopslist = 0x06bd;
-	static const uint16 offset_opslist = 0x0693;
-	static const uint16 offset_commandline = 0x0729;
+	static const uint16 offset_speechfile = 0x070f;
+	static const uint16 offset_operand1 = 0x062a;
+	static const uint16 offset_keys = 0x05c0;
+	static const uint16 offset_quitlist = 0x0530;
+	static const uint16 offset_speechfilename = 0x0709;
+	static const uint16 offset_discopslist = 0x06b0;
+	static const uint16 offset_talklist = 0x0510;
+	static const uint16 offset_money2poke = 0x0659;
+	static const uint16 offset_diarylist = 0x065c;
+	static const uint16 offset_openchangesize = 0x050e;
+	static const uint16 offset_comlist = 0x0584;
+	static const uint16 offset_rootdir = 0x0638;
+	static const uint16 offset_decidelist = 0x06df;
+	static const uint16 offset_money1poke = 0x0654;
+	static const uint16 offset_destlist = 0x0546;
+	static const uint16 offset_commandline = 0x071c;
+	static const uint16 offset_opslist = 0x0686;
 	static const uint16 kStartvars = 0;
 	static const uint16 kProgresspoints = 1;
 	static const uint16 kWatchon = 2;
@@ -433,36 +433,35 @@ public:
 	static const uint16 kBasicsample = 1021;
 	static const uint16 kExtragraphics1 = 1034;
 	static const uint16 kIcongraphics8 = 1047;
-	static const uint16 kCityname = 1060;
-	static const uint16 kTravelgraphic1 = 1073;
-	static const uint16 kTravelgraphic2 = 1086;
-	static const uint16 kDiarygraphic = 1099;
-	static const uint16 kDiarytext = 1112;
-	static const uint16 kIntrotextname = 1125;
-	static const uint16 kEndtextname = 1138;
-	static const uint16 kVolumetabname = 1151;
-	static const uint16 kGungraphic = 1164;
-	static const uint16 kMonkface = 1177;
-	static const uint16 kTitle0graphics = 1190;
-	static const uint16 kTitle1graphics = 1203;
-	static const uint16 kTitle2graphics = 1216;
-	static const uint16 kTitle3graphics = 1229;
-	static const uint16 kTitle4graphics = 1242;
-	static const uint16 kTitle5graphics = 1255;
-	static const uint16 kTitle6graphics = 1268;
-	static const uint16 kTitle7graphics = 1281;
-	static const uint16 kPalettescreen = 1294;
-	static const uint16 kCurrentfile = 1619;
-	static const uint16 kRoomscango = 1930;
-	static const uint16 kRoompics = 1946;
-	static const uint16 kOplist = 1961;
-	static const uint16 kInputline = 1964;
-	static const uint16 kPresslist = 2092;
-	static const uint16 kSavenames = 2098;
-	static const uint16 kSavefiles = 2217;
-	static const uint16 kQuitrequested = 2308;
-	static const uint16 kSubtitles = 2309;
-	static const uint16 kForeignrelease = 2310;
+	static const uint16 kTravelgraphic1 = 1060;
+	static const uint16 kTravelgraphic2 = 1073;
+	static const uint16 kDiarygraphic = 1086;
+	static const uint16 kDiarytext = 1099;
+	static const uint16 kIntrotextname = 1112;
+	static const uint16 kEndtextname = 1125;
+	static const uint16 kVolumetabname = 1138;
+	static const uint16 kGungraphic = 1151;
+	static const uint16 kMonkface = 1164;
+	static const uint16 kTitle0graphics = 1177;
+	static const uint16 kTitle1graphics = 1190;
+	static const uint16 kTitle2graphics = 1203;
+	static const uint16 kTitle3graphics = 1216;
+	static const uint16 kTitle4graphics = 1229;
+	static const uint16 kTitle5graphics = 1242;
+	static const uint16 kTitle6graphics = 1255;
+	static const uint16 kTitle7graphics = 1268;
+	static const uint16 kPalettescreen = 1281;
+	static const uint16 kCurrentfile = 1606;
+	static const uint16 kRoomscango = 1917;
+	static const uint16 kRoompics = 1933;
+	static const uint16 kOplist = 1948;
+	static const uint16 kInputline = 1951;
+	static const uint16 kPresslist = 2079;
+	static const uint16 kSavenames = 2085;
+	static const uint16 kSavefiles = 2204;
+	static const uint16 kQuitrequested = 2295;
+	static const uint16 kSubtitles = 2296;
+	static const uint16 kForeignrelease = 2297;
 	static const uint16 kBlocktextdat = (0);
 	static const uint16 kPersonframes = (0);
 	static const uint16 kDebuglevel1 = (0);
@@ -777,6 +776,7 @@ public:
 	void handClap();
 	void afterIntroRoom();
 	void findAllOpen();
+	void readFromFile();
 	void initialInv();
 	void quitSymbol();
 	void setTopRight();
@@ -901,7 +901,6 @@ public:
 	void clearReels();
 	void doSaveLoad();
 	void createName();
-	void readCityPic();
 	void hangOne();
 	void inToInv();
 	void parser();