diff options
author | Travis Howell | 2009-07-09 00:19:00 +0000 |
---|---|---|
committer | Travis Howell | 2009-07-09 00:19:00 +0000 |
commit | bffeaaae76ebe5b5e981f5157e9b806f48c29a4f (patch) | |
tree | e87a4f9827568c7dac1d4ec933e0b54f9f601262 /sound | |
parent | 828ed66555b99363fed62b4cbb83c36de68c3024 (diff) | |
parent | c7eedb573ac3ac1bd4c8f8e64d75ee8ee931bc50 (diff) | |
download | scummvm-rg350-bffeaaae76ebe5b5e981f5157e9b806f48c29a4f.tar.gz scummvm-rg350-bffeaaae76ebe5b5e981f5157e9b806f48c29a4f.tar.bz2 scummvm-rg350-bffeaaae76ebe5b5e981f5157e9b806f48c29a4f.zip |
Merged revisions 42252,42255-42263,42269-42271 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
........
r42252 | Kirben | 2009-07-08 11:07:41 +1000 (Wed, 08 Jul 2009) | 1 line
Fix recent regression in vc61().
........
r42255 | thebluegr | 2009-07-08 17:09:03 +1000 (Wed, 08 Jul 2009) | 1 line
Synced the MSVC project files of the gob engine
........
r42256 | thebluegr | 2009-07-08 17:11:43 +1000 (Wed, 08 Jul 2009) | 1 line
Updated the MSVC project files of the scummvm project (added graphics/sjis.*)
........
r42257 | thebluegr | 2009-07-08 17:13:56 +1000 (Wed, 08 Jul 2009) | 1 line
The ENABLE_* flags are only checked for *.cpp files in MSVC, so move the ENABLE_* checks to sjis.cpp to fix compilation under MSVC
........
r42258 | thebluegr | 2009-07-08 17:25:09 +1000 (Wed, 08 Jul 2009) | 1 line
Also added the ENABLE_IHNM and ENABLE_SAGA2 preprocessor definitions to the scummvm project files, not only the saga project files
........
r42259 | thebluegr | 2009-07-08 17:28:13 +1000 (Wed, 08 Jul 2009) | 1 line
Added guards to only include the Shorten audio code when the SAGA2 code in the SAGA engine is enabled
........
r42260 | thebluegr | 2009-07-08 20:25:37 +1000 (Wed, 08 Jul 2009) | 3 lines
Some cleanup for the script debugger code:
- Renamed struct DebugState to ScriptState and r_amp_rest to restAdjust inside EngineState. Changed restAdjust to be a uint16 (actually it is a uint16, but it was being casted back and forth from an unsigned integer, so this clears up its type and size)
- Moved the script state variables from inside the run_vm() into the ScriptState struct, so that they can be accessed by the console commands and the script debugger all the time, and removed the weird isValid code
........
r42261 | thebluegr | 2009-07-08 20:35:51 +1000 (Wed, 08 Jul 2009) | 1 line
Fixed saving/loading again (broken with the latest changes for game feature auto-detection)
........
r42262 | thebluegr | 2009-07-08 20:44:25 +1000 (Wed, 08 Jul 2009) | 1 line
Only the kernel needs to be initialized before anything else, when saving/loading
........
r42263 | thebluegr | 2009-07-08 23:08:51 +1000 (Wed, 08 Jul 2009) | 2 lines
- Moved printObject inside the Console class
- Enabled the parts where disassemble() is called
........
r42269 | athrxx | 2009-07-09 06:19:23 +1000 (Thu, 09 Jul 2009) | 1 line
LOL: fix long standing bugs in the battle system (hit chance, damage, etc) by adapting original style random number generator
........
r42270 | athrxx | 2009-07-09 06:32:34 +1000 (Thu, 09 Jul 2009) | 1 line
LOL: rename new function in last commit according to LordHoto's suggestion
........
r42271 | athrxx | 2009-07-09 07:12:03 +1000 (Thu, 09 Jul 2009) | 1 line
LOL: cleanup
........
svn-id: r42275
Diffstat (limited to 'sound')
-rw-r--r-- | sound/shorten.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sound/shorten.cpp b/sound/shorten.cpp index b550a5afec..d1031aed3a 100644 --- a/sound/shorten.cpp +++ b/sound/shorten.cpp @@ -23,6 +23,14 @@ * */ +// The code in this file is currently only used in SAGA2 (in the +// SAGA engine), so if that engine isn't enabled, we will skip +// compiling it. If you plan to use this code in another engine, +// you will have to add the proper define check here. +// Also please add the define check at the comment after the +// matching #endif further down this file. +#if defined(ENABLE_SAGA2) + // Based on etree's Shorten tool, version 3.6.1 // http://etree.org/shnutils/shorten/ @@ -526,3 +534,6 @@ AudioStream *makeShortenStream(Common::SeekableReadStream &stream) { } } // End of namespace Audio + +#endif // defined(ENABLE_SAGA2) + |