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
88 Commits
Author SHA1 Message Date
Johannes Schickel dfd461e35d - Yet another minor difference in seq_winterScroll2 
- Fix wrong offsets of flasks strings for Kyrandia 1 Amiga in kyra.dat
- Increase kyra.dat version

svn-id: r43274
 2009-08-11 15:34:55 +00:00
Johannes Schickel 5e10c284e5 Implement differences in seq_winterScroll1 for Kyrandia 1 Amiga. 
svn-id: r43273
 2009-08-11 15:34:28 +00:00
Johannes Schickel 898f8d571c Implement palette differences for seq_playDrinkPotionAnim. 
svn-id: r43252
 2009-08-11 02:12:24 +00:00
Johannes Schickel 7e1949dbbd Fix crash when using Will-O-Wisp in the grotto. 
svn-id: r43249
 2009-08-11 01:47:29 +00:00
Johannes Schickel f49bfc58e4 Some changes to get the Kyrandia 1 Amiga credits to show up at least. 
svn-id: r43247
 2009-08-11 01:24:56 +00:00
Johannes Schickel 1a9630834c Some fixes for the Kyrandia 1 Amiga outro. 
svn-id: r43245
 2009-08-11 01:24:15 +00:00
Johannes Schickel 40c58d4ed0 Fix regression introduced with r41081. 
svn-id: r43241
 2009-08-11 00:14:54 +00:00
Johannes Schickel 714bf33988 Disable Kyragem fading for Kyrandia 1 Amiga. 
svn-id: r43240
 2009-08-11 00:14:40 +00:00
Johannes Schickel 01fcad7517 Fix WSA movies for final sequence of Kyrandia 1 Amiga. (this is just a theoretical fix, the game isn't yet playable till then) 
svn-id: r43232
 2009-08-10 22:18:47 +00:00
Norbert Lange 31b6767666 fixed: intro-music started twice because it was hardcoded in the engine 
removed verbose debug-output from maxtrax
 

svn-id: r42604
 2009-07-19 01:14:51 +00:00
Johannes Schickel 4dc454581c Change all uses of FM-Towns/fm-towns to FM-TOWNS. 
svn-id: r42235
 2009-07-07 19:18:53 +00:00
Johannes Schickel 5767277d8d - Fixed regression in Screen::fadeToBlack 
- Fixed some palette regressions in Kyra1 Amiga (only the intro works currently)

svn-id: r41746
 2009-06-22 02:37:57 +00:00
Johannes Schickel d7432e18ea Changed Screen::loadPalette to take a reference to a Palette object instead of an array. 
svn-id: r41745
 2009-06-22 02:37:41 +00:00
Johannes Schickel d2e5166dae Changed Screen::loadBitmap and Movie::open to take an optional Palette pointer instead of an optional array pointer. 
svn-id: r41744
 2009-06-22 02:37:20 +00:00
Johannes Schickel 73ea378dee - Changed the following Screen functions to take a reference to a Palette object: 
-> setScreenPalette
	-> fadePalette
	-> getFadeParams
	-> fadePalStep
- Fixed initialization of 256 color palettes

svn-id: r41743
 2009-06-22 02:36:54 +00:00
Johannes Schickel 4bb392b593 Add wrapper functionality for copying full palettes. 
svn-id: r41742
 2009-06-22 02:36:16 +00:00
Johannes Schickel 882662977f Changed Screen::getPalette to return a reference to a Palette object. 
svn-id: r41741
 2009-06-22 02:35:45 +00:00
Johannes Schickel 9da52cb282 Got rid of Screen::_currentPalette. 
svn-id: r41740
 2009-06-22 02:35:04 +00:00
Johannes Schickel ac46c98fb8 - Moved Screen_v2::copyWsaRect to Screen::copyWsaRect 
- Made WSAMovie_v1::displayFrame code match the original
- Changed WSAMovieAmiga::displayFrame to use Screen::copyWsaRect too
- Got rid of '...' parameter usage in all WSA player classes

svn-id: r41398
 2009-06-09 11:26:15 +00:00
Johannes Schickel 0f116f1c38 Cleanup. 
svn-id: r41381
 2009-06-08 18:30:28 +00:00
Johannes Schickel ede3dec88a Add support for the Lands of Lore scrolling credits. 
svn-id: r41081
 2009-05-31 19:31:04 +00:00
Johannes Schickel c7ee0a7ec8 More formatting. 
svn-id: r40994
 2009-05-29 13:09:26 +00:00
Johannes Schickel 783fb058b0 Formatting. 
svn-id: r40717
 2009-05-19 01:39:18 +00:00
Johannes Schickel 7561bd9dfb Remov lots of superfluous debug output. 
svn-id: r40715
 2009-05-19 01:13:29 +00:00
Florian Kagerer dd84aaf648 LOL: - added some spell casting (spark, heal, swarm) 
- fixed several bugs (not the one in the fighting system though)
- added several opcodes. there shouldn't be any real show stoppers in the draracle cave now.
- simplified wsa code (which required 4 lines of code for displaying a frame)
- added support for wsa animations that don't have a last frame (apparently kyra 2 and 3 don't have this type of wsa file)

