Commit Graph
86814 Commits
Author SHA1 Message Date
Travis Howell 0577bee938 Merged revisions 42322,42328,42345-42346,42354-42358 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

........
  r42322 | dreammaster | 2009-07-10 10:49:13 +1000 (Fri, 10 Jul 2009) | 1 line
  
  Changed the status of the Tinsel engine to be enabled by default
........
  r42328 | sev | 2009-07-10 18:40:44 +1000 (Fri, 10 Jul 2009) | 2 lines
  
  Mention cruise support
........
  r42345 | thebluegr | 2009-07-11 04:53:40 +1000 (Sat, 11 Jul 2009) | 1 line
  
  Applied patch #2819665 - "SCI: cell palette fix for QfG3/SQ5/etc."
........
  r42346 | sev | 2009-07-11 05:06:24 +1000 (Sat, 11 Jul 2009) | 2 lines
  
  This is 1.0.0svn
........
  r42354 | drmccoy | 2009-07-11 07:49:47 +1000 (Sat, 11 Jul 2009) | 1 line
  
  Fixing mismatched delete
........
  r42355 | drmccoy | 2009-07-11 08:11:36 +1000 (Sat, 11 Jul 2009) | 1 line
  
  Mention the Gob savegame format change and change the version from 0.14.0 to 1.0.0 there too
........
  r42356 | Hkz | 2009-07-11 08:13:27 +1000 (Sat, 11 Jul 2009) | 1 line
  
  tinsel: proper detection entry for Discworld 1 Italian only CD
........
  r42357 | wjpalenstijn | 2009-07-11 08:29:25 +1000 (Sat, 11 Jul 2009) | 4 lines
  
  Recreate FSNode after calling checkPath since checkPath may
  have created the directory the FSNode points to, invalidating
  its cached metadata. In the future, it might be nice to add
  a FSNode::rescan() function for this? This fixes #2793187 .
........
  r42358 | sev | 2009-07-11 08:46:36 +1000 (Sat, 11 Jul 2009) | 5 lines
  
  Restored several files after the version update.
  
  .in files are THE sources, and have to be modified, not the files generated
  from them.
........

svn-id: r42359
2009-07-10 23:40:21 +00:00
Eugene Sandulenko 272e9487aa Restored several files after the version update.
.in files are THE sources, and have to be modified, not the files generated
from them.

svn-id: r42358
2009-07-10 22:46:36 +00:00
Willem Jan Palenstijn 1462efb52d Recreate FSNode after calling checkPath since checkPath may
have created the directory the FSNode points to, invalidating
its cached metadata. In the future, it might be nice to add
a FSNode::rescan() function for this? This fixes #2793187 .

svn-id: r42357
2009-07-10 22:29:25 +00:00
Fabio Battaglia 1f24fe43a2 tinsel: proper detection entry for Discworld 1 Italian only CD
svn-id: r42356
2009-07-10 22:13:27 +00:00
Sven Hesse c73e42154f Mention the Gob savegame format change and change the version from 0.14.0 to 1.0.0 there too
svn-id: r42355
2009-07-10 22:11:36 +00:00
Sven Hesse ad7c50e70d Fixing mismatched delete
svn-id: r42354
2009-07-10 21:49:47 +00:00
Jody Northup 70c138651d Whoops, and one more.
svn-id: r42351
2009-07-10 19:56:40 +00:00
Jody Northup 02e639ea0c Fixed a couple of errors in the new getSupportedFormats implementation.
svn-id: r42350
2009-07-10 19:55:06 +00:00
Eugene Sandulenko 4b37e6ad8c This is 1.0.0svn
svn-id: r42346
2009-07-10 19:06:24 +00:00
Filippos Karapetis dfe8ec9be0 Applied patch #2819665 - "SCI: cell palette fix for QfG3/SQ5/etc."
svn-id: r42345
2009-07-10 18:53:40 +00:00
Norbert Lange 100d86ee4d made all structures that are only written when loading song/samples const
fixed volume-handling a bit, still not correct

