[Scummvm-cvs-logs] scummvm master -> 92e6815ca3a3179c13c803ed88bf0acfc8e13930

digitall digitall at scummvm.org
Fri Dec 2 01:28:23 CET 2011 

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
757c1fe8e2 DEVTOOLS: Add support to tasm-recover to skip output of addr_* header.
92e6815ca3 DREAMWEB: Removed mostly unused addr_* constants in dreamgen.h


Commit: 757c1fe8e23020c2fa98f318d935b7cbed2e252e
    https://github.com/scummvm/scummvm/commit/757c1fe8e23020c2fa98f318d935b7cbed2e252e
Author: D G Turner (digitall at scummvm.org)
Date: 2011-12-01T16:23:19-08:00

Commit Message:
DEVTOOLS: Add support to tasm-recover to skip output of addr_* header.

Changed paths:
    devtools/tasmrecover/tasm-recover
    devtools/tasmrecover/tasm/cpp.py



diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index f0411fa..431c4e7 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -353,7 +353,8 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'inventory',
 	'mainscreen',
 	'doload',
-	], skip_dispatch_call = True, header_omit_blacklisted = True,
+	], skip_dispatch_call = True, skip_addr_constants = False,
+	header_omit_blacklisted = True,
 	function_name_remapping = {
 	# This remaps the function naming at output for readability
 	'bothchannels' : 'bothChannels',
diff --git a/devtools/tasmrecover/tasm/cpp.py b/devtools/tasmrecover/tasm/cpp.py
index 648b434..44df0a3 100644
--- a/devtools/tasmrecover/tasm/cpp.py
+++ b/devtools/tasmrecover/tasm/cpp.py
@@ -33,7 +33,7 @@ def parse_bin(s):
 	return v
 
 class cpp:
-	def __init__(self, context, namespace, skip_first = 0, blacklist = [], skip_output = [], skip_dispatch_call = False, header_omit_blacklisted = False, function_name_remapping = { }):
+	def __init__(self, context, namespace, skip_first = 0, blacklist = [], skip_output = [], skip_dispatch_call = False, skip_addr_constants = False, header_omit_blacklisted = False, function_name_remapping = { }):
 		self.namespace = namespace
 		fname = namespace.lower() + ".cpp"
 		header = namespace.lower() + ".h"
@@ -81,6 +81,7 @@ class cpp:
 		self.failed = list(blacklist)
 		self.skip_output = skip_output
 		self.skip_dispatch_call = skip_dispatch_call
+		self.skip_addr_constants = skip_addr_constants
 		self.header_omit_blacklisted = header_omit_blacklisted
 		self.function_name_remapping = function_name_remapping
 		self.translated = []
@@ -631,8 +632,9 @@ public:
 
 """)
 
-		for name,addr in self.proc_addr:
-			self.hd.write("\tstatic const uint16 addr_%s = 0x%04x;\n" %(name, addr))
+		if self.skip_addr_constants == False:
+			for name,addr in self.proc_addr:
+				self.hd.write("\tstatic const uint16 addr_%s = 0x%04x;\n" %(name, addr))
 
 
 		for name,addr in self.used_data_offsets:


Commit: 92e6815ca3a3179c13c803ed88bf0acfc8e13930
    https://github.com/scummvm/scummvm/commit/92e6815ca3a3179c13c803ed88bf0acfc8e13930
Author: D G Turner (digitall at scummvm.org)
Date: 2011-12-01T16:25:26-08:00

Commit Message:
DREAMWEB: Removed mostly unused addr_* constants in dreamgen.h

The two used constants have been moved to dreamweb.h, though it is
unclear if the values can be replaced by an enum or pointer to function.

Changed paths:
    devtools/tasmrecover/tasm-recover
    engines/dreamweb/dreamgen.h
    engines/dreamweb/dreamweb.h



diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 431c4e7..ebf036f 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -353,7 +353,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'inventory',
 	'mainscreen',
 	'doload',
-	], skip_dispatch_call = True, skip_addr_constants = False,
+	], skip_dispatch_call = True, skip_addr_constants = True,
 	header_omit_blacklisted = True,
 	function_name_remapping = {
 	# This remaps the function naming at output for readability
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 156838b..704dd16 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -37,453 +37,6 @@ public:
 	void __start();
 #include "stubs.h" // Allow hand-reversed functions to have a signature different than void f()
 
-	static const uint16 addr_dreamweb = 0xc948;
-	static const uint16 addr_keyboardread = 0xcbb4;
-	static const uint16 addr_resetkeyboard = 0xcbb0;
-	static const uint16 addr_setkeyboardint = 0xcbac;
-	static const uint16 addr_readfromfile = 0xcba8;
-	static const uint16 addr_closefile = 0xcba4;
-	static const uint16 addr_openfilenocheck = 0xcb9c;
-	static const uint16 addr_openfilefromc = 0xcb94;
-	static const uint16 addr_openfile = 0xcb90;
-	static const uint16 addr_createfile = 0xcb8c;
-	static const uint16 addr_getridoftempsp = 0xcb84;
-	static const uint16 addr_getridoftempcharset = 0xcb80;
-	static const uint16 addr_getridoftemp3 = 0xcb7c;
-	static const uint16 addr_getridoftemp2 = 0xcb78;
-	static const uint16 addr_getridoftemptext = 0xcb74;
-	static const uint16 addr_getridoftemp = 0xcb70;
-	static const uint16 addr_dontloadseg = 0xcb64;
-	static const uint16 addr_getridofall = 0xcb3c;
-	static const uint16 addr_getridofreels = 0xcb38;
-	static const uint16 addr_randomnum2 = 0xcb08;
-	static const uint16 addr_randomnum1 = 0xcb04;
-	static const uint16 addr_readkey = 0xcafc;
-	static const uint16 addr_mousecall = 0xcae8;
-	static const uint16 addr_setmouse = 0xcae0;
-	static const uint16 addr_undertextline = 0xcad0;
-	static const uint16 addr_putunderzoom = 0xcabc;
-	static const uint16 addr_dumpzoom = 0xcab8;
-	static const uint16 addr_getunderzoom = 0xcab4;
-	static const uint16 addr_allpointer = 0xcaa4;
-	static const uint16 addr_blank = 0xcaa0;
-	static const uint16 addr_gettime = 0xca8c;
-	static const uint16 addr_panelicons1 = 0xca84;
-	static const uint16 addr_showexit = 0xca80;
-	static const uint16 addr_showman = 0xca6c;
-	static const uint16 addr_middlepanel = 0xca68;
-	static const uint16 addr_workoutframes = 0xca54;
-	static const uint16 addr_setwalk = 0xca44;
-	static const uint16 addr_printmessage2 = 0xca30;
-	static const uint16 addr_afterintroroom = 0xca14;
-	static const uint16 addr_walkintoroom = 0xca10;
-	static const uint16 addr_atmospheres = 0xca0c;
-	static const uint16 addr_afternewroom = 0xca08;
-	static const uint16 addr_findfirstpath = 0xc9f0;
-	static const uint16 addr_findpathofpoint = 0xc9ec;
-	static const uint16 addr_identifyob = 0xc9d4;
-	static const uint16 addr_madmanrun = 0xc9cc;
-	static const uint16 addr_mainscreen = 0xc9c8;
-	static const uint16 addr_checkforshake = 0xc9a4;
-	static const uint16 addr_watchreel = 0xc9a0;
-	static const uint16 addr_allocatemem = 0xc988;
-	static const uint16 addr_deallocatemem = 0xc984;
-	static const uint16 addr_clearrest = 0xc980;
-	static const uint16 addr_clearreels = 0xc97c;
-	static const uint16 addr_clearbeforeload = 0xc978;
-	static const uint16 addr_clearchanges = 0xc974;
-	static const uint16 addr_clearbuffers = 0xc970;
-	static const uint16 addr_checkforemm = 0xc964;
-	static const uint16 addr_pickupob = 0xc958;
-	static const uint16 addr_initialinv = 0xc954;
-	static const uint16 addr_entryanims = 0xc950;
-	static const uint16 addr_entrytexts = 0xc94c;
-	static const uint16 addr_getridofpit = 0xc940;
-	static const uint16 addr_setuppit = 0xc93c;
-	static const uint16 addr_volumeadjust = 0xc908;
-	static const uint16 addr_soundend = 0xc8f4;
-	static const uint16 addr_interupttest = 0xc8f0;
-	static const uint16 addr_disablesoundint = 0xc8ec;
-	static const uint16 addr_enablesoundint = 0xc8e8;
-	static const uint16 addr_checksoundint = 0xc8e4;
-	static const uint16 addr_setsoundoff = 0xc8e0;
-	static const uint16 addr_soundstartup = 0xc8d8;
-	static const uint16 addr_loadsecondsample = 0xc8d4;
-	static const uint16 addr_loadsample = 0xc8d0;
-	static const uint16 addr_createname = 0xc8cc;
-	static const uint16 addr_loadspeech = 0xc8c8;
-	static const uint16 addr_loadold = 0xc8c4;
-	static const uint16 addr_doload = 0xcbb8;
-	static const uint16 addr_newgame = 0xc8c0;
-	static const uint16 addr_showdecisions = 0xc8bc;
-	static const uint16 addr_decide = 0xc8b8;
-	static const uint16 addr_scanfornames = 0xc8b4;
-	static const uint16 addr_loadseg = 0xc8a0;
-	static const uint16 addr_savefileread = 0xc894;
-	static const uint16 addr_error = 0xc884;
-	static const uint16 addr_generalerror = 0xcbbc;
-	static const uint16 addr_dosreturn = 0xc880;
-	static const uint16 addr_shownames = 0xc87c;
-	static const uint16 addr_showslots = 0xc878;
-	static const uint16 addr_selectslot = 0xc874;
-	static const uint16 addr_showsaveops = 0xc870;
-	static const uint16 addr_showloadops = 0xc86c;
-	static const uint16 addr_showopbox = 0xc868;
-	static const uint16 addr_getnamepos = 0xc864;
-	static const uint16 addr_checkinput = 0xc860;
-	static const uint16 addr_selectslot2 = 0xc85c;
-	static const uint16 addr_savegame = 0xc850;
-	static const uint16 addr_discops = 0xc84c;
-	static const uint16 addr_getbacktoops = 0xc848;
-	static const uint16 addr_loadgame = 0xc844;
-	static const uint16 addr_loadsavebox = 0xc840;
-	static const uint16 addr_getbackfromops = 0xc834;
-	static const uint16 addr_dosaveload = 0xc830;
-	static const uint16 addr_zoomonoff = 0xc828;
-	static const uint16 addr_findtext1 = 0xc824;
-	static const uint16 addr_showdiarypage = 0xc820;
-	static const uint16 addr_diarykeyn = 0xc81c;
-	static const uint16 addr_diarykeyp = 0xc818;
-	static const uint16 addr_dumpdiarykeys = 0xc814;
-	static const uint16 addr_showdiarykeys = 0xc810;
-	static const uint16 addr_showdiary = 0xc80c;
-	static const uint16 addr_usediary = 0xc808;
-	static const uint16 addr_dumpsymbox = 0xc804;
-	static const uint16 addr_updatesymbolbot = 0xc800;
-	static const uint16 addr_updatesymboltop = 0xc7fc;
-	static const uint16 addr_nextsymbol = 0xc7f8;
-	static const uint16 addr_showsymbol = 0xc7f4;
-	static const uint16 addr_dumpsymbol = 0xc7f0;
-	static const uint16 addr_setbotright = 0xc7ec;
-	static const uint16 addr_setbotleft = 0xc7e8;
-	static const uint16 addr_settopright = 0xc7e4;
-	static const uint16 addr_settopleft = 0xc7e0;
-	static const uint16 addr_quitsymbol = 0xc7dc;
-	static const uint16 addr_entersymbol = 0xc7d8;
-	static const uint16 addr_loadmenu = 0xc7b0;
-	static const uint16 addr_showmenu = 0xc7ac;
-	static const uint16 addr_dumpmenu = 0xc79c;
-	static const uint16 addr_usemenu = 0xc798;
-	static const uint16 addr_dumpkeypad = 0xc794;
-	static const uint16 addr_singlekey = 0xc790;
-	static const uint16 addr_showkeypad = 0xc78c;
-	static const uint16 addr_showouterpad = 0xc788;
-	static const uint16 addr_buttonpress = 0xc784;
-	static const uint16 addr_buttonenter = 0xc780;
-	static const uint16 addr_buttonnought = 0xc77c;
-	static const uint16 addr_buttonnine = 0xc778;
-	static const uint16 addr_buttoneight = 0xc774;
-	static const uint16 addr_buttonseven = 0xc770;
-	static const uint16 addr_buttonsix = 0xc76c;
-	static const uint16 addr_buttonfive = 0xc768;
-	static const uint16 addr_buttonfour = 0xc764;
-	static const uint16 addr_buttonthree = 0xc760;
-	static const uint16 addr_buttontwo = 0xc75c;
-	static const uint16 addr_buttonone = 0xc758;
-	static const uint16 addr_addtopresslist = 0xc754;
-	static const uint16 addr_quitkey = 0xc750;
-	static const uint16 addr_loadkeypad = 0xc74c;
-	static const uint16 addr_entercode = 0xc748;
-	static const uint16 addr_usewinch = 0xc744;
-	static const uint16 addr_useplate = 0xc740;
-	static const uint16 addr_usebuttona = 0xc73c;
-	static const uint16 addr_useshield = 0xc738;
-	static const uint16 addr_usegun = 0xc734;
-	static const uint16 addr_usechurchgate = 0xc730;
-	static const uint16 addr_usewall = 0xc72c;
-	static const uint16 addr_edenscdplayer = 0xc728;
-	static const uint16 addr_setuptimeduse = 0xc71c;
-	static const uint16 addr_autoappear = 0xc70c;
-	static const uint16 addr_removefreeobject = 0xc6f4;
-	static const uint16 addr_placefreeobject = 0xc6f0;
-	static const uint16 addr_issetobonmap = 0xc6ec;
-	static const uint16 addr_findpuztext = 0xc6e0;
-	static const uint16 addr_showpuztext = 0xc6dc;
-	static const uint16 addr_putbackobstuff = 0xc6d8;
-	static const uint16 addr_checkinside = 0xc6d0;
-	static const uint16 addr_isryanholding = 0xc6cc;
-	static const uint16 addr_findexobject = 0xc6c8;
-	static const uint16 addr_findsetobject = 0xc6c4;
-	static const uint16 addr_selectob = 0xc6bc;
-	static const uint16 addr_withwhat = 0xc6b8;
-	static const uint16 addr_useelvdoor = 0xc6b4;
-	static const uint16 addr_useaxe = 0xc6b0;
-	static const uint16 addr_usecooker = 0xc6ac;
-	static const uint16 addr_usestereo = 0xc6a8;
-	static const uint16 addr_usekey = 0xc6a4;
-	static const uint16 addr_useelevator5 = 0xc6a0;
-	static const uint16 addr_useelevator2 = 0xc69c;
-	static const uint16 addr_useelevator4 = 0xc698;
-	static const uint16 addr_useelevator3 = 0xc694;
-	static const uint16 addr_useelevator1 = 0xc68c;
-	static const uint16 addr_usehandle = 0xc688;
-	static const uint16 addr_usewire = 0xc684;
-	static const uint16 addr_usehatch = 0xc680;
-	static const uint16 addr_usecontrol = 0xc67c;
-	static const uint16 addr_moneypoke = 0xc678;
-	static const uint16 addr_lookatcard = 0xc674;
-	static const uint16 addr_usecashcard = 0xc670;
-	static const uint16 addr_usecardreader3 = 0xc66c;
-	static const uint16 addr_usecardreader2 = 0xc668;
-	static const uint16 addr_usecardreader1 = 0xc664;
-	static const uint16 addr_uselighter = 0xc65c;
-	static const uint16 addr_usepoolreader = 0xc658;
-	static const uint16 addr_calledensdlift = 0xc654;
-	static const uint16 addr_calledenslift = 0xc650;
-	static const uint16 addr_callhotellift = 0xc64c;
-	static const uint16 addr_trapdoor = 0xc648;
-	static const uint16 addr_grafittidoor = 0xc644;
-	static const uint16 addr_openhoteldoor2 = 0xc640;
-	static const uint16 addr_openhoteldoor = 0xc63c;
-	static const uint16 addr_drawitall = 0xc638;
-	static const uint16 addr_isitright = 0xc634;
-	static const uint16 addr_opensarters = 0xc630;
-	static const uint16 addr_openeden = 0xc62c;
-	static const uint16 addr_openpoolboss = 0xc628;
-	static const uint16 addr_openryan = 0xc624;
-	static const uint16 addr_usebalcony = 0xc620;
-	static const uint16 addr_usewindow = 0xc61c;
-	static const uint16 addr_openyourneighbour = 0xc618;
-	static const uint16 addr_nextcolon = 0xc614;
-	static const uint16 addr_openlouis = 0xc610;
-	static const uint16 addr_usedryer = 0xc60c;
-	static const uint16 addr_opentvdoor = 0xc608;
-	static const uint16 addr_usealtar = 0xc604;
-	static const uint16 addr_usehole = 0xc600;
-	static const uint16 addr_usechurchhole = 0xc5fc;
-	static const uint16 addr_sitdowninbar = 0xc5f8;
-	static const uint16 addr_wearshades = 0xc5f4;
-	static const uint16 addr_wearwatch = 0xc5f0;
-	static const uint16 addr_useopenbox = 0xc5ec;
-	static const uint16 addr_userailing = 0xc5e8;
-	static const uint16 addr_usecoveredbox = 0xc5e4;
-	static const uint16 addr_useclearbox = 0xc5e0;
-	static const uint16 addr_usecart = 0xc5dc;
-	static const uint16 addr_useslab = 0xc5d8;
-	static const uint16 addr_slabdoorf = 0xc5d4;
-	static const uint16 addr_slabdoore = 0xc5d0;
-	static const uint16 addr_slabdoorc = 0xc5cc;
-	static const uint16 addr_slabdoord = 0xc5c8;
-	static const uint16 addr_slabdoorb = 0xc5c4;
-	static const uint16 addr_slabdoora = 0xc5c0;
-	static const uint16 addr_useladderb = 0xc5bc;
-	static const uint16 addr_useladder = 0xc5b8;
-	static const uint16 addr_chewy = 0xc5b4;
-	static const uint16 addr_useplinth = 0xc5b0;
-	static const uint16 addr_usefullcart = 0xc5ac;
-	static const uint16 addr_usepipe = 0xc5a8;
-	static const uint16 addr_nothelderror = 0xc5a4;
-	static const uint16 addr_usetrainer = 0xc5a0;
-	static const uint16 addr_opentomb = 0xc59c;
-	static const uint16 addr_hotelbell = 0xc598;
-	static const uint16 addr_hotelcontrol = 0xc594;
-	static const uint16 addr_playguitar = 0xc590;
-	static const uint16 addr_runtap = 0xc58c;
-	static const uint16 addr_wheelsound = 0xc588;
-	static const uint16 addr_useobject = 0xc580;
-	static const uint16 addr_triggermessage = 0xc574;
-	static const uint16 addr_processtrigger = 0xc570;
-	static const uint16 addr_monitorlogo = 0xc560;
-	static const uint16 addr_parser = 0xc554;
-	static const uint16 addr_searchforstring = 0xc550;
-	static const uint16 addr_getkeyandlogo = 0xc54c;
-	static const uint16 addr_dirfile = 0xc548;
-	static const uint16 addr_read = 0xc544;
-	static const uint16 addr_showkeys = 0xc540;
-	static const uint16 addr_signon = 0xc53c;
-	static const uint16 addr_searchforfiles = 0xc538;
-	static const uint16 addr_dircom = 0xc534;
-	static const uint16 addr_execcommand = 0xc52c;
-	static const uint16 addr_delchar = 0xc528;
-	static const uint16 addr_makecaps = 0xc524;
-	static const uint16 addr_locklightoff = 0xc51c;
-	static const uint16 addr_locklighton = 0xc518;
-	static const uint16 addr_lookininterface = 0xc4fc;
-	static const uint16 addr_loadcart = 0xc4f8;
-	static const uint16 addr_loadnews = 0xc4f4;
-	static const uint16 addr_loadpersonal = 0xc4f0;
-	static const uint16 addr_printoutermon = 0xc4ec;
-	static const uint16 addr_readcitypic = 0xc4e4;
-	static const uint16 addr_readdesticon = 0xc4e0;
-	static const uint16 addr_resetlocation = 0xc4dc;
-	static const uint16 addr_destselect = 0xc4d0;
-	static const uint16 addr_lastdest = 0xc4cc;
-	static const uint16 addr_nextdest = 0xc4c8;
-	static const uint16 addr_showarrows = 0xc4c4;
-	static const uint16 addr_getdestinfo = 0xc4c0;
-	static const uint16 addr_locationpic = 0xc4bc;
-	static const uint16 addr_putundercentre = 0xc4b8;
-	static const uint16 addr_getundercentre = 0xc4b4;
-	static const uint16 addr_lookatplace = 0xc4b0;
-	static const uint16 addr_selectlocation = 0xc4a8;
-	static const uint16 addr_newplace = 0xc4a4;
-	static const uint16 addr_redes = 0xc4a0;
-	static const uint16 addr_hangonpq = 0xc49c;
-	static const uint16 addr_dosometalk = 0xc498;
-	static const uint16 addr_moretalk = 0xc494;
-	static const uint16 addr_getpersontext = 0xc490;
-	static const uint16 addr_starttalk = 0xc48c;
-	static const uint16 addr_talk = 0xc480;
-	static const uint16 addr_getback1 = 0xc47c;
-	static const uint16 addr_redrawmainscrn = 0xc478;
-	static const uint16 addr_deleteextext = 0xc420;
-	static const uint16 addr_deleteexframe = 0xc41c;
-	static const uint16 addr_deleteexobject = 0xc418;
-	static const uint16 addr_purgeanitem = 0xc414;
-	static const uint16 addr_emergencypurge = 0xc410;
-	static const uint16 addr_purgealocation = 0xc40c;
-	static const uint16 addr_transfercontoex = 0xc400;
-	static const uint16 addr_pickupconts = 0xc3fc;
-	static const uint16 addr_transfertoex = 0xc3f8;
-	static const uint16 addr_outofopen = 0xc3f4;
-	static const uint16 addr_checkobjectsize = 0xc3f0;
-	static const uint16 addr_errormessage3 = 0xc3ec;
-	static const uint16 addr_errormessage2 = 0xc3e8;
-	static const uint16 addr_errormessage1 = 0xc3e4;
-	static const uint16 addr_useopened = 0xc3e0;
-	static const uint16 addr_selectopenob = 0xc3dc;
-	static const uint16 addr_removeobfrominv = 0xc3d8;
-	static const uint16 addr_cantdrop = 0xc3d0;
-	static const uint16 addr_droperror = 0xc3cc;
-	static const uint16 addr_dropobject = 0xc3c8;
-	static const uint16 addr_findopenpos = 0xc3c4;
-	static const uint16 addr_findinvpos = 0xc3c0;
-	static const uint16 addr_getsetad = 0xc3bc;
-	static const uint16 addr_getopenedsize = 0xc3b8;
-	static const uint16 addr_getanyaddir = 0xc3b4;
-	static const uint16 addr_getanyad = 0xc3b0;
-	static const uint16 addr_geteitherad = 0xc3ac;
-	static const uint16 addr_getexad = 0xc3a8;
-	static const uint16 addr_getfreead = 0xc3a4;
-	static const uint16 addr_outofinv = 0xc3a0;
-	static const uint16 addr_intoinv = 0xc398;
-	static const uint16 addr_swapwithopen = 0xc394;
-	static const uint16 addr_swapwithinv = 0xc390;
-	static const uint16 addr_reexfromopen = 0xc38c;
-	static const uint16 addr_reexfrominv = 0xc388;
-	static const uint16 addr_examinventory = 0xc384;
-	static const uint16 addr_setpickup = 0xc380;
-	static const uint16 addr_inventory = 0xc37c;
-	static const uint16 addr_searchforsame = 0xc374;
-	static const uint16 addr_getobtextstart = 0xc370;
-	static const uint16 addr_obsthatdothings = 0xc36c;
-	static const uint16 addr_additionaltext = 0xc368;
-	static const uint16 addr_describeob = 0xc364;
-	static const uint16 addr_examicon = 0xc35c;
-	static const uint16 addr_openob = 0xc354;
-	static const uint16 addr_openinv = 0xc34c;
-	static const uint16 addr_incryanpage = 0xc348;
-	static const uint16 addr_makemainscreen = 0xc340;
-	static const uint16 addr_findallopen = 0xc32c;
-	static const uint16 addr_fillopen = 0xc324;
-	static const uint16 addr_realcredits = 0xc2f8;
-	static const uint16 addr_set16colpalette = 0xc2f4;
-	static const uint16 addr_mode640x480 = 0xc2f0;
-	static const uint16 addr_loadintroroom = 0xc2ec;
-	static const uint16 addr_runendseq = 0xc2e8;
-	static const uint16 addr_runintroseq = 0xc2e4;
-	static const uint16 addr_intro = 0xc2e0;
-	static const uint16 addr_hangone = 0xc2dc;
-	static const uint16 addr_biblequote = 0xc2d8;
-	static const uint16 addr_credits = 0xc2d4;
-	static const uint16 addr_gettingshot = 0xc2d0;
-	static const uint16 addr_showmonk = 0xc2cc;
-	static const uint16 addr_monkspeaking = 0xc2c8;
-	static const uint16 addr_endgame = 0xc2c4;
-	static const uint16 addr_titles = 0xc2c0;
-	static const uint16 addr_initialmoncols = 0xc2bc;
-	static const uint16 addr_fadeupmon = 0xc2b0;
-	static const uint16 addr_fadedownmon = 0xc2ac;
-	static const uint16 addr_dumpcurrent = 0xc2a8;
-	static const uint16 addr_allpalette = 0xc2a4;
-	static const uint16 addr_showgroup = 0xc290;
-	static const uint16 addr_greyscalesum = 0xc28c;
-	static const uint16 addr_rollem = 0xc284;
-	static const uint16 addr_rollendcredits2 = 0xc280;
-	static const uint16 addr_showgun = 0xc27c;
-	static const uint16 addr_fadescreendowns = 0xc274;
-	static const uint16 addr_fadescreendown = 0xc270;
-	static const uint16 addr_fadescreenuphalf = 0xc26c;
-	static const uint16 addr_fadescreendownhalf = 0xc268;
-	static const uint16 addr_fadescreenups = 0xc264;
-	static const uint16 addr_fadefromwhite = 0xc260;
-	static const uint16 addr_fadetowhite = 0xc25c;
-	static const uint16 addr_fadescreenup = 0xc258;
-	static const uint16 addr_clearpalette = 0xc254;
-	static const uint16 addr_dofade = 0xc24c;
-	static const uint16 addr_fadedos = 0xc248;
-	static const uint16 addr_transfermap = 0xc244;
-	static const uint16 addr_doshake = 0xc20c;
-	static const uint16 addr_vsync = 0xc208;
-	static const uint16 addr_setmode = 0xc1dc;
-	static const uint16 addr_showpcx = 0xc1cc;
-	static const uint16 addr_deleverything = 0xc1c0;
-	static const uint16 addr_soundonreels = 0xc1a8;
-	static const uint16 addr_liftnoise = 0xc178;
-	static const uint16 addr_backobject = 0xc170;
-	static const uint16 addr_reminders = 0xc15c;
-	static const uint16 addr_adjustright = 0xc158;
-	static const uint16 addr_adjustleft = 0xc154;
-	static const uint16 addr_adjustup = 0xc150;
-	static const uint16 addr_adjustdown = 0xc14c;
-	static const uint16 addr_checkforexit = 0xc148;
-	static const uint16 addr_mainman = 0xc138;
-	static const uint16 addr_train = 0xc104;
-	static const uint16 addr_copper = 0xc0fc;
-	static const uint16 addr_advisor = 0xc0f8;
-	static const uint16 addr_drunk = 0xc0f4;
-	static const uint16 addr_priesttext = 0xc0e8;
-	static const uint16 addr_madman = 0xc0dc;
-	static const uint16 addr_madmanstelly = 0xc0d8;
-	static const uint16 addr_priest = 0xc0d4;
-	static const uint16 addr_rollendcredits = 0xc0d0;
-	static const uint16 addr_endgameseq = 0xc0cc;
-	static const uint16 addr_monkandryan = 0xc0c8;
-	static const uint16 addr_intro3text = 0xc0c4;
-	static const uint16 addr_intro2text = 0xc0c0;
-	static const uint16 addr_intro1text = 0xc0bc;
-	static const uint16 addr_monks2text = 0xc0b8;
-	static const uint16 addr_handclap = 0xc0b4;
-	static const uint16 addr_intromonks2 = 0xc0b0;
-	static const uint16 addr_intromonks1 = 0xc0ac;
-	static const uint16 addr_intromagic3 = 0xc0a8;
-	static const uint16 addr_intromagic2 = 0xc0a4;
-	static const uint16 addr_gates = 0xc0a0;
-	static const uint16 addr_candles2 = 0xc09c;
-	static const uint16 addr_candles = 0xc098;
-	static const uint16 addr_intromagic1 = 0xc094;
-	static const uint16 addr_smallcandle = 0xc090;
-	static const uint16 addr_candles1 = 0xc08c;
-	static const uint16 addr_keeper = 0xc088;
-	static const uint16 addr_carparkdrip = 0xc084;
-	static const uint16 addr_bossman = 0xc078;
-	static const uint16 addr_heavy = 0xc074;
-	static const uint16 addr_security = 0xc070;
-	static const uint16 addr_poolguard = 0xc06c;
-	static const uint16 addr_businessman = 0xc068;
-	static const uint16 addr_aide = 0xc064;
-	static const uint16 addr_mugger = 0xc060;
-	static const uint16 addr_helicopter = 0xc05c;
-	static const uint16 addr_rockstar = 0xc058;
-	static const uint16 addr_soldier1 = 0xc054;
-	static const uint16 addr_interviewer = 0xc050;
-	static const uint16 addr_bartender = 0xc044;
-	static const uint16 addr_drinker = 0xc040;
-	static const uint16 addr_tattooman = 0xc03c;
-	static const uint16 addr_mansatstill = 0xc038;
-	static const uint16 addr_manasleep2 = 0xc034;
-	static const uint16 addr_louischair = 0xc030;
-	static const uint16 addr_louis = 0xc02c;
-	static const uint16 addr_femalefan = 0xc028;
-	static const uint16 addr_malefan = 0xc024;
-	static const uint16 addr_edeninbath = 0xc020;
-	static const uint16 addr_manasleep = 0xc018;
-	static const uint16 addr_attendant = 0xc014;
-	static const uint16 addr_smokebloke = 0xc010;
-	static const uint16 addr_receptionist = 0xc00c;
-	static const uint16 addr_foghornsound = 0xc008;
-	static const uint16 addr_intromusic = 0xc004;
-	static const uint16 addr_alleybarksound = 0xc000;
 	static const uint16 offset_quitlist = 0x0a84;
 	static const uint16 offset_savelist = 0x0f44;
 	static const uint16 offset_mainlist = 0x1402;
diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index 97f6007..b20b4c9 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -40,6 +40,16 @@
 #include "dreamweb/dreamgen.h"
 #include "dreamweb/console.h"
 
+namespace DreamGen {
+
+// TODO: Unsure if these values are constant or
+// should be replaced with &backObject() and &mainMan()
+// or some kind of enum...
+const uint16 addr_backobject = 0xc170;
+const uint16 addr_mainman = 0xc138;
+
+}
+
 namespace DreamWeb {
 
 // Engine Debug Flags

More information about the Scummvm-git-logs mailing list