diff options
| author | Filippos Karapetis | 2011-12-08 00:31:33 -0800 |
|---|---|---|
| committer | Filippos Karapetis | 2011-12-08 00:31:33 -0800 |
| commit | 5b5a684c050d937cb8b7284e3d4f17d7746319d0 (patch) | |
| tree | 42300faeedf1d031f49fd2bc9cb5421c7dde3a33 /devtools | |
| parent | 02fed995a96e697927c6b71ae6ca22e29b02febd (diff) | |
| parent | cb0a12033b97064b35c30d5d86406b4b16517532 (diff) | |
| download | scummvm-rg350-5b5a684c050d937cb8b7284e3d4f17d7746319d0.tar.gz scummvm-rg350-5b5a684c050d937cb8b7284e3d4f17d7746319d0.tar.bz2 scummvm-rg350-5b5a684c050d937cb8b7284e3d4f17d7746319d0.zip | |
Merge pull request #128 from fingolfin/dreamweb-segments
DREAMWEB: Refactor segment management
Diffstat (limited to 'devtools')
| -rwxr-xr-x | devtools/tasmrecover/tasm-recover | 2 | ||||
| -rw-r--r-- | devtools/tasmrecover/tasm/cpp.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index ae0d4015ad..b97cf5cd36 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -250,6 +250,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'doblocks', 'dochange', 'dodoor', + 'dofade', 'doload', 'dolook', 'domix', @@ -772,7 +773,6 @@ generator = cpp(context, "DreamGen", blacklist = [ 'advisor' : 'advisor', 'additionaltext' : 'additionalText', 'othersmoker' : 'otherSmoker', - 'dofade' : 'doFade', 'useelevator5' : 'useElevator5', 'useelevator4' : 'useElevator4', 'useelevator1' : 'useElevator1', diff --git a/devtools/tasmrecover/tasm/cpp.py b/devtools/tasmrecover/tasm/cpp.py index e507fd451d..686aea9ee9 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(DreamWeb::DreamWebEngine *en) : DreamBase(en), Context(data) {} + DreamGenContext(DreamWeb::DreamWebEngine *en) : DreamBase(en), Context(this) {} void __start(); """ |