aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBertrand Augereau2011-12-03 18:13:18 +0100
committerBertrand Augereau2011-12-03 18:13:18 +0100
commit43fe892727a5bb0c751de8d4cded68f314a09daa (patch)
tree9209198ca424e55b8e8c1c1002b976dc02502aef
parent4619419402094608a7d56ab454610e4680f29887 (diff)
downloadscummvm-rg350-43fe892727a5bb0c751de8d4cded68f314a09daa.tar.gz
scummvm-rg350-43fe892727a5bb0c751de8d4cded68f314a09daa.tar.bz2
scummvm-rg350-43fe892727a5bb0c751de8d4cded68f314a09daa.zip
DREAMWEB: Sorted the blacklist alphabetically
This will trigger less conflicts on rebases if we keep it this way :)
-rwxr-xr-xdevtools/tasmrecover/tasm-recover611
-rw-r--r--engines/dreamweb/dreamgen.h12
2 files changed, 311 insertions, 312 deletions
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index ebe51d6dfe..2400b5f79b 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -30,346 +30,347 @@ context = p.parse('dreamweb/dreamweb.asm')
p.link()
generator = cpp(context, "DreamGen", blacklist = [
# These functions are not processed
- 'randomnumber',
- 'screenupdate',
- 'startup',
- 'startup1',
- 'saveload',
- 'switchryanon',
- 'switchryanoff',
- 'quickquit',
- 'quickquit2',
- 'seecommandtail',
- 'multiget',
- 'multiput',
- 'multidump',
- 'frameoutnm',
- 'frameoutbh',
- 'frameoutfx',
- 'cls',
- 'clearwork',
- 'printundermon',
- 'kernchars',
- 'getnextword',
- 'getnumber',
- 'dumptextline',
- 'printboth',
- 'printchar',
- 'printdirect',
- 'printslow',
- 'printmessage',
- 'usetimedtext',
- 'dumptimedtext',
- 'setuptimedtemp',
- 'putundertimed',
- 'getundertimed',
- 'worktoscreen',
- 'width160',
- 'convertkey',
- 'readabyte',
- 'readoneblock',
- 'printsprites',
- 'printasprite',
- 'eraseoldobs',
- 'oldtonames',
- 'namestoold',
- 'loadpalfromiff',
- 'clearsprites',
- 'makesprite',
- 'showframe',
- 'initman',
+
'aboutturn',
- 'readheader',
- 'fillspace',
- 'getroomdata',
- 'startloading',
- 'showreelframe',
- 'showgamereel',
- 'getreelframeax',
- 'findsource',
- 'walking',
- 'autosetwalk',
- 'checkdest',
- 'spriteupdate',
- 'dodoor',
- 'lockeddoorway',
- 'liftsprite',
- 'frameoutv',
- 'modifychar',
+ 'accesslightoff',
+ 'accesslighton',
+ 'actualload',
+ 'actualsave',
+ 'addalong',
+ 'addlength',
+ 'addtopeoplelist',
+ 'addtopresslist',
+ 'adjustlen',
+ 'allocatebuffers',
+ 'allocateload',
'allocatework',
- 'lockmon',
+ 'animpointer',
+ 'autolook',
+ 'autosetwalk',
+ 'barwoman',
+ 'blockget',
+ 'blocknametext',
+ 'bothchannels',
+ 'bresenhams',
+ 'buttoneight',
+ 'buttonenter',
+ 'buttonfive',
+ 'buttonfour',
+ 'buttonnine',
+ 'buttonnought',
+ 'buttonone',
+ 'buttonpress',
+ 'buttonseven',
+ 'buttonsix',
+ 'buttonthree',
+ 'buttontwo',
+ 'calcfrframe',
+ 'calcmapad',
'cancelch0',
'cancelch1',
- 'getroomspaths',
- 'makebackob',
- 'dealwithspecial',
- 'plotreel',
- 'facerightway',
- 'zoom',
- 'crosshair',
- 'showrain',
- 'domix',
+ 'channel0only',
'channel0tran',
- 'makenextblock',
- 'loopchannel0',
- 'parseblaster',
- 'deltextline',
- 'doblocks',
- 'checkifperson',
- 'checkiffree',
+ 'channel1only',
+ 'checkbasemem',
+ 'checkcoords',
+ 'checkdest',
+ 'checkforemm',
'checkifex',
- 'getreelstart',
- 'findobname',
- 'copyname',
+ 'checkiffree',
+ 'checkifpathison',
+ 'checkifperson',
+ 'checkifset',
+ 'checkone',
+ 'checkspeed',
+ 'clearendpal',
+ 'clearsprites',
+ 'clearstartpal',
+ 'clearwork',
+ 'cls',
+ 'commandonly',
'commandwithob',
- 'showpanel',
- 'updatepeople',
- 'malefan',
- 'femalefan',
- 'rockstar',
- 'madmantext',
- 'madmode',
- 'movemap',
+ 'compare',
+ 'constant',
+ 'convertkey',
+ 'convicons',
+ 'convnum',
+ 'copyname',
+ 'createpanel',
+ 'createpanel2',
+ 'credits',
+ 'crosshair',
+ 'dealwithspecial',
+ 'delcurs',
+ 'deletetaken',
+ 'delpointer',
+ 'delsprite',
+ 'deltextline',
+ 'delthisone',
+ 'disablepath',
+ 'dmaend',
+ 'doblocks',
+ 'dochange',
+ 'dodoor',
+ 'dolook',
+ 'domix',
'doorway',
- 'widedoor',
- 'showallobs',
- 'addalong',
- 'addlength',
- 'getdimension',
- 'getxad',
- 'getyad',
- 'getmapad',
- 'calcmapad',
- 'calcfrframe',
+ 'drawflags',
+ 'drawfloor',
+ 'dumpblink',
+ 'dumpeverything',
+ 'dumpmap',
+ 'dumpmenu',
+ 'dumppointer',
+ 'dumptextline',
+ 'dumptimedtext',
+ 'dumpwatch',
+ 'eden',
+ 'endpaltostart',
+ 'entercode',
+ 'eraseoldobs',
+ 'examineob',
+ 'examineobtext',
+ 'facerightway',
+ 'fadecalculation',
+ 'fadeupmonfirst',
+ 'fadeupyellows',
+ 'femalefan',
+ 'fillryan',
+ 'fillspace',
'finalframe',
- 'commandonly',
- 'makename',
+ 'findallryan',
'findlen',
- 'blocknametext',
- 'walktotext',
- 'personnametext',
- 'findxyfrompath',
+ 'findnextcolon',
+ 'findobname',
'findormake',
- 'setallchanges',
- 'dochange',
- 'deletetaken',
- 'placesetobject',
- 'removesetobject',
- 'showallfree',
- 'showallex',
- 'adjustlen',
+ 'findroominloc',
+ 'findsource',
+ 'findxyfrompath',
'finishedwalking',
- 'checkone',
+ 'folderexit',
+ 'folderhints',
+ 'frameoutbh',
+ 'frameoutfx',
+ 'frameoutnm',
+ 'frameoutv',
+ 'gamer',
+ 'getbackfromob',
'getblockofpixel',
- 'getflagunderp',
- 'walkandexamine',
- 'obname',
- 'delpointer',
- 'showblink',
- 'dumpblink',
- 'dumppointer',
- 'showpointer',
- 'animpointer',
- 'showicon',
- 'checkcoords',
- 'readmouse',
- 'readmouse1',
- 'readmouse2',
- 'readmouse3',
- 'readmouse4',
- 'waitframes',
- 'drawflags',
- 'blockget',
- 'addtopeoplelist',
+ 'getdimension',
'getexpos',
- 'paneltomap',
- 'maptopanel',
- 'dumpmap',
- 'obpicture',
- 'delthisone',
- 'transferinv',
- 'obicons',
- 'compare',
- 'pixelcheckset',
- 'turnpathon',
- 'turnpathoff',
- 'turnanypathon',
- 'turnanypathoff',
- 'isitdescribed',
- 'checkifset',
- 'checkifpathison',
- 'delsprite',
- 'dumpeverything',
- 'isitworn',
- 'makeworn',
- 'obtoinv',
- 'showryanpage',
- 'findallryan',
- 'fillryan',
- 'useroutine',
+ 'getflagunderp',
+ 'getlocation',
+ 'getmapad',
+ 'getnextword',
+ 'getnumber',
+ 'getpersframe',
+ 'getreelframeax',
+ 'getreelstart',
+ 'getridofpit',
+ 'getroomdata',
+ 'getroomspaths',
+ 'getundermenu',
+ 'getundertimed',
+ 'getxad',
+ 'getyad',
'hangon',
+ 'hangoncurs',
'hangonp',
'hangonw',
- 'findnextcolon',
- 'usetext',
- 'bresenhams',
- 'sortoutmap',
- 'showcity',
- 'examineobtext',
- 'wornerror',
- 'getpersframe',
- 'convicons',
- 'examineob',
- 'showwatch',
- 'dumpwatch',
- 'showtime',
- 'roomname',
- 'transfertext',
- 'splitintolines',
+ 'initman',
'initrain',
- 'checkbasemem',
- 'clearstartpal',
- 'clearendpal',
- 'paltostartpal',
- 'endpaltostart',
- 'startpaltoend',
- 'paltoendpal',
- 'fadecalculation',
- 'watchcount',
- 'zoomicon',
- 'loadroom',
- 'getundermenu',
- 'putundermenu',
- 'showoutermenu',
- 'textforend',
- 'textformonk',
- 'standardload',
- 'twodigitnum',
- 'readsetdata',
+ 'input',
+ 'isitdescribed',
+ 'isitright',
+ 'isitworn',
+ 'kernchars',
+ 'lastfolder',
+ 'liftsprite',
+ 'loadfolder',
'loadintotemp',
'loadintotemp2',
'loadintotemp3',
- 'loadtempcharset',
- 'printcurs',
- 'delcurs',
- 'hangoncurs',
- 'fadeupyellows',
- 'fadeupmonfirst',
- 'loadroomssample',
- 'printlogo',
'loadmenu',
- 'showmenu',
- 'dumpmenu',
- 'usemenu',
- 'usemon',
- 'scrollmonitor',
- 'showcurrentfile',
- 'input',
- 'monprint',
+ 'loadold',
+ 'loadpalfromiff',
+ 'loadposition',
+ 'loadroom',
+ 'loadroomssample',
+ 'loadtempcharset',
+ 'loadtemptext',
+ 'loadtraveltext',
+ 'lockeddoorway',
+ 'lockmon',
+ 'look',
+ 'loopchannel0',
+ 'madmantext',
+ 'madmode',
+ 'makebackob',
+ 'makeheader',
+ 'makename',
+ 'makenextblock',
+ 'makesprite',
+ 'makeworn',
+ 'malefan',
+ 'maptopanel',
+ 'modifychar',
'monmessage',
+ 'monprint',
+ 'movemap',
+ 'multidump',
+ 'multiget',
+ 'multiput',
+ 'namestoold',
'neterror',
- 'randomaccess',
- 'turnonpower',
- 'showmainops',
- 'showdiscops',
- 'powerlighton',
- 'powerlightoff',
- 'accesslighton',
- 'accesslightoff',
+ 'nextfolder',
+ 'obicons',
+ 'obname',
+ 'obpicture',
+ 'obtoinv',
+ 'oldtonames',
+ 'onedigit',
+ 'openforsave',
+ 'othersmoker',
+ 'out22c',
+ 'paltoendpal',
+ 'paltostartpal',
+ 'paneltomap',
+ 'parseblaster',
+ 'personnametext',
+ 'pitinterupt',
+ 'pixelcheckset',
+ 'placesetobject',
'playchannel0',
'playchannel1',
- 'createpanel',
- 'createpanel2',
- 'findroominloc',
- 'look',
- 'autolook',
- 'dolook',
- 'reelsonscreen',
+ 'plotreel',
+ 'powerlightoff',
+ 'powerlighton',
+ 'printasprite',
+ 'printboth',
+ 'printchar',
+ 'printcurs',
+ 'printdirect',
+ 'printlogo',
+ 'printmessage',
+ 'printslow',
+ 'printsprites',
+ 'printundermon',
+ 'putundermenu',
+ 'putundertimed',
+ 'quickquit',
+ 'quickquit2',
+ 'random',
+ 'randomaccess',
+ 'randomnumber',
+ 'readabyte',
+ 'readheader',
+ 'readmouse',
+ 'readmouse1',
+ 'readmouse2',
+ 'readmouse3',
+ 'readmouse4',
+ 'readoneblock',
+ 'readsetdata',
'reconstruct',
- 'showbyte',
- 'onedigit',
- 'showword',
- 'convnum',
- 'usecharset1',
- 'usetempcharset',
- 'disablepath',
- 'getbackfromob',
- 'showfirstuse',
- 'showseconduse',
- 'actualload',
- 'actualsave',
- 'loadposition',
- 'saveposition',
- 'saveseg',
- 'openforsave',
- 'makeheader',
- 'savefilewrite',
- 'storeit',
+ 'reelsonscreen',
+ 'removeemm',
+ 'removesetobject',
'restoreall',
+ 'restoreems',
'restorereels',
- 'allocateload',
- 'viewfolder',
- 'loadfolder',
+ 'rockstar',
+ 'roomname',
+ 'saveems',
+ 'savefilewrite',
+ 'saveload',
+ 'saveposition',
+ 'saveseg',
+ 'scanfornames',
+ 'screenupdate',
+ 'scrollmonitor',
+ 'seecommandtail',
+ 'setallchanges',
+ 'setlocation',
+ 'setupemm',
+ 'setuppit',
+ 'setuptimedtemp',
+ 'showallex',
+ 'showallfree',
+ 'showallobs',
+ 'showblink',
+ 'showbyte',
+ 'showcity',
+ 'showcurrentfile',
+ 'showdiscops',
+ 'showfirstuse',
'showfolder',
+ 'showframe',
+ 'showgamereel',
+ 'showicon',
+ 'showkeypad',
'showleftpage',
+ 'showmainops',
+ 'showmenu',
+ 'showoutermenu',
+ 'showouterpad',
+ 'showpanel',
+ 'showpointer',
+ 'showrain',
+ 'showreelframe',
'showrightpage',
- 'nextfolder',
- 'lastfolder',
- 'folderhints',
- 'folderexit',
- 'getlocation',
- 'setlocation',
- 'loadtemptext',
- 'loadtraveltext',
- 'steady',
- 'constant',
- 'random',
- 'drawfloor',
- 'allocatebuffers',
+ 'showryanpage',
+ 'showseconduse',
+ 'showtime',
+ 'showwatch',
+ 'showword',
+ 'singlekey',
+ 'sortoutmap',
+ 'sparky',
+ 'sparkydrip',
+ 'splitintolines',
+ 'spriteupdate',
+ 'standardload',
'startdmablock',
- 'dmaend',
- 'bothchannels',
- 'channel1only',
- 'channel0only',
- 'restoreems',
- 'saveems',
- 'out22c',
- 'pitinterupt',
- 'getridofpit'
- 'setuppit',
- 'removeemm',
- 'setupemm',
+ 'startloading',
+ 'startpaltoend',
+ 'startup',
+ 'startup1',
+ 'steady',
+ 'storeit',
+ 'switchryanoff',
+ 'switchryanon',
+ 'textforend',
+ 'textformonk',
+ 'transferinv',
+ 'transfertext',
'trysoundalloc',
+ 'turnanypathoff',
+ 'turnanypathon',
+ 'turnonpower',
+ 'turnpathoff',
+ 'turnpathon',
+ 'twodigitnum',
+ 'updatepeople',
+ 'usecharset1',
+ 'usemenu',
+ 'usemon',
+ 'useroutine',
+ 'usetempcharset',
+ 'usetext',
+ 'usetimedtext',
+ 'viewfolder',
+ 'waitframes',
+ 'walkandexamine',
+ 'walking',
+ 'walktotext',
+ 'watchcount',
+ 'widedoor',
+ 'width160',
+ 'worktoscreen',
'worktoscreenm',
- 'checkspeed',
- 'sparkydrip',
- 'othersmoker',
- 'barwoman',
- 'gamer',
- 'eden',
- 'sparky',
- 'singlekey',
- 'showkeypad',
- 'showouterpad',
- 'buttonone',
- 'buttontwo',
- 'buttonthree',
- 'buttonfour',
- 'buttonfive',
- 'buttonsix',
- 'buttonseven',
- 'buttoneight',
- 'buttonnine',
- 'buttonnought',
- 'buttonenter',
- 'buttonpress',
- 'credits',
- 'isitright',
- 'addtopresslist',
- 'entercode',
- 'scanfornames',
- 'checkforemm',
- 'loadold',
+ 'wornerror',
+ 'zoom',
+ 'zoomicon',
], skip_output = [
# These functions are processed but not output
'dreamweb',
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 8f30dd42a8..833e76bfd9 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -760,7 +760,6 @@ public:
void walkIntoRoom();
void useHatch();
void printOuterMon();
- void setupPit();
void showPCX();
void showDecisions();
void removeObFromInv();
@@ -814,7 +813,6 @@ public:
void selectSlot();
void openFileNoCheck();
void fadeUpMon();
- void fadeToWhite();
void loadSaveBox();
void soundEnd();
void redes();
@@ -846,9 +844,9 @@ public:
void purgeAnItem();
void madman();
void enableSoundInt();
+ void volumeAdjust();
void madmansTelly();
void purgeALocation();
- void getRidOfPit();
void notHeldError();
void getSetAd();
void soldier1();
@@ -877,7 +875,7 @@ public:
void useWindow();
void wearShades();
void delEverything();
- void clearReels();
+ void fadeScreenDown();
void poolGuard();
void openInv();
void lookAtPlace();
@@ -1027,7 +1025,7 @@ public:
void updateSymbolTop();
void allPointer();
void checkSoundInt();
- void fadeScreenDown();
+ void clearReels();
void doSaveLoad();
void createName();
void readCityPic();
@@ -1050,7 +1048,7 @@ public:
void introMusic();
void quitKey();
void processTrigger();
- void volumeAdjust();
+ void readDestIcon();
void randomNum2();
void loadSecondSample();
void transferConToEx();
@@ -1062,7 +1060,7 @@ public:
void useRailing();
void useHole();
void useObject();
- void readDestIcon();
+ void fadeToWhite();
};
}