diff options
| author | Willem Jan Palenstijn | 2011-12-07 10:23:21 -0800 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2011-12-07 10:23:21 -0800 |
| commit | 9e617d0dfddf91e5802c783fae5be679afe22b05 (patch) | |
| tree | 5e9eb811689cb5e21b7ec41b0b14674d422da092 /devtools | |
| parent | c1b7d25bb7cd8f718d79b47c6b4a12caed904dde (diff) | |
| parent | 28ba2071e44b15ecb4c20ee682a9e2bbafe67ab9 (diff) | |
| download | scummvm-rg350-9e617d0dfddf91e5802c783fae5be679afe22b05.tar.gz scummvm-rg350-9e617d0dfddf91e5802c783fae5be679afe22b05.tar.bz2 scummvm-rg350-9e617d0dfddf91e5802c783fae5be679afe22b05.zip | |
Merge pull request #127 from fingolfin/dreamweb-cleanup
Dreamweb: Remove more dead stuff, advance DreamBase <-> DreamGenContext split
Diffstat (limited to 'devtools')
| -rwxr-xr-x | devtools/tasmrecover/tasm-recover | 4 | ||||
| -rw-r--r-- | devtools/tasmrecover/tasm/cpp.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 63797c6e17..138859cd82 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -279,6 +279,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'examineobtext', 'facerightway', 'fadecalculation', + 'fadedos', 'fadescreenup', 'fadescreenups', 'fadescreenuphalf', @@ -654,6 +655,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'usewinch', 'usewindow', 'viewfolder', + 'volumeadjust', 'waitframes', 'walkandexamine', 'walking', @@ -715,7 +717,6 @@ generator = cpp(context, "DreamGen", blacklist = [ 'openfilefromc' : 'openFileFromC', 'gettime' : 'getTime', 'loadtraveltext' : 'loadTravelText', - 'fadedos' : 'fadeDOS', 'drawfloor' : 'drawFloor', 'loadkeypad' : 'loadKeypad', 'findtext1' : 'findText1', @@ -1138,7 +1139,6 @@ generator = cpp(context, "DreamGen", blacklist = [ 'intromusic' : 'introMusic', 'quitkey' : 'quitKey', 'processtrigger' : 'processTrigger', - 'volumeadjust' : 'volumeAdjust', 'randomnum2' : 'randomNum2', 'loadsecondsample' : 'loadSecondSample', 'transfercontoex' : 'transferConToEx', diff --git a/devtools/tasmrecover/tasm/cpp.py b/devtools/tasmrecover/tasm/cpp.py index 24d353561a..e507fd451d 100644 --- a/devtools/tasmrecover/tasm/cpp.py +++ b/devtools/tasmrecover/tasm/cpp.py @@ -644,7 +644,7 @@ namespace %s { """ class %sContext : public DreamBase, public Context { public: - DreamGenContext() : DreamBase(), Context(_realData) {} + DreamGenContext(DreamWeb::DreamWebEngine *en) : DreamBase(en), Context(data) {} void __start(); """ |