svn-id: r40420
 2009-05-10 13:40:28 +00:00
Johannes Schickel bc39dc9d75 Fix valgrind warning about mismatched delete. 
svn-id: r38429
 2009-02-17 18:01:52 +00:00
Johannes Schickel d15022da78 Cleanup. 
svn-id: r35424
 2008-12-18 18:46:24 +00:00
Johannes Schickel 696ed52959 Switched kyra1 to use the same input functionality as kyra2 and kyra3. 
svn-id: r35393
 2008-12-16 17:40:34 +00:00
Max Horn 9b160804ab Renamed Engine::quit to Engine::shouldQuit (previously, it was easily confused with Engine::quitGame); also cleaned up engine.h a bit 
svn-id: r34700
 2008-09-30 12:27:38 +00:00
Christopher Page 7f480ac571 Quit and RTL code is more modular now. EVENT_RTL no longer sets _shouldQuit, shouldQuit is only set if there's an EVENT_QUIT. EVENT_RTL and EVENT_QUIT are completely separate from each other. Engine::quit() method now checks both _shouldQuit and _shouldRTL to determine if the engine should exit. There is no longer a need for resetQuit(), so it's removed 
svn-id: r33082
 2008-07-16 04:22:56 +00:00
Christopher Page d2e8d4831e Merged revisions 32744-32745,32747,32750-32759,32762-32764,32769,32777,32783,32785-32786,32789-32791,32798-32799,32801-32807,32809-32812,32816-32817,32819-32821,32823-32830,32832-32836,32838-32844,32846-32850,32852-32854,32858-32859,32865-32868,32873-32874,32879,32883,32895,32899,32902-32904,32910-32912,32923-32924,32930-32931,32938,32940,32948-32949,32951,32960-32964,32966-32970,32972-32974,32976,32978,32983,32986-32990,32992,32994,33002-33004,33006-33007,33009-33010,33014,33017,33021-33023,33030,33033 via svnmerge from 
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33051
 2008-07-14 00:10:09 +00:00
Christopher Page 30b1a62e81 Removed unnecessary #inlcudes 
svn-id: r32984
 2008-07-10 05:15:19 +00:00
Christopher Page b8fe71e7a1 Updated KYRA to work with the new GMM implementation 
svn-id: r32959
 2008-07-08 06:00:39 +00:00
Christopher Page b97f39019c KYRA works with the new GMM implementation 
svn-id: r32957
 2008-07-08 05:02:45 +00:00
Florian Kagerer d92085b507 minor fix for Towns/PC98 music 
svn-id: r32899
 2008-07-03 21:09:07 +00:00
Christopher Page 6e3474896c Kyra and Lure are now using the new _quit flag 
svn-id: r32772
 2008-06-25 00:55:18 +00:00
Johannes Schickel 289f96d37c More naming consistency fixes (fixes old TODO). 
svn-id: r32062
 2008-05-12 14:52:18 +00:00
Johannes Schickel 6e0c569966 Consisteny fixes: 
- Renamed classes *_v1 -> *_LoK
 - Renamed files *_v1.* -> *_lok.*
 - Renamed WSAMovieV1 -> WSAMovie_v1
 - Renamed WSAMovieV2 -> WSAMovie_v2

svn-id: r32042
 2008-05-11 22:32:37 +00:00