libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-18 23:57:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
64,648 Commits 5 Branches 5 Tags 1.8 GiB
e7818639af
Commit Graph

152 Commits

Author SHA1 Message Date
Johannes Schickel
07cdbd273d Add a "fill" method to Palette. 
svn-id: r41952
 2009-06-29 16:49:38 +00:00
Johannes Schickel
b12496d1dd Modified Palette::load*Palette definition. 
svn-id: r41941
 2009-06-29 16:05:50 +00:00
Johannes Schickel
7bbad2738a Store palettes in a Common::Array instead of a fixed size array. 
svn-id: r41891
 2009-06-25 23:04:21 +00:00
Johannes Schickel
7a7babad77 Add a const "getData" access method to Palette. 
svn-id: r41880
 2009-06-25 19:56:02 +00:00
Johannes Schickel
0ef8d1ffed Implement proper color index conversion for Lands of Lore PC98. (The intro and menu screen work fine now) 
svn-id: r41867
 2009-06-25 15:22:08 +00:00
Johannes Schickel
951e82a921 Readd PC98 palette loading for LoL 16 color. 
svn-id: r41850
 2009-06-25 02:38:19 +00:00
Johannes Schickel
0ec0b1d498 Implement palette fading for 16 color version of Kyrandia 1. 
svn-id: r41846
 2009-06-25 01:29:41 +00:00
Johannes Schickel
857ee03c7d Implement properly colored mouse cursors in 16 color version of Kyrandia 1. 
svn-id: r41845
 2009-06-25 01:29:27 +00:00
Johannes Schickel
004f6900b1 Initial support for Kyrandia 1 PC-9801 Japanese 16 color. 
svn-id: r41844
 2009-06-25 01:29:14 +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
b448d506b8 Start refactoring palette handling into new class "Palette". 
svn-id: r41739
 2009-06-22 02:34:35 +00:00
Johannes Schickel
89607d994b Fix drawing of sharp s. 
svn-id: r41719
 2009-06-21 01:15:09 +00:00
Johannes Schickel
d4248b10c8 Prevent font code to draw characters not included in the font. 
svn-id: r41718
 2009-06-21 01:14:57 +00:00
Florian Kagerer
583a89be62 LOL: - started on the ingame menu code (death menu, load menu and main menu) 
- fixed regression in kyra gui code (broken menu highlighting)
- fixed minor bug in animation code

svn-id: r41557
 2009-06-15 20:52:09 +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
897c0104c9 Remove unneeded functionality from Screen. 
svn-id: r41357
 2009-06-07 22:41:38 +00:00
Johannes Schickel
fd34892cd5 Cleanup and slight bugfix in drawShapeProcessLineScale* functions. 
svn-id: r40982
 2009-05-29 11:07:35 +00:00
Florian Kagerer
6e566a9b1e LOL: added some drawing code and fixed some bugs 
svn-id: r40167
 2009-04-27 19:38:28 +00:00