svn-id: r42343
2009-07-10 16:01:40 +00:00
Norbert Lange 3ae850fe9c added initialisation of channels
svn-id: r42339
2009-07-10 15:04:41 +00:00
Norbert Lange c5a3ab2af2 changed: period in Paula get set immediately instead of queued
svn-id: r42336
2009-07-10 14:30:37 +00:00
Norbert Lange f63c15acc1 added timebased effects
fixed passing length of samples to Paula
fixed setting tempo at songstart
fixed setting tempo/flags only if loading a score

svn-id: r42334
2009-07-10 13:38:13 +00:00
Jody Northup ddcab8169f updated comment on initGraphics as I should have done before commiting r42330.
svn-id: r42332
2009-07-10 10:47:25 +00:00
Jody Northup bb1da36710 Simplified SCI and groovie's initial graphics setup making use of the overloaded functions.
svn-id: r42331
2009-07-10 10:45:15 +00:00
Jody Northup 2f370ef8ab Overloaded initGraphics to provide for simpler procedures for engines supporting more than one format.
svn-id: r42330
2009-07-10 10:43:48 +00:00
Jody Northup cf6d4c0b20 Fixed some branch-specific vsprops configuration, that was lost in the merge to using .vsprops files
svn-id: r42329
2009-07-10 09:45:26 +00:00
Eugene Sandulenko 03ee1c9f2c Mention cruise support
svn-id: r42328
2009-07-10 08:40:44 +00:00
Jody Northup 689ad3d07c removed OSystem::convertScreenRect as unnecessary and bloatful.
svn-id: r42326
2009-07-10 07:08:54 +00:00
Jody Northup a5d374bded Moved OSystem_SDL::getSupportedFormats function body from platforms/sdl/sdl.h to platforms/sdl/graphics.cpp,
Improved and simplified list-generation method for OSystem_SDL::getSupportedFormats.

svn-id: r42325
2009-07-10 06:46:50 +00:00
Paul Gilbert 637ddaece4 Changed the status of the Tinsel engine to be enabled by default
svn-id: r42322
2009-07-10 00:49:13 +00:00
Travis Howell 4e99bee142 Merged revisions 42277-42278,42286-42290,42292-42293,42297,42300-42301,42303,42305-42306 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

........
  r42277 | drmccoy | 2009-07-09 12:54:10 +1000 (Thu, 09 Jul 2009) | 1 line
  
  Giving Font its own real class
........
  r42278 | dreammaster | 2009-07-09 13:07:30 +1000 (Thu, 09 Jul 2009) | 1 line
  
  Changed the status of the cruise engine to be enabled by default
........
  r42286 | drmccoy | 2009-07-09 19:39:51 +1000 (Thu, 09 Jul 2009) | 1 line
  
  Warn instead of crash when a video frame part was found although the header says there's no video
........
  r42287 | thebluegr | 2009-07-09 23:17:46 +1000 (Thu, 09 Jul 2009) | 1 line
  
  Renamed sound/iff.* to sound/iff_sound.* to fix an issue with the upcoming changes to the MSVC project files (sound/iff.* produces iff.obj, which clashes with iff.obj from graphics/iff.*)
........
  r42288 | thebluegr | 2009-07-10 01:12:35 +1000 (Fri, 10 Jul 2009) | 3 lines
  
  - Rewrote and greatly simplified the MSVC8 and MSVC9 project files so that they use common compilation properties, based on patch #2774908. These common properties make it much simpler to change options and compilation defines globally, similar to how GCC *.mk files do. Also, this fixes problems where an ENABLE_* define was set for one project file but not another (like the situation in revisions 42257 and 42259). It's now much easier to construct a tool which will create the project files dynamically.
  - Dropped support for MSVC7 and MSVC7.1 for now (as they don't support common compilation properties and it's no longer easy to construct them from the MSVC8 ones) - hopefully, they will return in the future, once we got a more sophisticated tool to create them
  - Simplified the MSVC9 <-> MSVC8 conversion tools a bit
