aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-07-10Fixed a couple of errors in the new getSupportedFormats implementation.Jody Northup
svn-id: r42350
2009-07-10updated comment on initGraphics as I should have done before commiting r42330.Jody Northup
svn-id: r42332
2009-07-10Simplified SCI and groovie's initial graphics setup making use of the ↵Jody Northup
overloaded functions. svn-id: r42331
2009-07-10Overloaded initGraphics to provide for simpler procedures for engines ↵Jody Northup
supporting more than one format. svn-id: r42330
2009-07-10Fixed some branch-specific vsprops configuration, that was lost in the merge ↵Jody Northup
to using .vsprops files svn-id: r42329
2009-07-10removed OSystem::convertScreenRect as unnecessary and bloatful.Jody Northup
svn-id: r42326
2009-07-10Moved OSystem_SDL::getSupportedFormats function body from ↵Jody Northup
platforms/sdl/sdl.h to platforms/sdl/graphics.cpp, Improved and simplified list-generation method for OSystem_SDL::getSupportedFormats. svn-id: r42325
2009-07-10Merged revisions ↵Travis Howell
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-09fix compileMatthew Hoops
svn-id: r42308
2009-07-09Oops specify the correct revsision number in the fixme.Johannes Schickel
svn-id: r42306
2009-07-09Add fixme about SCI32 specific code.Johannes Schickel
svn-id: r42305
2009-07-09By comparing the commit log of r42300, it seems that "off" was renamed to ↵Johannes Schickel
"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-09Fix wrong format arugment.Johannes Schickel
svn-id: r42301
2009-07-09Applied patch #2818845 - "SCI: resource.map detection for SCI1/1.1 fixed", ↵Filippos Karapetis
with some slight formatting changes svn-id: r42300
2009-07-09restAdjust should be a signed integer. Fixes crashes with SCI1 games that ↵Filippos Karapetis
take absolute lofs parameters (a regression of commit #42260) svn-id: r42297
2009-07-09Cleanup rollDice (the results of the old and the new function are almost ↵Johannes Schickel
identical). svn-id: r42293
2009-07-09Cleanup.Johannes Schickel
svn-id: r42292
2009-07-09Added proper safeguards for shorten.*, thereby fixing commit 42259Filippos Karapetis
svn-id: r42290
2009-07-09Reverted commit #42257, as the original issue was with the compilation ↵Filippos Karapetis
process of MSVC and the ENABLE_* checks work correctly svn-id: r42289
2009-07-09- Rewrote and greatly simplified the MSVC8 and MSVC9 project files so that ↵Filippos Karapetis
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-09Renamed sound/iff.* to sound/iff_sound.* to fix an issue with the upcoming ↵Filippos Karapetis
changes to the MSVC project files (sound/iff.* produces iff.obj, which clashes with iff.obj from graphics/iff.*) svn-id: r42287
2009-07-09Warn instead of crash when a video frame part was found although the header ↵Sven Hesse
says there's no video svn-id: r42286
2009-07-09corrected creation of one Graphics::PixelFormat to reflect the resurrection ↵Jody Northup
of Graphics::PixelFormat::createFormatCLUT8 svn-id: r42282
2009-07-09Corrected lingering formatting errors that were introduced by the ↵Jody Northup
find-and-replace assisted removal of Graphics::PixelFormat::createFormat functions. svn-id: r42281
2009-07-09Removed #ifdef blocks around new error values in Common::Error and ↵Jody Northup
OSystem::TransactionError. svn-id: r42280
2009-07-09Changed the status of the cruise engine to be enabled by defaultPaul Gilbert
svn-id: r42278
2009-07-09Giving Font its own real classSven Hesse
svn-id: r42277
2009-07-09Merged revisions 42252,42255-42263,42269-42271 via svnmerge from Travis Howell
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-08LOL: cleanupFlorian Kagerer
svn-id: r42271
2009-07-08LOL: rename new function in last commit according to LordHoto's suggestionFlorian Kagerer
svn-id: r42270
2009-07-08LOL: fix long standing bugs in the battle system (hit chance, damage, etc) ↵Florian Kagerer
by adapting original style random number generator svn-id: r42269
2009-07-08Reinstated static inline Graphics::PixelFormat::createFormatCLUT8(), which I ↵Jody Northup
am told was not supposed to be removed with the others. svn-id: r42268
2009-07-08- Moved printObject inside the Console classFilippos Karapetis
- Enabled the parts where disassemble() is called svn-id: r42263
2009-07-08Only the kernel needs to be initialized before anything else, when ↵Filippos Karapetis
saving/loading svn-id: r42262
2009-07-08Fixed saving/loading again (broken with the latest changes for game feature ↵Filippos Karapetis
auto-detection) svn-id: r42261
2009-07-08Some cleanup for the script debugger code:Filippos Karapetis
- 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 svn-id: r42260
2009-07-08Added guards to only include the Shorten audio code when the SAGA2 code in ↵Filippos Karapetis
the SAGA engine is enabled svn-id: r42259
2009-07-08Also added the ENABLE_IHNM and ENABLE_SAGA2 preprocessor definitions to the ↵Filippos Karapetis
scummvm project files, not only the saga project files svn-id: r42258
2009-07-08The ENABLE_* flags are only checked for *.cpp files in MSVC, so move the ↵Filippos Karapetis
ENABLE_* checks to sjis.cpp to fix compilation under MSVC svn-id: r42257
2009-07-08Updated the MSVC project files of the scummvm project (added graphics/sjis.*)Filippos Karapetis
svn-id: r42256
2009-07-08Synced the MSVC project files of the gob engineFilippos Karapetis
svn-id: r42255
2009-07-08Fix recent regression in vc61().Travis Howell
svn-id: r42252
2009-07-07Merged revisions ↵Travis Howell
42205-42206,42208-42209,42211-42212,42214-42217,42219,42221-42222,42229-42235,42238-42240 via svnmerge from https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk ........ r42205 | dreammaster | 2009-07-07 17:41:02 +1000 (Tue, 07 Jul 2009) | 1 line Removed the shooting workaround delay - the overlay number can vary, so it isn't a reliable way of identifying the specific message ........ r42206 | thebluegr | 2009-07-07 17:44:25 +1000 (Tue, 07 Jul 2009) | 4 lines - Added auto-detection for EGA graphics. As a result of this, GF_SCI1_EGA has been removed and versions SCI_VERSION_01_EGA and SCI_VERSION_01_VGA have been merged into SCI_VERSION_01 - Simplified the checks for EGA and VGA graphics - Fixed a bug in script_adjust_opcode_formats() - Simplified the code in GfxResManager::getView() a bit ........ r42208 | strangerke | 2009-07-07 17:51:18 +1000 (Tue, 07 Jul 2009) | 1 line Add detection of Playtoons 2 En ........ r42209 | thebluegr | 2009-07-07 17:51:26 +1000 (Tue, 07 Jul 2009) | 1 line Added a SCI1.1 case in the lofss opcode, like in the lofsa opcode (essentially, lofss and lofsa both load an offset, with lofsa loading it in the accumulator and lofss in the stack). lofss is rarely used in SCI1.1 games, which explains why no lofss-related crashes have been observed in SCI1.1 ........ r42211 | thebluegr | 2009-07-07 20:28:05 +1000 (Tue, 07 Jul 2009) | 1 line Added auto-detection for games with older headers for script blocks, and removed game flag GF_SCI0_OLD ........ r42212 | thebluegr | 2009-07-07 21:14:18 +1000 (Tue, 07 Jul 2009) | 1 line Cleanup: added an enum for the auto-detected features, removed the selectors which are only used for auto-detection from the convenience selector map and placed feature auto-detection in a separate function. Also, now the automatically detected graphics resources are shown in the console. ........ r42214 | strangerke | 2009-07-07 21:58:22 +1000 (Tue, 07 Jul 2009) | 2 lines - Separate Playtoons gametypes from in GobEngine::initGameParts() - Add a specific save/load class for Playtoons as some specific files need to be tested ........ r42215 | strangerke | 2009-07-07 22:03:27 +1000 (Tue, 07 Jul 2009) | 3 lines - Add a new gametype for 'The Land of the Magic Stones' - Add detection of the french version - Add a new game feature for 800*600 ........ r42216 | thebluegr | 2009-07-07 22:29:55 +1000 (Tue, 07 Jul 2009) | 1 line Removed the superfluous sci_version_types array (it's essentially the same as the versionNames array) ........ r42217 | strangerke | 2009-07-07 22:51:21 +1000 (Tue, 07 Jul 2009) | 1 line Change SaveLoad_Playtoons case ........ r42219 | thebluegr | 2009-07-07 23:39:24 +1000 (Tue, 07 Jul 2009) | 1 line Removed the weird checks for a maximum resource number (the sci_max_resource_nr array), as it doesn't serve any real purpose and leads to strange errors: if a resource is found which is bigger than the maximum number, it will be remapped to an incorrect number from this check. This makes KQ5CD work properly again (resources would be remapped to incorrect resource numbers from this code as a result of not updating this array with the latest SCI version merges). ........ r42221 | lordhoto | 2009-07-08 00:22:23 +1000 (Wed, 08 Jul 2009) | 1 line Add generic functionallity to draw FM-Towns ROM. (To be used by KYRA and SCI) ........ r42222 | lordhoto | 2009-07-08 00:22:39 +1000 (Wed, 08 Jul 2009) | 1 line Adapt KYRA to use the new Graphics::FontSJIS code. ........ r42229 | sev | 2009-07-08 03:11:29 +1000 (Wed, 08 Jul 2009) | 2 lines kFeatures800 -> kFeatures800x600 in order to have more meaningful name ........ r42230 | lordhoto | 2009-07-08 04:10:35 +1000 (Wed, 08 Jul 2009) | 2 lines - Added support for outlined FM-Towns ROM drawing - Adapted KYRA to use that ........ r42231 | lordhoto | 2009-07-08 04:17:30 +1000 (Wed, 08 Jul 2009) | 2 lines - Rename FontSJIS::enableShadow to enableOutline. - Initialize outline to false by default in FontTowns. ........ r42232 | lordhoto | 2009-07-08 05:00:39 +1000 (Wed, 08 Jul 2009) | 1 line Change "FM-Towns" to "FM-TOWNS" for consistency. ........ r42233 | lordhoto | 2009-07-08 05:00:51 +1000 (Wed, 08 Jul 2009) | 1 line Add guards to only include SJIS font code, when KYRA or SCI is enabled. ........ r42234 | lordhoto | 2009-07-08 05:18:32 +1000 (Wed, 08 Jul 2009) | 1 line Simply compile guard of SJIS code and fix comment. ........ r42235 | lordhoto | 2009-07-08 05:18:53 +1000 (Wed, 08 Jul 2009) | 1 line Change all uses of FM-Towns/fm-towns to FM-TOWNS. ........ r42238 | thebluegr | 2009-07-08 06:01:15 +1000 (Wed, 08 Jul 2009) | 1 line Added a workaround for incorrect font references in LSL1VGA (which was the original purpose of the code removed in rev. 42219) ........ r42239 | thebluegr | 2009-07-08 06:17:07 +1000 (Wed, 08 Jul 2009) | 1 line Improved the LSL1VGA workaround after talking with waltervn ........ r42240 | thebluegr | 2009-07-08 06:43:27 +1000 (Wed, 08 Jul 2009) | 1 line Silenced the very chatty song iterator console messages by converting them to appropriate debug messages ........ svn-id: r42248
2009-07-07Silenced the very chatty song iterator console messages by converting them ↵Filippos Karapetis
to appropriate debug messages svn-id: r42240
2009-07-07Improved the LSL1VGA workaround after talking with waltervnFilippos Karapetis
svn-id: r42239
2009-07-07Added a workaround for incorrect font references in LSL1VGA (which was the ↵Filippos Karapetis
original purpose of the code removed in rev. 42219) svn-id: r42238
2009-07-07Change all uses of FM-Towns/fm-towns to FM-TOWNS.Johannes Schickel
svn-id: r42235
2009-07-07Simply compile guard of SJIS code and fix comment.Johannes Schickel
svn-id: r42234
2009-07-07Add guards to only include SJIS font code, when KYRA or SCI is enabled.Johannes Schickel
svn-id: r42233
2009-07-07Change "FM-Towns" to "FM-TOWNS" for consistency.Johannes Schickel
svn-id: r42232
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 03:24:17 +0000