Florian Kagerer
ccb64ad81e LOL: - Started implementing the fighting system. The damage inflicted is wrong, however (at least the damage inflicted by the monsters). I'm sowewhat clueless about that bug atm. 
- added support for monsters with distance attacks (like those orcs in front of roland's house)
- lots of small bug fixes
- Some startup support for the pc-98 16 color version. The intro will run, but the font drawing/coloring is still wrong.

svn-id: r40144
 2009-04-25 13:15:05 +00:00
Max Horn
5749b363d5 KYRA: Replaced Rect class by Common::Rect; replaced dirty rect handling code by code similiar to the one used in SAGA and the frontend GUI code 
svn-id: r39929
 2009-04-11 09:57:57 +00:00
Florian Kagerer
0ce597db80 LOL: - added drawing code for certain gfx (blood and slime spots on the floor, teleporters, ice walls) 
svn-id: r39599
 2009-03-21 20:24:36 +00:00
Florian Kagerer
769184c483 LOL: added some new drawing code required for some shapes and fixed a minor text displaying bug 
svn-id: r39487
 2009-03-17 18:27:56 +00:00
Florian Kagerer
7ea5cefef4 LOL: implemented some monster related code (monsters now get placed in the maze, but they still don't do anything) 
svn-id: r39039
 2009-03-01 14:45:30 +00:00
Eugene Sandulenko
696897b058 Whoa! Removing trailing spaces. 
svn-id: r35648
 2009-01-01 15:06:43 +00:00
Johannes Schickel
eddae0e105 Fixed thumbnail creation / loading in kyra. 
svn-id: r34527
 2008-09-14 16:29:14 +00:00
Johannes Schickel
08b4cf127b Cleanup. 
svn-id: r33948
 2008-08-16 21:51:56 +00:00
Johannes Schickel
7e7468b322 - Fixed fadePalette for HoF and Kyra3 
- Fixed bug in wsaFrameAnimationStep

svn-id: r33334
 2008-07-27 12:12:40 +00:00
Johannes Schickel
bb03596744 - Renamed KyraEngine to KyraEngine_v1 
- kyra.* -> kyra_v1.*
- scene.cpp -> scene_v1.cpp

svn-id: r32044
 2008-05-11 23:16:50 +00:00
Johannes Schickel
4b5f3266cf Started to refactor kyra2/kyra3 code to a common base. (regressions possible, compiling currently broken) 
svn-id: r31817
 2008-05-02 14:46:30 +00:00
Johannes Schickel
ca7f7e2a3b Various cleanup. 
svn-id: r31772
 2008-04-29 14:33:29 +00:00
Johannes Schickel
61101b6dce Fixed kyra screen initialization. 
svn-id: r31730
 2008-04-26 10:15:54 +00:00
Johannes Schickel
6562a7cd8a Implemented parts of item drop down code for Kyra3. 
svn-id: r31681
 2008-04-23 22:53:19 +00:00
Johannes Schickel
f173041811 - moved kyra functor code to common/func.h 
- adapted debugger code to use functor code from common/func.h
- adapted kyra engine to use functor code from common/func.h

svn-id: r31614
 2008-04-20 15:47:11 +00:00
Johannes Schickel
7666531dac Fixed setShapePages maxY default value. 
svn-id: r31554
 2008-04-17 22:07:17 +00:00
Florian Kagerer
607039db01 some more drawShape plot functions now (after Lord Hoto's additions) required for Kyra 1 
svn-id: r31528
 2008-04-17 06:33:48 +00:00
Johannes Schickel
b2a586acb2 Fixed shape drawing in HoF (regression) and Kyra3. 
svn-id: r31521
 2008-04-16 22:23:09 +00:00
Johannes Schickel
d3fe051274 Some more kyra3 code. This should show the first scene for a brief second. (and it initializes a bit more internal stuff) 
svn-id: r31518
 2008-04-16 20:28:27 +00:00
Florian Kagerer
00dde660e3 fix sjis text color (ship scene) 
svn-id: r31517
 2008-04-16 19:43:56 +00:00
Johannes Schickel
1f91dc0384 - some refactoring for Kyra3 
- removed unneeded map code in KyraEngine_v3

svn-id: r31488
 2008-04-12 23:17:21 +00:00
Florian Kagerer
831ab12268 implement missing Screen::drawShapePlotType11_15() 
svn-id: r31441
 2008-04-06 22:17:02 +00:00
Johannes Schickel
b7a3dfd9df Always clip rect to copy in Screen::copyRegion now, like the original does. 
This fixes bug #1537373 "KYRA1: Crash when meeting Zanthia".

svn-id: r31318
 2008-03-30 03:18:16 +00:00
Florian Kagerer
91e30d8e50 - get rid of const_cast 
svn-id: r31317
 2008-03-30 02:43:22 +00:00
Johannes Schickel
b3f858af2b Renamed some functions according to our coding guidelines. 
svn-id: r31310
 2008-03-30 01:01:12 +00:00
Johannes Schickel
30c513eb2d - fixed formatting 
- fixed const correctness (needed a const_cast though :-/)

svn-id: r31309
 2008-03-30 00:55:16 +00:00
Florian Kagerer
25b9a8a1cb New drawShape code for Kyra 1 and 2. Scaled sprites no longer appear mutilated. This also fixes bug #1582675 (KYRA1: Brandon standing IN the floor). 
This still needs some testing (for both Kyra 1 and Kyra 2).

svn-id: r31306
 2008-03-29 23:16:44 +00:00
Johannes Schickel
3e98286af9 Fixed palette loading debug command for amiga version. 
svn-id: r31266
 2008-03-27 15:32:20 +00:00
Johannes Schickel
4d4fbc9e97 Added debugger command to set screen palette. 
svn-id: r31265
 2008-03-27 15:27:31 +00:00
Johannes Schickel
9b6be10181 Implemented spellbook in HoF. 
svn-id: r31084
 2008-03-09 11:28:51 +00:00
Johannes Schickel
3a83cf654e Fixed access of inventory in HoF while cursor is not visible. 
svn-id: r31081
 2008-03-09 09:58:05 +00:00
Travis Howell
61390db7f0 Fix compile. 
svn-id: r31040
 2008-03-03 23:01:59 +00:00
Johannes Schickel
b651a74b45 Started to implement GUI code for HoF. 
Currently working:
 - _basic_ inventory, this doesn't include scrolling through the inventory

svn-id: r31038
 2008-03-03 22:38:31 +00:00
Jordi Vilalta Prat
66e9d4f5e8 Removed trailing spaces. 
svn-id: r30664
 2008-01-27 19:47:41 +00:00
Johannes Schickel
afd8743465 Commit patch #1869747 "KYRA: HoF sjis patch". 
svn-id: r30437
 2008-01-12 07:59:39 +00:00
Paul Gilbert
6eb64102a4 Fix to remove a tab character from the GPL header 
svn-id: r30238
 2008-01-05 12:45:14 +00:00
Johannes Schickel
d1a3af446a HoF: 
- added some _skipFlag and _quitFlag handling
- extended Screen::fadePal to take an functor for update purposes
- changed KyraEngine_v2::fadeScenePal to use Screen::fadePal with a functor

svn-id: r29188
 2007-10-12 01:26:27 +00:00
Johannes Schickel
41e4a7b156 Added command to enable screen debug functionallity. (instead of the old compile time enabling) 
svn-id: r29078
 2007-09-23 23:37:01 +00:00
Johannes Schickel
1140fca82e - Kyrandia 1 works again 
- Added timer class for timer handling
- Little bit more resturcturing
- A little bit (almost nothing but a start!) Kyrandia 2 support

svn-id: r28297
 2007-07-29 16:33:11 +00:00
Johannes Schickel
076d6b1bc1 Restructure Kyrandia sourcecode (part 2, compiling works again) 
svn-id: r28296
 2007-07-29 16:31:29 +00:00
Oystein Eftevaag
62a28d0864 Applying patch 1669536: Kyra2: Intro fixes 
svn-id: r27650
 2007-06-23 08:42:30 +00:00
Max Horn
218e132e37 Updated legal headers in source files, based on what Pidgin (the IM client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots 
svn-id: r27024
 2007-05-30 21:56:52 +00:00
Johannes Schickel
91402fda9b Some graphic fixes for FM-Towns version. (Thanks to Florian Kagerer for this). 
svn-id: r26915
 2007-05-22 13:44:41 +00:00
Johannes Schickel
edd9b31a48 Cleanup. 
svn-id: r26604
 2007-04-27 12:15:47 +00:00
Johannes Schickel
21b2c7bceb Formatting/Cleanup. 
svn-id: r26511
 2007-04-15 16:41:20 +00:00
Johannes Schickel
661944a0f9 Implemented some palette code differences for Amiga version. 
svn-id: r26281
 2007-03-23 16:24:28 +00:00
Johannes Schickel
d611e81672 - little 'cleanup' 
- finished MSC file support for Amiga version

svn-id: r26204
 2007-03-18 12:08:13 +00:00
Johannes Schickel
4951f82c65 Basic support for Amiga MSC files. 
svn-id: r26153
 2007-03-16 23:08:59 +00:00
Johannes Schickel
689ea77c0d WIP code for Amiga version: 
- Font displaying is not yet supported.
- Intro should be glitch free
- all other things are *untested*

svn-id: r26113
 2007-03-12 20:43:56 +00:00
Johannes Schickel
305a1525ed - cleanup 
- some diffs for Amiga version

svn-id: r26010
 2007-03-07 20:31:19 +00:00
Torbjörn Andersson
1987813f53 Another batch of header consistency changes. 
svn-id: r25746
 2007-02-20 17:33:54 +00:00
Torbjörn Andersson
809a3bc293 Applied cyx's patch #1659302 ("KYRA: VQA player code cleanup/reduce") with the 
minimal change suggested in the tracker.

svn-id: r25649
 2007-02-17 07:49:12 +00:00
Johannes Schickel
7af17382b5 Support for Japanese FM-Towns version. (code contributed by Florian Kagerer, modified a bit) 
svn-id: r25530
 2007-02-12 18:01:51 +00:00
Johannes Schickel
841fd4f94f cleanup 
svn-id: r25479
 2007-02-11 01:38:15 +00:00
Johannes Schickel
b138b5cce1 Fix for missing Brandon in Zanthia's home (see bug #1498221 "KYRA1: Subtitles missing when meeting Zanthia 
").

svn-id: r25320
 2007-02-01 13:10:49 +00:00
Oystein Eftevaag
ee221cc5df Merging decodeFrameDeltaPage() again and using Fingolfin's template trickery instead 
svn-id: r25039
 2007-01-06 18:52:30 +00:00
Oystein Eftevaag
8fbf9a1e23 A few minor fixes and optimizations (biggest one is splitting decodeFrameDeltaPage() into two functions to avoid a high amount of conditional jumps per decided animation frame 
svn-id: r25034
 2007-01-06 17:11:08 +00:00
Johannes Schickel
75fd84e85a - adds dirty rect handling to the kyra engine (needs some more tests before I commit it to branch though) 
- initializes an uninitiliazied variable which caused crashes from time to time

svn-id: r23878
 2006-09-15 16:04:32 +00:00
Johannes Schickel
65c0bdcaa0 - Some little checks for shape usage. 
- Less redrawing while loading a savegame.

svn-id: r23864
 2006-09-10 13:52:17 +00:00
Johannes Schickel
09f7e35196 Little bit cleanup. 
svn-id: r23863
 2006-09-10 13:26:00 +00:00
Oystein Eftevaag
d11e72a168 Adds voice/chats to the intro, and adds debug strings to the function calls. 
svn-id: r23789
 2006-08-27 12:30:38 +00:00
Oystein Eftevaag
c47a957fb3 Adds some framework for the Kyra2 intro, expands it a little bit and adds some static resources (strings, etc). Also 
adding a modified version of eriktorbjorn's '[1531929] KYRA: Kyra 2 & 3 main menu unification', with added mouse pointer and sundry.

svn-id: r23766
 2006-08-26 22:17:30 +00:00
Johannes Schickel
3846565058 Implements item shape loading for kyra3. 
svn-id: r23637
 2006-07-30 14:53:28 +00:00
Johannes Schickel
92649de672 - fixes copyright of kyra3.h 
- implements a bit more init functions for kyra3
- removes hacked mouse cursor
- changes Resource::fileData to accept a null pointer for size

svn-id: r23622
 2006-07-30 07:51:11 +00:00
Johannes Schickel
73869dca9f - don't error on CHAPTER1.VRM miss anymore 
- nicer error messages when no font files are found
- implements nicer way to load fonts

svn-id: r23531
 2006-07-16 19:44:39 +00:00
Johannes Schickel
d28d6fe4fb cleanup 
svn-id: r22717
 2006-05-28 12:23:49 +00:00
Johannes Schickel
1750be5b5a - makes Screen::getPagePtr private 
- introduces Screen::getCPagePtr and Screen::getPageRect (which should ease the introduction of dirty rect handling)
- moves KyraEngine::loadBitmap to Screen

svn-id: r22716
 2006-05-28 12:19:45 +00:00
Johannes Schickel
259e06a69b - Adds some _quitFlag checks 
- deletes Screen::drawPixel

svn-id: r22622
 2006-05-25 08:02:17 +00:00
Johannes Schickel
3af8e4ea4a Implements kyra3 main menu drawing. 
svn-id: r22556
 2006-05-21 15:02:12 +00:00
Johannes Schickel
570b9e2c9d - load fonts for kyra3 
- adds screen dim tables for kyra3
- adds palette / screen backup for the vqa player
- small changes in the vqa player to use the Kyra::Screen functions
- adds (partially implemented/unimplemented) main menu drawing/handling functions (nothing to see yet)

svn-id: r22528
 2006-05-18 22:46:34 +00:00
Johannes Schickel
96fd5e1fbc - modifies loadBitmap not to crash if a image isn't found 
- starts to clean up the engine initalisation code

svn-id: r22308
 2006-05-03 13:40:21 +00:00
Johannes Schickel
0eee3fe591 - Implements copyRegion without transparency checking 
- Uses copyRegion without transparency checking to fix credits drawing bugs

svn-id: r21989
 2006-04-17 19:52:31 +00:00
Oystein Eftevaag
bdd5a25c16 Implements the end credits, and disables fast forwarding in the intro. 
svn-id: r21980
 2006-04-17 17:39:08 +00:00
Johannes Schickel
9031b27349 Implements cmd_shakeScreen. 
svn-id: r21394
 2006-03-20 19:01:39 +00:00
Oystein Eftevaag
05ee5cf2bd Extends seq_drinkPotionAnim() so that the color of the flask Brandon 
drinks will be correct. Also fixes a bug where an animation
(Brandon ringing the bells) would play too quickly.

svn-id: r21354
 2006-03-18 04:41:34 +00:00