libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-04 01:07:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
38,200 Commits 6 Branches 5 Tags
Commit Graph

15977 Commits

Author SHA1 Message Date
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
David Turner
641ffa5ee3 Modification to remove false positive "Possible divide by zero" warnings given by cppcheck-1.43. 
These are incorrect as '/' operator has precedence over >>, but this does improve readability anyway.

This bug in cppcheck has already been corrected: http://sourceforge.net/apps/trac/cppcheck/ticket/1714

svn-id: r49517
 2010-06-08 20:29:33 +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
Jordi Vilalta Prat
9255d7c3cb Remove some extra spaces 
svn-id: r49489
 2010-06-07 17:18:25 +00:00
Jordi Vilalta Prat
0e95d8a5fa Groovie: 
- Rewritten T7G's font code to subclass Graphics::Font and make it cleaner.
- Use theme fonts for the Mac version of T7G (which used ugly system fonts
  originally). With this the Mac version should be completable.
- Cleanup include interdependencies.

svn-id: r49487
 2010-06-07 17:14:42 +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
Paul Gilbert
62402e743e Added extra positioning and dummy depths surface so that the introduction cutscene now starts up 
svn-id: r49480
 2010-06-07 10:17:44 +00:00
Paul Gilbert
b2678ddf52 Changed a create call to setSize to fix compiler error 
svn-id: r49479
 2010-06-07 09:35:59 +00:00
Paul Gilbert
34f7c05e4d Initial conversion of the AnimviewView class to use the expanded MadsAnimation class, rather than the older AAFile skeleton class 
svn-id: r49478
 2010-06-07 09:19:42 +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
Paul Gilbert
1572524b64 Moved destruction of globals and resource manager to common M4 engine base class - this fixes a bug where resources were still being tossed after the resource manager was destroyed 
svn-id: r49476
 2010-06-07 09:06:06 +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
Gregory Montoir
548015ac10 add missing decodeNextAnimationFrame in default case for sequence 9 
svn-id: r49458
 2010-06-06 14:18:16 +00:00
Gregory Montoir
536e6a9bc3 fix sequence frame numbering (decrement if getCurFrame now returns the last decoded frame number) 
svn-id: r49455
 2010-06-06 13:40:15 +00:00
Gregory Montoir
8e6cc1201a use palette image during sequence 3 scrolling 
svn-id: r49452
 2010-06-06 13:31:19 +00:00
Filippos Karapetis
43c353d930 Now opening all files via getVolumeFile() 
svn-id: r49451
 2010-06-06 13:04:24 +00:00
Paul Gilbert
3efec5720d Bugfixes for correct positioning of opening animation 
svn-id: r49448
 2010-06-06 06:46:29 +00:00
Paul Gilbert
c253a57e47 Bugfix for #2974817 - Mad Drongo Animation Malfunction 
svn-id: r49447
 2010-06-06 01:12:41 +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
Paul Gilbert
b9065aa2d2 Various bugfixes to the animation code - first Rex animation now plays, albeit in the wrong place 
svn-id: r49437
 2010-06-05 04:18:23 +00:00
Paul Gilbert
5686c251f0 Added missing animation initialisation code 
svn-id: r49436
 2010-06-05 01:55:17 +00:00
Paul Gilbert
3a5fe4ca00 Bugfix for wrong parameter order in scene resources load method call. Also added fragment to destroy an active animation when it's finished animating 
svn-id: r49434
 2010-06-04 22:53:26 +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
Nicola Mettifogo
9906030312 Ensure that zones/animations always get the same index number. 
When a zone/animation is skipped by the parser because already
loaded, the index is now increased. This does not affect NS, since
indexes are only used for scene sorting there, but is relevant for
BRA, where indexes need to be coherent across location changes.

Patch #3004008 by fuzzie.

svn-id: r49428
 2010-06-04 13:48:09 +00:00