diff options
author | Johannes Schickel | 2009-03-04 00:45:34 +0000 |
---|---|---|
committer | Johannes Schickel | 2009-03-04 00:45:34 +0000 |
commit | 3a35b5b5f25a6ff5d20be5374bdb505f51ee3a43 (patch) | |
tree | ae511ea53e96b3ce3a50f2cec645739c5ba04f89 /engines/kyra/kyra_hof.h | |
parent | bc3702dcdb57814da4460469722c258ca10e6327 (diff) | |
download | scummvm-rg350-3a35b5b5f25a6ff5d20be5374bdb505f51ee3a43.tar.gz scummvm-rg350-3a35b5b5f25a6ff5d20be5374bdb505f51ee3a43.tar.bz2 scummvm-rg350-3a35b5b5f25a6ff5d20be5374bdb505f51ee3a43.zip |
- Make Lands of Lore compileable optionally as suggested by _sev. (via ENABLE_LOL define)
- Change default build system to support LoL as a subengine of KYRA. LoL is currently disabled by default.
(- Minor enum name fixes for Lands of Lore code.)
svn-id: r39099
Diffstat (limited to 'engines/kyra/kyra_hof.h')
-rw-r--r-- | engines/kyra/kyra_hof.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/engines/kyra/kyra_hof.h b/engines/kyra/kyra_hof.h index b1902103a6..09a5906e31 100644 --- a/engines/kyra/kyra_hof.h +++ b/engines/kyra/kyra_hof.h @@ -97,6 +97,7 @@ enum kNestedSequencesDemo { kSequenceDemoDig }; +#ifdef ENABLE_LOL enum kSequencesLolDemo { kSequenceLolDemoScene1 = 0, kSequenceLolDemoText1, @@ -110,6 +111,7 @@ enum kSequencesLolDemo { kSequenceLolDemoText5, kSequenceLolDemoScene6 }; +#endif // ENABLE_LOL class WSAMovie_v2; class KyraEngine_HoF; @@ -256,6 +258,7 @@ protected: int seq_demoBail(WSAMovie_v2 *wsaObj, int x, int y, int frm); int seq_demoDig(WSAMovie_v2 *wsaObj, int x, int y, int frm); +#ifdef ENABLE_LOL int seq_lolDemoScene1(WSAMovie_v2 *wsaObj, int x, int y, int frm); int seq_lolDemoScene2(WSAMovie_v2 *wsaObj, int x, int y, int frm); int seq_lolDemoScene3(WSAMovie_v2 *wsaObj, int x, int y, int frm); @@ -263,6 +266,7 @@ protected: int seq_lolDemoScene5(WSAMovie_v2 *wsaObj, int x, int y, int frm); int seq_lolDemoText5(WSAMovie_v2 *wsaObj, int x, int y, int frm); int seq_lolDemoScene6(WSAMovie_v2 *wsaObj, int x, int y, int frm); +#endif // ENABLE_LOL void seq_sequenceCommand(int command); void seq_loadNestedSequence(int wsaNum, int seqNum); |