libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-06 09:48:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
45,425 Commits 5 Branches 5 Tags 1.8 GiB
845db59e08
Commit Graph

250 Commits

Author SHA1 Message Date
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
3d407b81f8 fix drawShape glitch (Brandon's feet got mutilated and one vertical line was not drawn when leaving the screen to the left or to the right ) 
svn-id: r31461
 2008-04-09 23:38:11 +00:00
Florian Kagerer
831ab12268 implement missing Screen::drawShapePlotType11_15() 
svn-id: r31441
 2008-04-06 22:17:02 +00:00
Johannes Schickel
3dc6f9000d Added partial support for main menu. Only load, save and resume buttons are working currently 
svn-id: r31375
 2008-04-04 06:24:49 +00:00
Johannes Schickel
dc813c1c20 Cleanup. 
svn-id: r31319
 2008-03-30 03:21:01 +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
a957b45d5c Cleanup. 
svn-id: r31313
 2008-03-30 01:35:12 +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
Florian Kagerer
bbecd439c1 - fix mouse cursor hotspot for sjis mode 
svn-id: r31138
 2008-03-16 12:51:59 +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
Johannes Schickel
b407420ebb Committed patch #1885629 "KYRA: HoF missing talkie credits and demo support". 
svn-id: r30845
 2008-02-10 18:34:48 +00:00
Jordi Vilalta Prat
d6c34bdc4b Fixed the spaces before tabs. 
svn-id: r30667
 2008-01-28 00:14:17 +00:00
Jordi Vilalta Prat
66e9d4f5e8 Removed trailing spaces. 
svn-id: r30664
 2008-01-27 19:47:41 +00:00
Johannes Schickel
48bd0ca6b6 Removed warning in Screen::getOverlayPtr for now. 
svn-id: r30440
 2008-01-12 08:31:36 +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
244987b718 Fixes compiling on msvc7.1, it seems like it has problems to decide when to use operator bool. 
svn-id: r30024
 2007-12-28 00:20:56 +00:00
Johannes Schickel
28a57c434a Cleanup(/formatting). 
svn-id: r29983
 2007-12-24 22:27:30 +00:00
Johannes Schickel
6dcbc00b23 debug(C) parameter type fixes. 
svn-id: r29864
 2007-12-15 21:20:56 +00:00
Max Horn
ee43757e86 Fix warning 
svn-id: r29243
 2007-10-21 19:49:01 +00:00
Oystein Eftevaag
41d67964b1 Committing [ 1816080 ] KYRA: Intro Patch for HoF, from Florian, with some cleanup and a minor fix 
svn-id: r29233
 2007-10-19 22:16:00 +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
cf3fd283bb HoF: 
- added support for dropping items into scenes
- added const to some static data
- implemented opcode 0x55 o2_setLayerFlag
- fixed a bug in Screen_v2::drawShape

svn-id: r29175
 2007-10-09 04:47:41 +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
Nicola Mettifogo
258901bab9 Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated. 
svn-id: r28966
 2007-09-19 08:40:12 +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
Johannes Schickel
41989652df Fix for disappearing text in FM-Towns end sequence. 
svn-id: r27964
 2007-07-08 12:59:00 +00:00
Oystein Eftevaag
d4aeb680cf Minor formatting fix 
svn-id: r27651
 2007-06-23 08:58:36 +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
8998e0d40d Little graphics fix for FM-Towns version. (Thanks to Florian Kagerer) 
svn-id: r26930
 2007-05-23 12:10:44 +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
8b7d458668 Oops. 
svn-id: r26596
 2007-04-26 13:00:52 +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
Max Horn
783a6d7d59 Fixed const issue (casting const to non-const) 
svn-id: r26027
 2007-03-08 20:44:43 +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
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
80bc94304c little fix for fm-towns version 
svn-id: r25531
 2007-02-12 19:08:34 +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
e9074ea021 oops. 
svn-id: r25321
 2007-02-01 13:12:45 +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
Johannes Schickel
69788f3d70 Some changes to be closer to the original with palette handling. 
svn-id: r25316
 2007-01-31 23:48:12 +00:00
Max Horn
30d517613a Fix typos in some warnings 
svn-id: r25171
 2007-01-25 00:36:48 +00:00
Johannes Schickel
d61a84e0ab Fix for bug #1631352 ("KYRA1: Graphics heavily broken and ScummVM crash"), I tried memmove here, but it also crashed on Win32 with memmove, so I reverted it back to how it was. 
svn-id: r25059
 2007-01-09 11:50:22 +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
8fb07286cc Fix for bug #1582726 ("KYRA1: Crash when entering Castle screen"). 
svn-id: r24475
 2006-10-23 23:12:12 +00:00
Johannes Schickel
b6a8e38726 - removes the kyra specific language flag system, and uses the language enum defined in Common for that now 
- also reworks the game flag system in general

svn-id: r23920
 2006-09-17 20:21:40 +00:00
Max Horn
4503581340 Const correctness 
svn-id: r23916
 2006-09-17 13:06:40 +00:00
Johannes Schickel
84c2a93db5 Replaces all malloc/realloc usages with new. 
svn-id: r23886
 2006-09-16 13:40:28 +00:00
Johannes Schickel
e139d26be1 Replaces malloc with new in most cases. 
svn-id: r23881
 2006-09-16 12:12:02 +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
2db1dc882b Ignore mouselock count when switching the cursor graphics, fixing a bug salty-horse reported on irc. 
svn-id: r23849
 2006-09-09 16:10:11 +00:00
Torbjörn Andersson
18325259b8 Fixed bug #1554904 ("KYRA1: No mouse cursor in latest SVN build"). GI_KYRA1 is 
not a bit flag...

svn-id: r23834
 2006-09-09 02:02:45 +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
6cc1a57d3b - fixes bug in fileData (introduced with last commit) 
- show mouse cursor in Screen::setMouseCursor if it's allready shown
- a little bit more kyra3 init stuff

svn-id: r23623
 2006-07-30 08:22:39 +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
4a6b2a3276 Fixes visible mouse cursor in the intro with classic theme. 
svn-id: r22903
 2006-06-03 18:34:57 +00:00
Johannes Schickel
369e79bfba Implements cmd_fadeEntirePalette, should fix some missing palette fades. 
svn-id: r22888
 2006-06-03 15:13:18 +00:00
Johannes Schickel
28114e3007 Sets a blank palette at startup. 
svn-id: r22719
 2006-05-28 12:33:41 +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
Torbjörn Andersson
5bbdde5479 Removed hack to flush mouse events. No longer needed, apparently. 
svn-id: r22662
 2006-05-26 15:44:46 +00:00
Torbjörn Andersson
8062eb6ec3 Set and show/hide mouse cursors through a "cursor manager" (analogous to the 
recently added (cursor) palette manager) so that the cursor can be properly
restored after returning from the GUI.

If there's any C++ magic that can keep the backend functions from being called
by anything else than these managing classes, that would probably be a good
idea. Also, since the cursor manager keeps a copy of the cursor image, perhaps
there are at least some backends that will no longer need to?

svn-id: r22639
 2006-05-25 22:51:42 +00:00
Johannes Schickel
197b1f4e88 Some more _quitFlag checks, makes quitting while end sequence faster. 
svn-id: r22623
 2006-05-25 08:07:20 +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
f2641ce081 Removes debug printf. 
svn-id: r22610
 2006-05-24 14:18:45 +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
e6350f8afa Enables OSystem::kFeatureAutoComputeDirtyRects until proper dirty rect managment is implemented. 
svn-id: r22402
 2006-05-10 20:28:27 +00:00
Torbjörn Andersson
8179d3e80b Missed a couple of switch cleanups. 
svn-id: r22385
 2006-05-08 10:29:20 +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
1d6a1bf157 Fix for bug # 1480744 ("KYRA1: mouse cursor vanishes"). 
svn-id: r22307
 2006-05-03 13:19: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
Max Horn
8cdee5a931 Do not #include endian.h in scummsys.h (cuts down deps on endian.h from ~400 to ~250). Many greetings to eriktorbjorn, and have fun recompiling. 
svn-id: r21500
 2006-03-29 15:59:37 +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
Johannes Schickel
b46236ed71 - removes a wrong space in debugC calls in screen.cpp 
- implements cmd_brandonToStoneSequence and cmd_pauseMusicSeconds

svn-id: r21320
 2006-03-15 21:59:07 +00:00
Torbjörn Andersson
dc2143e6cf This is a bit of a hack: Before showing the mouse cursor, take care of any 
pending events so that the it won't have to do a little dance, catching up,
every time you enter a room.

svn-id: r21316
 2006-03-15 15:37:42 +00:00
Max Horn
d9a9fac937 Fixed tons of format string warnings for debug/error calls (including several errors where the format string didn't match the number of arguments to the call) 
svn-id: r21141
 2006-03-08 11:37:25 +00:00
Johannes Schickel
0bea9cf47b Made the kyra debug extensions more generic, i.e. scumm engine could replace 
their debugC calls now with the new introduced debugC calls.
(A mail how to use it will follow shortly on -devel)
Also now these special engine debug flags can be specified from the commandline.
Also made the -c & --config parameter check more secure.

svn-id: r20695
 2006-02-14 23:31:25 +00:00
Johannes Schickel
93e9639989 Reworked kyra debug output system. Now he have special kyra intern debug levels + the global debug levels, for now I enable all kyra debug levels if the global debug level is not -1. see 'toggle_debug' in the kyra debugger and kyra.h for the different levels. (This is just the beginning of it anyway, for example the sound debug level isn't used for now) 
svn-id: r20678
 2006-02-14 01:19:30 +00:00
Max Horn
26ee630756 Moved engines to the new engines/ directory 
svn-id: r20582
 2006-02-11 22:45:04 +00:00