ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
86,814 Commits 45 Branches 139 Tags
578a6794de9ba7679966fee9aec02c6b2bdbce94
Commit Graph
7940 Commits
Author SHA1 Message Date
Filippos Karapetis 5d71ae952f The EngineState is no longer recreated when a game is restored, thus we don't need to refresh pointers to it 
svn-id: r49549
 2010-06-09 20:12:25 +00:00
Alejandro Marzini e991cd8c53 - Revised abstract AudioCDManager. 
- Removed AudioCDManager Singleton, and changed code for using AudioCDManager in OSystem.
- Added initialization code for new AudioCDManager in BaseBackend and OSystem_SDL.

svn-id: r49548
 2010-06-09 20:09:57 +00:00
Filippos Karapetis c486b77bb7 Fixed crash in SCI2.1 games 
svn-id: r49546
 2010-06-09 18:42:21 +00:00
Filippos Karapetis d191c9d0f9 Limit kPortrait to be used in the Windows version of KQ6 only 
svn-id: r49545
 2010-06-09 17:04:03 +00:00
Filippos Karapetis a542ce174b Proper fix for kernel name loading (regression from commit #49537) 
svn-id: r49544
 2010-06-09 15:28:14 +00:00
Filippos Karapetis 3c9ab81a07 Fixed regression from commit #49537 
svn-id: r49543
 2010-06-09 15:21:10 +00:00
Filippos Karapetis 32d7f7ddb0 Disabled the mouse warping code, as it can be annoying in windowed mode 
svn-id: r49542
 2010-06-09 14:16:00 +00:00
Filippos Karapetis 015262a0ee Fixed compilation when the old sound code is used 
svn-id: r49540
 2010-06-09 14:06:16 +00:00
Martin Kiewitz 0f2e6b0f85 SCI: fix multiple playing of the same sound in a row (without using looping) - thx to LordHoto for helping me finding this one out - fixes pharkas right at the start (hammering only played once) 
svn-id: r49538
 2010-06-09 13:27:59 +00:00
Filippos Karapetis 2c629a04dd Merged script_init_engine() and game_init() and cleaned up SciEngine::run() a bit 
svn-id: r49537
 2010-06-09 10:45:54 +00:00
Filippos Karapetis 536b2614e8 Globals from script 0 are now initialized in script_init_engine(), and are accessed from the relevant variables pointer. Removed direct reference to script 0 from the engine state 
svn-id: r49536
 2010-06-09 09:17:48 +00:00
Willem Jan Palenstijn 95b080f60b Fix compile errors 
svn-id: r49535
 2010-06-09 08:49:37 +00:00
Filippos Karapetis 5cb311ee2c Renamed the SciEvent class to EventManager, to separate it from the sciEvent structure, and removed it from the engine state 
svn-id: r49534
 2010-06-09 07:59:42 +00:00
Filippos Karapetis 10aeb33a42 Merged restAdjust and restAdjustCur, as we don't save the restAdjust modifier inside saved games (rightfully so). Also, the segment manager is now reset inside the main loop, when the game is restarted, not in game_exit() 
svn-id: r49533
 2010-06-09 07:32:17 +00:00
Filippos Karapetis 81907a8e6f Don't shrink the stack after reconstructing it, when loading a saved game. Fixes game restoring in some games (e.g. LSL3), a regression from commit #49376 
svn-id: r49525
 2010-06-08 23:29:35 +00:00
Martin Kiewitz dc8b826f5e SCI: set default palette after initializing music driver, fixes palette getting messed up when using mt32 emulation 
svn-id: r49523
 2010-06-08 22:00:59 +00:00
Filippos Karapetis eafc63e572 Cleanup 
svn-id: r49521
 2010-06-08 21:21:19 +00:00
Martin Kiewitz 6474eaa1b2 SCI: check for SOL header in audio36 patches 
svn-id: r49520
 2010-06-08 21:15:53 +00:00
Filippos Karapetis 9304b5fbeb Merged the restarting_flags, script_abort_flag, and restoring members of the EngineState class into one variable, abortScriptProcessing. The flag kept to signify a game restart has been placed in a boolean, gameWasRestarted 
svn-id: r49518
 2010-06-08 21:05:46 +00:00
Filippos Karapetis 73010518b2 Fixed compilation when the SCI32 code is disabled 
svn-id: r49514
 2010-06-08 19:36:33 +00:00
Filippos Karapetis 67690e89a3 Merged _game_run() inside game_run(). Some cleanup 
svn-id: r49513
 2010-06-08 18:44:27 +00:00
Filippos Karapetis 3d0ac2a676 Merged sync_SegManagerPtr() inside EngineState::saveLoadWithSerializer() 
svn-id: r49512
 2010-06-08 18:23:38 +00:00
Martin Kiewitz 12ca735ceb SCI: use base36 sync/audio patches for sci1.1 as well and also check if patch filenames make sense, otherwise skip them - also remove hack for excluding bootdisk.* and aud*.drv 
svn-id: r49509
 2010-06-08 15:08:45 +00:00
Filippos Karapetis 5ba761a687 Made reconstruct_stack() a member of SegManager 
svn-id: r49503
 2010-06-08 13:16:30 +00:00
Filippos Karapetis 707ccdbac7 Add a version check for base36 encoded patches - they were introduced in SCI2 
svn-id: r49501
 2010-06-08 13:15:05 +00:00
Martin Kiewitz f743468ec7 SCI: if song isn't playing, set signal and don't set fadeout/fadein variables - fixes lsl3 music lost after entering/exiting tv room (bug #3007406) 
svn-id: r49500
 2010-06-08 09:36:27 +00:00
Martin Kiewitz ea2e2053f2 SCI: slight cleanup on processPatch, etc. 
svn-id: r49495
 2010-06-07 21:55:57 +00:00
Martin Kiewitz ae599e63c2 SCI: fix regression from #49484, we were ignoring 65535 patches and this broke kq6 - the check was previously for -1 and this case wasn't able to happen at all, maybe it was left-over code from freesci somehow 
svn-id: r49494
 2010-06-07 21:33:55 +00:00
Filippos Karapetis 419b4b7348 Added support for SCI2+ base36 encoded patches (audio36 and sync36) 
svn-id: r49491
 2010-06-07 17:44:17 +00:00
Filippos Karapetis 2c950b321c Fixed regression from commit #49465 - there are in fact two restAdjust variables, the current and global one 
svn-id: r49486
 2010-06-07 15:14:58 +00:00
Johannes Schickel 8ef5d55edb Fix gcc warning about an comparison which is always false due to data type range. 
svn-id: r49484
 2010-06-07 13:47:14 +00:00
Matthew Hoops d5b5a8dbae Allow for the other audio36 patch naming schemes (Mac and some Torin ones). 
svn-id: r49482
 2010-06-07 11:44:52 +00:00
Filippos Karapetis 43ec405ffe Some initial code for audio36 and sync36 patch support 
svn-id: r49477
 2010-06-07 09:10:22 +00:00
Walter van Niftrik d30d57b923 SCI: Relax signature of kCreateTextBitmap. 
svn-id: r49470
 2010-06-07 02:11:19 +00:00
Walter van Niftrik b04535d487 SCI: Adjust kGetSaveFiles for SCI32. 
svn-id: r49469
 2010-06-07 02:11:01 +00:00
Matthew Hoops 1e56ea9ac9 Change some kString subops to use the raw string directly instead of through a Common::String. Fixes usage with strings from kGetSaveFiles(). 
svn-id: r49468
 2010-06-07 01:43:35 +00:00
Filippos Karapetis 3c82b6578f Now that EngineState is not deleted when loading games, we can move some more state-related variables to it, and remove several FIXME's about non-const global variables. Also, the entries in the data stack are now deleted when loading (fixes a memory leak - thanks to digitall for this). 
svn-id: r49465
 2010-06-06 23:00:33 +00:00
Matthew Hoops 51a8978455 Throw a warning in kString(At) if the index is out-of-bounds instead of having it assert out. 
svn-id: r49464
 2010-06-06 22:44:14 +00:00
Filippos Karapetis 43c353d930 Now opening all files via getVolumeFile() 
svn-id: r49451
 2010-06-06 13:04:24 +00:00
Filippos Karapetis abcd8e093a Replaced a leftover Common::File::exists() call in the fallback detector 
svn-id: r49443
 2010-06-05 19:55:03 +00:00
Filippos Karapetis c00d645506 Fixed the cursor limiting code in GK1 
svn-id: r49440
 2010-06-05 18:15:41 +00:00
Filippos Karapetis e9f35fbf4c Rewrote the remaining parts of the ResourceManager class to work with file streams, thus removing the SCI_detection hack in the fallback detector 
svn-id: r49438
 2010-06-05 14:09:52 +00:00
David Turner 8b102ab7af SCI: Fix for Valgrind Warning in Palette. 
svn-id: r49433
 2010-06-04 20:06:59 +00:00
Filippos Karapetis 722c4f1b8d Some more work on channel remapping: Moved the remapping code to the music loading code (still disabled) 
svn-id: r49430
 2010-06-04 15:01:26 +00:00
Filippos Karapetis fdc9bbcbf5 Simplified the channel monitoring code inside the SoundResource class 
svn-id: r49429
 2010-06-04 14:53:12 +00:00
Walter van Niftrik 997fdac427 SCI: Replace strncpy with Common::strlcpy 
svn-id: r49425
 2010-06-04 10:51:27 +00:00
Walter van Niftrik a8acf7468c SCI: Add savegame version check in CheckSaveGame 
svn-id: r49424
 2010-06-04 10:36:49 +00:00
Walter van Niftrik f1a55a9c67 SCI: Cleanup 
svn-id: r49423
 2010-06-04 10:15:13 +00:00
Johannes Schickel 664c86f25d Replace two uses of ::qsort by Common::sort. 
svn-id: r49418
 2010-06-03 23:37:05 +00:00
Johannes Schickel 02ed1a684a - Made some methods const 
- Prefer const_iterator over iterator in SciMusic::findUsedChannels

svn-id: r49417
 2010-06-03 23:07:53 +00:00