........
  r42289 | thebluegr | 2009-07-10 01:15:49 +1000 (Fri, 10 Jul 2009) | 1 line
  
  Reverted commit #42257, as the original issue was with the compilation process of MSVC and the ENABLE_* checks work correctly
........
  r42290 | thebluegr | 2009-07-10 01:17:45 +1000 (Fri, 10 Jul 2009) | 1 line
  
  Added proper safeguards for shorten.*, thereby fixing commit 42259
........
  r42292 | lordhoto | 2009-07-10 01:32:06 +1000 (Fri, 10 Jul 2009) | 1 line
  
  Cleanup.
........
  r42293 | lordhoto | 2009-07-10 01:32:25 +1000 (Fri, 10 Jul 2009) | 1 line
  
  Cleanup rollDice (the results of the old and the new function are almost identical).
........
  r42297 | thebluegr | 2009-07-10 01:46:26 +1000 (Fri, 10 Jul 2009) | 1 line
  
  restAdjust should be a signed integer. Fixes crashes with SCI1 games that take absolute lofs parameters (a regression of commit #42260)
........
  r42300 | thebluegr | 2009-07-10 01:54:18 +1000 (Fri, 10 Jul 2009) | 1 line
  
  Applied patch #2818845 - "SCI: resource.map detection for SCI1/1.1 fixed", with some slight formatting changes
........
  r42301 | lordhoto | 2009-07-10 01:59:20 +1000 (Fri, 10 Jul 2009) | 1 line
  
  Fix wrong format arugment.
........
  r42303 | lordhoto | 2009-07-10 02:16:08 +1000 (Fri, 10 Jul 2009) | 1 line
  
  By comparing the commit log of r42300, it seems that "off" was renamed to "lastDirectoryOffset". I changed the SCI32 specific code to use that now. I can't assure this is anyhow correct, so anyone with knowledge of this code please check it.
........
  r42305 | lordhoto | 2009-07-10 02:23:22 +1000 (Fri, 10 Jul 2009) | 1 line
  
  Add fixme about SCI32 specific code.
........
  r42306 | lordhoto | 2009-07-10 02:24:59 +1000 (Fri, 10 Jul 2009) | 1 line
  
  Oops specify the correct revsision number in the fixme.
........

svn-id: r42318
2009-07-10 00:07:26 +00:00
Matthew Hoops ff208c5387 fix compile
svn-id: r42308
2009-07-09 17:25:06 +00:00
Johannes Schickel e8e9b88227 Oops specify the correct revsision number in the fixme.
svn-id: r42306
2009-07-09 16:24:59 +00:00
Johannes Schickel 5d0d67e574 Add fixme about SCI32 specific code.
svn-id: r42305
2009-07-09 16:23:22 +00:00
Norbert Lange c16d276f99 fixed some mismatched new[]/delete
fixed 2 bugs in the calcnote function

svn-id: r42304
2009-07-09 16:18:35 +00:00
Johannes Schickel 1ac515c629 By comparing the commit log of r42300, it seems that "off" was renamed to "lastDirectoryOffset". I changed the SCI32 specific code to use that now. I can't assure this is anyhow correct, so anyone with knowledge of this code please check it.
svn-id: r42303
2009-07-09 16:16:08 +00:00
Johannes Schickel 0aa83f14c7 Fix wrong format arugment.
svn-id: r42301
2009-07-09 15:59:20 +00:00
Filippos Karapetis 717de7800c Applied patch #2818845 - "SCI: resource.map detection for SCI1/1.1 fixed", with some slight formatting changes
svn-id: r42300
2009-07-09 15:54:18 +00:00
Filippos Karapetis 982153e0ab restAdjust should be a signed integer. Fixes crashes with SCI1 games that take absolute lofs parameters (a regression of commit #42260)
svn-id: r42297
2009-07-09 15:46:26 +00:00
Johannes Schickel a17333ed1b Cleanup rollDice (the results of the old and the new function are almost identical).
svn-id: r42293
2009-07-09 15:32:25 +00:00
Johannes Schickel a7c96e1526 Cleanup.
svn-id: r42292
2009-07-09 15:32:06 +00:00
Filippos Karapetis b1bd180408 Added proper safeguards for shorten.*, thereby fixing commit 42259
svn-id: r42290
2009-07-09 15:17:45 +00:00
Filippos Karapetis a0a675e42d Reverted commit #42257, as the original issue was with the compilation process of MSVC and the ENABLE_* checks work correctly
svn-id: r42289
2009-07-09 15:15:49 +00:00
Filippos Karapetis aa66cf3fd8 - Rewrote and greatly simplified the MSVC8 and MSVC9 project files so that they use common compilation properties, based on patch #2774908. These common properties make it much simpler to change options and compilation defines globally, similar to how GCC *.mk files do. Also, this fixes problems where an ENABLE_* define was set for one project file but not another (like the situation in revisions 42257 and 42259). It's now much easier to construct a tool which will create the project files dynamically.
- Dropped support for MSVC7 and MSVC7.1 for now (as they don't support common compilation properties and it's no longer easy to construct them from the MSVC8 ones) - hopefully, they will return in the future, once we got a more sophisticated tool to create them
- Simplified the MSVC9 <-> MSVC8 conversion tools a bit

svn-id: r42288
2009-07-09 15:12:35 +00:00
Filippos Karapetis 8a783bdd76 Renamed sound/iff.* to sound/iff_sound.* to fix an issue with the upcoming changes to the MSVC project files (sound/iff.* produces iff.obj, which clashes with iff.obj from graphics/iff.*)
svn-id: r42287
2009-07-09 13:17:46 +00:00
Sven Hesse 8a7a81ed30 Warn instead of crash when a video frame part was found although the header says there's no video
svn-id: r42286
2009-07-09 09:39:51 +00:00
Jody Northup a4f3a83900 corrected creation of one Graphics::PixelFormat to reflect the resurrection of Graphics::PixelFormat::createFormatCLUT8
svn-id: r42282
2009-07-09 09:10:05 +00:00
Jody Northup cdad3763df Corrected lingering formatting errors that were introduced by the find-and-replace assisted removal of Graphics::PixelFormat::createFormat functions.
svn-id: r42281
2009-07-09 09:09:05 +00:00
Jody Northup 1d38ead4e7 Removed #ifdef blocks around new error values in Common::Error and OSystem::TransactionError.
svn-id: r42280
2009-07-09 09:06:31 +00:00
Paul Gilbert 22a48e6c39 Changed the status of the cruise engine to be enabled by default
svn-id: r42278
2009-07-09 03:07:30 +00:00
Sven Hesse 3823ae285f Giving Font its own real class
svn-id: r42277
2009-07-09 02:54:10 +00:00
Norbert Lange 84e96bc513 fixed up some constants
svn-id: r42276
2009-07-09 00:19:17 +00:00
Travis Howell bffeaaae76 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
2009-07-09 00:19:00 +00:00
Norbert Lange d25f481421 fixed (and inlined) the "Antilog" function
svn-id: r42274
2009-07-09 00:02:12 +00:00
Norbert Lange a9d9de7db4 implemented setting note-periods, likely still somewhat wrong.
reversed the log functions which does exactly the inverse as the name implies (its refered as "antilog" in the sources *rollseyes*)

svn-id: r42273
2009-07-08 22:59:50 +00:00
Florian Kagerer c7eedb573a LOL: cleanup
svn-id: r42271
2009-07-08 21:12:03 +00:00
Florian Kagerer a212a9da7e LOL: rename new function in last commit according to LordHoto's suggestion
svn-id: r42270
2009-07-08 20:32:34 +00:00
Florian Kagerer 2950bc28c4 LOL: fix long standing bugs in the battle system (hit chance, damage, etc) by adapting original style random number generator
svn-id: r42269
2009-07-08 20:19:23 +00:00