Commit Graph

779 Commits

Author SHA1 Message Date
Johannes Schickel
c98b51e40c - cleanup.
- kyra.dat shouldn't be load by default.

svn-id: r30831
2008-02-08 18:45:25 +00:00
Johannes Schickel
02522a3a14 Should fix regression which prevented kyra.dat to be detected corretly when in game path.
svn-id: r30830
2008-02-08 18:43:13 +00:00
Johannes Schickel
b7717705ae Should make load message appear in CD version while loading talk files.
svn-id: r30829
2008-02-08 11:09:49 +00:00
Jordi Vilalta Prat
c103290e2b Initial support for plugin types
svn-id: r30825
2008-02-08 00:02:23 +00:00
Johannes Schickel
49d0b1f91e Fixed memory leak.
svn-id: r30824
2008-02-07 23:38:17 +00:00
Johannes Schickel
8f0712a439 Fixed kyra3 related regression (should show the menu now again).
svn-id: r30823
2008-02-07 23:31:13 +00:00
Johannes Schickel
31938bc071 Fixed kyra3 code.
svn-id: r30822
2008-02-07 23:27:08 +00:00
Johannes Schickel
9b5839082d Fixed regression introduced while reworking resource loading code.
svn-id: r30821
2008-02-07 23:14:53 +00:00
Johannes Schickel
ae0b605ad4 Reworked Kyrandia resource loading code.
svn-id: r30820
2008-02-07 23:13:13 +00:00
Max Horn
8a73356a2d Revised Engine plugin API to only provide a single func which returns a MetaEngine instance. Used this to simplify the rest of the plugin system
svn-id: r30780
2008-02-03 18:56:47 +00:00
Torbjörn Andersson
e51bf80218 Changed "COMPATIBLITY" to "COMPATIBILITY".
svn-id: r30754
2008-02-03 10:15:36 +00:00
Max Horn
34b35348be Moved AdvancedMetaEngine to namespace Common
svn-id: r30736
2008-02-02 11:52:04 +00:00
Jordi Vilalta Prat
5165ff448d Converted the remaining engines to use MetaEngine
svn-id: r30728
2008-02-02 02:35:13 +00:00
Johannes Schickel
c4ad0a1c0d Commit slightly modified patch #1880670 "KYRA: Hof: Zanthia chat fix for towns and floppy versions".
svn-id: r30694
2008-01-28 22:21:47 +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
bcdfb48172 Cleanup.
svn-id: r30657
2008-01-27 15:56:56 +00:00
Johannes Schickel
dd3a8672be Fix for some problems introduced (like wrong text display) with last commit.
svn-id: r30654
2008-01-27 15:53:09 +00:00
Johannes Schickel
fec6e22cc9 - slightly refactored user settings handling
- added user some settings handling for HoF

svn-id: r30653
2008-01-27 15:30:53 +00:00
Johannes Schickel
33a90c1e00 Commit patch #1869752 "KYRA: HoF startup patch for towns and floppy". (Slightly modified)
svn-id: r30645
2008-01-27 02:05:37 +00:00
Oystein Eftevaag
2ef04f972c Fixed some warnings
svn-id: r30523
2008-01-16 22:41:48 +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
3629d64413 Use getMousePos in checkInput.
svn-id: r30439
2008-01-12 08:18:37 +00:00
Johannes Schickel
4f8cf19292 Commit patch #1869749 "KYRA: HoF Towns Audio fix".
svn-id: r30438
2008-01-12 08:04:00 +00:00
Johannes Schickel
afd8743465 Commit patch #1869747 "KYRA: HoF sjis patch".
svn-id: r30437
2008-01-12 07:59:39 +00:00
Johannes Schickel
2a28b40512 Added some paranoia checks.
svn-id: r30398
2008-01-11 00:35:39 +00:00
Johannes Schickel
f510fb6b14 Fix regression introduced with last commit. (Caused crash in Amiga version)
svn-id: r30397
2008-01-11 00:33:45 +00:00
Johannes Schickel
2dd6db4ca5 Commit slighty modified patch #1865509 "KYRA: kyradat support for hof".
svn-id: r30394
2008-01-10 23:25:19 +00:00
Johannes Schickel
e462bf55b3 Committed patch #1864214 "KYRA2: correct platform and talkie flags for sequence player".
svn-id: r30290
2008-01-06 11:01:56 +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
Filippos Karapetis
1411c9f3f1 Fix compilation
svn-id: r30204
2008-01-03 21:57:54 +00:00
Johannes Schickel
9b4fc2f70b Resolve portabillity issues introduced with last commit.
svn-id: r30201
2008-01-03 15:20:33 +00:00
Johannes Schickel
fbcba1a573 - got rid of hardcoding "KYRA.DAT" in all places, where it's used
- now using "kyra.dat" rather than "KYRA.DAT"

svn-id: r30200
2008-01-03 14:53:18 +00:00
Johannes Schickel
58f0d4e632 Committed slightly modified patch #1862758 "KYRA: audio data assignment patch".
svn-id: r30198
2008-01-03 14:42:49 +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
956b69b655 Update comment.
svn-id: r29998
2007-12-26 01:17:58 +00:00
Johannes Schickel
35e72866ec Simplification of GM vs MT-32 detection.
svn-id: r29997
2007-12-26 01:09:46 +00:00
Johannes Schickel
28a57c434a Cleanup(/formatting).
svn-id: r29983
2007-12-24 22:27:30 +00:00
Johannes Schickel
def62fef5e MenuItem member renaming.
svn-id: r29969
2007-12-24 02:42:58 +00:00
Max Horn
275c91be33 Fix the FIXME ;-)
svn-id: r29955
2007-12-23 00:34:48 +00:00
Johannes Schickel
c9891423e3 Added FIXME comment.
svn-id: r29954
2007-12-22 23:41:14 +00:00
Johannes Schickel
0cbff0fc42 Logic fix for MixedSoundDriver::init.
svn-id: r29953
2007-12-22 23:29:15 +00:00
Johannes Schickel
1ecbde083f Reverted too complicated (and unneeded) volume settings code for towns driver.
svn-id: r29939
2007-12-21 09:28:27 +00:00
Johannes Schickel
72e899d164 Naming consistency fixes.
svn-id: r29938
2007-12-21 09:20:31 +00:00
Johannes Schickel
4a3dedfe7e Commit of patch #1848147 "KYRA: SoundTowns Update" with some changes. Thanks to Florian for the patch.
svn-id: r29881
2007-12-16 18:48:43 +00:00
Johannes Schickel
6dcbc00b23 debug(C) parameter type fixes.
svn-id: r29864
2007-12-15 21:20:56 +00:00
Johannes Schickel
e946eff205 Added a hack to allow adjustment of Adlib volume. (see bug #1497961 "KYRA1: music/sfx volume settings not working")
svn-id: r29808
2007-12-09 23:55:57 +00:00
Johannes Schickel
be01daccdb - implemented opcodes:
-> o2_setHiddenItemsEntry 147
  -> o2_getHiddenItemsEntry 148
  -> o2t_fadeScenePal 3
- added o2t_playSoundEffect to the temporary opcode list

svn-id: r29494
2007-11-13 15:49:21 +00:00
Johannes Schickel
c908a8a73f Implemented all timer handlers. (Cauldron animations work now)
svn-id: r29487
2007-11-12 20:04:44 +00:00
Johannes Schickel
2e46b741a3 - Implemented opcodes:
-> o2_removeHandItem 43
  -> o2_makeBookOrCauldronAppear 42
- Implemented inventory WSA functionality

svn-id: r29485
2007-11-12 17:56:49 +00:00
Johannes Schickel
65c57841bd Fixes regression introduced with r29218.
svn-id: r29484
2007-11-12 16:35:46 +00:00
Johannes Schickel
83eec141c8 - added some code to runLoop (currently commented out)
- little fix in handleInputUnkSub

svn-id: r29466
2007-11-10 14:51:18 +00:00
Johannes Schickel
b29486e3de Implemented idle script handling.
svn-id: r29460
2007-11-09 16:52:39 +00:00
Filippos Karapetis
ea7429018e Fix warning
svn-id: r29418
2007-11-05 16:33:40 +00:00
Oystein Eftevaag
eb42e8271e Committing '[ 1824376 ] KYRA: more sequence player code' from Florian, with a couple of warnings fixed
svn-id: r29417
2007-11-05 08:23:57 +00:00
Johannes Schickel
287e79d477 Documenting the sound code a bit.
svn-id: r29392
2007-11-03 23:32:15 +00:00
Johannes Schickel
2e6b14539a Cleanup.
svn-id: r29389
2007-11-03 21:25:37 +00:00
Eugene Sandulenko
c640d1c604 Patch #1825276: "DETECTION: advanced detector engine simplification"
svn-id: r29386
2007-11-03 21:06:58 +00:00
Johannes Schickel
380e8fe99b Fixed SFX in intro of FM-Towns/PC98 versions of Kyrandia 1 (Thanks to Florian Kagerer for the patch).
svn-id: r29248
2007-10-22 20:53:10 +00:00
Johannes Schickel
80045e9661 Fixes timers in Kyra1. (Initialized them twice oops...)
svn-id: r29245
2007-10-21 21:38:23 +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
Oystein Eftevaag
0e693cbbfb Fixed a struct size issue
svn-id: r29219
2007-10-14 18:44:50 +00:00
Oystein Eftevaag
979121ae12 A change got lost while resolving a conflict
svn-id: r29218
2007-10-14 17:00:44 +00:00
Oystein Eftevaag
af3b84c297 TIM file loading/unloading for HoF
svn-id: r29217
2007-10-14 16:58:11 +00:00
Johannes Schickel
706888358d HoF:
- implemented opcodes
  -> o2_checkForItem 32
  -> o2_countItemInInventory 37
  -> o2_setMousePos 47
  -> o2_countItemInstances 136

svn-id: r29211
2007-10-13 19:17:58 +00:00
Johannes Schickel
8d678b8705 HoF:
- implemented opcode
  -> o2_setCharacterPos 1

svn-id: r29210
2007-10-13 18:53:49 +00:00
Oystein Eftevaag
7f7b08b42e Forgot to rename a variable
svn-id: r29209
2007-10-13 18:53:02 +00:00
Oystein Eftevaag
4f93e96d5f Implemented the o2_setCharacterAnimFrame opcode and made sure o2_delay does game updates during the delay
svn-id: r29208
2007-10-13 18:47:52 +00:00
Johannes Schickel
3f7b4e62cc Cleanup.
svn-id: r29207
2007-10-13 18:36:19 +00:00
Johannes Schickel
1e65cdd896 Cleanup.
svn-id: r29206
2007-10-13 18:15:03 +00:00
Johannes Schickel
da9479dfb8 - moved some voice functionallity from KyraEngine_v1 to KyraEngine
HoF:
- added voice support
- implemented opcodes
  -> o2_setVocHigh 167
  -> o2_getVocHigh 168
  -> o2_isVoiceEnabled 170
  -> o2_isVoicePlaying 171
  -> o2_stopVoicePlaying 172
  -> o2_getGameLanguage 173

svn-id: r29201
2007-10-13 06:57:47 +00:00
Filippos Karapetis
9c528b6cb9 Fix typo
svn-id: r29195
2007-10-12 19:57:43 +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
1764f165a7 HoF:
- Subclassed TextDisplayer for use with Kyra2
- Implemented opcodes:
  -> o2_zanthiaChat 169
  -> o2_customChat 152
  -> o2_customChatFinish 153

svn-id: r29187
2007-10-12 00:58:59 +00:00
Johannes Schickel
d896894631 - Made some sound functions a bit more generic for use with Kyra1 and Kyra2
HoF:
- Added sound support (sfx sound wrong currently though)
- Implemented opcodes:
  -> o2_loadMusicTrack
  -> o2_playWanderScoreViaMap
  -> o2_playSoundEffect
  -> o2t_playSoundEffect

svn-id: r29183
2007-10-10 09:06:15 +00:00
Johannes Schickel
598e35bab8 Fixed bug in o2_addSpecialExit.
svn-id: r29182
2007-10-10 05:22:29 +00:00
Johannes Schickel
004dab11c5 Oops forgot to add o2_delay to the opcode list.
svn-id: r29181
2007-10-09 09:17:07 +00:00
Johannes Schickel
ca0161b76a HoF
- Implemented opcodes
  -> o2_switchScene 0x51
  -> o2_getShapeFlag1 0x52

svn-id: r29180
2007-10-09 09:15:12 +00:00
Johannes Schickel
99efa084fe HoF
- fixed o2_runTemporaryScript
- fixed trySceneChange, now stopping movement should work correctly

svn-id: r29179
2007-10-09 09:03:57 +00:00
Johannes Schickel
dd1b43a5a9 HoF:
- More input handling (should be rather complete now, not finished but nearlly)
- Implemented the following opcodes:
  -> o2_trySceneChange 0x0d
  -> o2_setHandItem 0x2a
  -> o2_handItemSet 0x2c
  -> o2_setCharPalEntry 0x3c
  -> o2_drawSceneShape 0x3e
  -> o2_update 0x4b
  -> o2_fadeScenePal 0x4d
  -> o2_enterNewSceneEx 0x50
  -> o2_setZanthiaPos 0x56
  -> o2_runTemporaryScript 0x6e
  -> o2t_defineNewShape 0x00
  -> o2t_setCurrentFrame 0x01
  -> o2t_setShapeFlag 0x04

svn-id: r29178
2007-10-09 08:44:45 +00:00
Johannes Schickel
d73ffa3b03 HoF:
- make sure we really got uppercase filenames in FILEDATA.FDT
- (and silently removed a leftover debug oops)

svn-id: r29177
2007-10-09 05:42:52 +00:00
Johannes Schickel
3ecc0bfda7 HoF:
- now uses "FILEDATA.FDT" to detect what PAK files have to be loaded for ingame use

svn-id: r29176
2007-10-09 05:40:20 +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
5ad7870775 - little bit more input handling
- implemented item pickup

svn-id: r29160
2007-10-07 00:35:22 +00:00
Johannes Schickel
a03c829ace - added a new generic debugger command 'facings'
- added a few new kyra2 specific debugger commands

svn-id: r29094
2007-09-24 21:58:11 +00:00
Johannes Schickel
d65140d6b5 - reworked input handling
- implement changing movement destination while moving

svn-id: r29093
2007-09-24 20:26:27 +00:00
Johannes Schickel
287bf608d4 Added debugger support for kyra2.
svn-id: r29092
2007-09-24 20:02:08 +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
3c5d8c4031 Added debugger command to list the birthstone gems.
svn-id: r29077
2007-09-23 23:00:54 +00:00
Johannes Schickel
df827970a1 Fix for kyra3 crashes while playing WSA files.
svn-id: r29075
2007-09-23 22:43:46 +00:00
Johannes Schickel
ef986e2222 Init _screen for kyra3. Menu + Intro should be working again.
svn-id: r29074
2007-09-23 22:29:05 +00:00
Eugene Sandulenko
77eea722af Modified patch #1738058: "Action recorder".
svn-id: r28968
2007-09-19 13:55:05 +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
Max Horn
3abc11611e Code formatting fixes
svn-id: r28945
2007-09-18 20:16:33 +00:00
Max Horn
c3d3aebe87 Patch #1768757: Merge fsnode-gsoc into trunk (MAJOR change, will break compilation on some ports)
svn-id: r28944
2007-09-18 20:02:04 +00:00
Johannes Schickel
c4aa4fe644 Fixed a little graphics glitch, where sometimes parts of the interface were cleared.
svn-id: r28932
2007-09-16 15:15:15 +00:00
Johannes Schickel
fd6ca3b7ac - added PC-98 platform entry
- added Kyrandia 1 PC-98 detection entries

svn-id: r28907
2007-09-15 14:53:21 +00:00
Johannes Schickel
318c8a1d47 Fix for bug #1784937 ("KYRA: Wrong path for Brandon in starting location").
svn-id: r28773
2007-08-31 13:11:26 +00:00
Johannes Schickel
9dba16022e Fixes end scene in Kyrandia 1 Macintosh.
svn-id: r28716
2007-08-25 08:19:54 +00:00
Johannes Schickel
50d0b8501f - reformatting AdvancedDetector engines (looks like what the gob engine uses now)
- add entry for Kyrandia 1 Mac

svn-id: r28715
2007-08-25 08:02:15 +00:00
Eugene Sandulenko
837381f1d4 Fix linking errors.
svn-id: r28587
2007-08-13 10:12:07 +00:00
Eugene Sandulenko
fb72a5539c (At last) switched Kyra detection to AdvancedDetector
svn-id: r28584
2007-08-13 09:00:52 +00:00
David Corrales
6856535010 Merged fsnode with trunk: r27971:28460
svn-id: r28462
2007-08-05 19:34:20 +00:00
Kari Salminen
44279df48e Fixes compilation error C2677: binary '&&' : no global operator found which takes type 'const Kyra::Opcode' (or there is no acceptable conversion) on Windows (VS2003), Xbox (VS2003) and Xbox 360 (VS2005).
For some reason the compilers didn't automatically use the operator bool() in the Kyra::Opcode so now doing it explicitly.
Thanks to Carch for reporting the compilation problems.

svn-id: r28447
2007-08-04 12:23:28 +00:00
Max Horn
50537d3ae0 Fixed some warnings
svn-id: r28308
2007-07-29 17:37:08 +00:00
Johannes Schickel
65abeadcf6 Fixed bug in Resource::getFileHandle.
svn-id: r28306
2007-07-29 17:21:21 +00:00
Filippos Karapetis
e5808ea2f2 Fixed some warnings
svn-id: r28304
2007-07-29 17:10:51 +00:00
Johannes Schickel
5354f3b1d0 - fixes some warnings
- enables Kyrandia 2 main menu again

svn-id: r28298
2007-07-29 16:35:15 +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
bf5bb9280b - Restructure Kyrandia sourcecode (part 1, breaks compiling)
svn-id: r28294
2007-07-29 16:28:25 +00:00
Max Horn
11b2806741 Removed the old (obsolete) audiostream factories for MP3/Vorbis/FLAC data which took a File pointer and a size (these were only implemented as brain-dead wrapper around the newer factory methods anyway)
svn-id: r28110
2007-07-15 18:29:05 +00:00
Johannes Schickel
3e652273cc Some more fixes for Italian fan translation.
svn-id: r28055
2007-07-13 14:22:11 +00:00
Johannes Schickel
24344fe6ce Should fix gui strings in Italian fan translation.
svn-id: r28028
2007-07-11 13:25:21 +00:00
Johannes Schickel
728fe1ff86 Add md5sum for Italian fan translation of CD version (see fr#1727941 "KYRA: add Italian CD Version to kyra.dat").
svn-id: r28007
2007-07-10 13:25:54 +00:00
David Corrales
9bfe5d5354 Merged the FSNode branch with trunk r27681:27969
svn-id: r27970
2007-07-08 16:58:54 +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
Johannes Schickel
c6c06a922e Little renaming.
svn-id: r27963
2007-07-08 12:50:24 +00:00
Neil Millstone
0601dbd31b Optimisation for resource loading in Kyra engine
svn-id: r27875
2007-07-02 23:02:54 +00:00
Max Horn
e2ad271bd8 Removing non-ASCII chars from source code
svn-id: r27818
2007-07-01 12:47:07 +00:00
David Corrales
cacd7a28fd Merged the FSNode branch with trunk r27031:27680
svn-id: r27681
2007-06-23 18:51:33 +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
a041ef2317 Slightly updated key handling in BS2, Kyra, and Touche
svn-id: r27637
2007-06-22 23:03:12 +00:00
Max Horn
2fa0a5c457 Cleaning up after myself (I blame it on, err, uhh... the Vogons?)
svn-id: r27625
2007-06-22 21:16:07 +00:00
Max Horn
54d668ac13 Changed more code to use Common::KEYCODE_ enum
svn-id: r27624
2007-06-22 21:10:57 +00:00
Chris Apers
26a6c42b8f Fixed wrong file included
svn-id: r27433
2007-06-15 20:38:55 +00:00
Max Horn
d6e47d5fd3 ADV detector: Refactored findGameID() a bit, making it possible to use it outside the AdvancedDetector framework; also made it generate somewhat more user friendly desc for obsolete game IDs
svn-id: r27424
2007-06-15 17:36:41 +00:00
Eugene Sandulenko
6e5b70f5e9 Patch #1733764: "Fallback detection patch". GSoC student.
svn-id: r27375
2007-06-12 12:22:25 +00:00
Johannes Schickel
b9d77d2d40 Fix crash when closing Kyrandia demo.
svn-id: r27223
2007-06-08 23:04:13 +00:00
David Corrales
3b96c7fad5 Renamed methods in the FilesystemNode class to match the AbstractFSNode implementations.
Also exposed the new methods (exists, isReadable and isWritable) in FilesystemNode.

svn-id: r27113
2007-06-05 21:02:35 +00:00
Johannes Schickel
9774d3b80a Fix for bug #1730511 ("KYRA1: Brandon's text isn't cleaned properly").
svn-id: r27083
2007-06-04 19:00:41 +00:00
David Corrales
0cab5b7791 Merged the fs branch with trunk. r26949:27031
svn-id: r27032
2007-05-31 23:44:43 +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
c42c65686e Updated error message.
svn-id: r26965
2007-05-27 11:18:33 +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
ad03c72bdb Commit of patch #1715313 ("CORE: STL like algorithm implementation").
svn-id: r26929
2007-05-23 12:02:31 +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
06b3206b21 Fixes graphics glitch introduced while cleaning up.
svn-id: r26914
2007-05-22 13:33:41 +00:00
Johannes Schickel
2103678d93 Fixed WSA playing regression, introduced while cleaning up. (should fix Floppy and Amiga version)
svn-id: r26786
2007-05-08 11:46:27 +00:00
Johannes Schickel
776423ff82 - started to move v1 specific functions to KyraEngine_v1 (just opcodes yet)
- reworked script opcode handling

svn-id: r26749
2007-05-05 12:18:02 +00:00
Max Horn
579a3fe7cf Renamed plugin.cpp to detection.cpp in all engines
svn-id: r26622
2007-04-27 20:23:25 +00:00
Johannes Schickel
edd9b31a48 Cleanup.
svn-id: r26604
2007-04-27 12:15:47 +00:00
Max Horn
d4660cce55 Removing more semicola
svn-id: r26597
2007-04-26 19:08:53 +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
b9443dfb60 More cleanup.
svn-id: r26502
2007-04-15 14:38:02 +00:00
Johannes Schickel
504df5a48e cleanup.
svn-id: r26499
2007-04-15 14:19:27 +00:00
Johannes Schickel
8c4e539a40 Readded lost files.
svn-id: r26496
2007-04-15 13:44:49 +00:00
Johannes Schickel
5e1c6c7907 - Renamed some files for consistency with other engines.
- Kyra2 detector entries update.

svn-id: r26494
2007-04-15 13:39:08 +00:00
Johannes Schickel
e8b6baca74 Little WSA loading fix.
svn-id: r26375
2007-04-03 14:26:12 +00:00
Gregory Montoir
5aca9dce8c added the instance of EventManager returned by OSystem::getEventManager as a member of the Engine base class. This allows to simply the code a bit and should more efficient too (ie. less virtual function chain calls, obj->getA()->getB()). Also updated several engines to make use of it.
svn-id: r26357
2007-04-01 17:36:13 +00:00
Johannes Schickel
397c10f059 made _vm/_engine usage consistent. (_engine -> _vm all over the place now).
svn-id: r26342
2007-04-01 13:10:50 +00:00
Max Horn
508befd556 fixed const correctness
svn-id: r26307
2007-03-27 14:12:16 +00:00
Johannes Schickel
fb9b9863e3 Commit of patch #1688065 ("KYRA: fm towns music").
svn-id: r26305
2007-03-26 12:25:12 +00:00
Johannes Schickel
f145890bba Some tempo fixes from Florian.
svn-id: r26300
2007-03-25 15:54:15 +00:00
Johannes Schickel
d1645e2fbf Commit of patch #1686414 ("Kyra: FM-Towns music").
svn-id: r26285
2007-03-24 00:04:08 +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
2517960b3f - more cleanup
- added some .pak file integrity checks

svn-id: r26264
2007-03-20 21:11:42 +00:00
Johannes Schickel
b17ae7017c Little cleanup.
svn-id: r26263
2007-03-20 20:46:19 +00:00
Max Horn
888e68f433 KYRA: Changed to use EventManager::getMousePos (should improve some things: the old code did not properly track the mouse upon click events, and KyraEngine::waitForEvent ignored _flags.useHiResOverlay)
svn-id: r26221
2007-03-18 18:27:52 +00:00
Johannes Schickel
c7c79e33db Fixed various gui strings in German floppy.
svn-id: r26211
2007-03-18 16:15:19 +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
Max Horn
ed54ea9155 Moved Event/EventType/keyboard enum from common/system.h (part of class OSystem) to common/events.h (part of namespace Common). Porters may have to make minor changes to their backends to get them to compile again
svn-id: r26180
2007-03-17 19:02:05 +00:00
Torbjörn Andersson
53624376b4 Applied my re-revised patch #1487149 ("Simplified keyboard repeat"), with
Fingolfin's blessings. Keyboard repeat is now handled by the event manager,
rather than by individual engines.

Since this can cause problems with some engines (see the AGI engine), the extra
"key down" events are marked as "synthetic", so that they can be ignored if
necessary.

svn-id: r26170
2007-03-17 15:44:26 +00:00
Max Horn
15d9bc42ea Force all code to use EventManager::pollEvent instead of OSystem::pollEvent
svn-id: r26156
2007-03-17 00:53:21 +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
Max Horn
029b8c4323 Changed the order of the parameters of makeLinearInputStream to resemble Mixer::playRaw; also made makeLinearInputStream honor FLAG_LOOP (and for this, changed its loop related params slightly)
svn-id: r25926
2007-03-02 15:26:22 +00:00
Max Horn
8466221fce Simplify code a bit -- got rid of File::incRef usage, an unnecessary member var, fixed a potential memory leak (if all channels are in use), and fixed a potential OOB error (if stopSound(-1) was called)
svn-id: r25916
2007-03-01 17:04:50 +00:00
Torbjörn Andersson
61e2a9eb78 Clarified some comments and moved some asserts to hopefully answer Fingolfin's
question why we always created a mono audio stream. There are other games that
use more advanced versions of the VQA format, but it seems unlikely that
ScummVM will ever support any of them.

svn-id: r25911
2007-02-28 18:25:42 +00:00
Max Horn
8c8abca6f8 Changed the AppendableAudioStream code to use a queue of buffers, instead of a fixed size wrap-around memory buffer (this reduces memory usage in some cases by 500-700k, while actually being more flexible)
svn-id: r25909
2007-02-28 14:48:26 +00:00
Max Horn
a2a46c55d2 Using FLAG_AUTOFREE implies free() being called on the memory buffer you passed to the audio stream code -- hence, use malloc and not new[] to allocate the buffer
svn-id: r25877
2007-02-26 11:16:31 +00:00
Max Horn
b3931a847d Trying to unify the order in which we try the various audio formats: Prefer FLAC (lossless) over Ogg Vorbis ('free') over MP3 -- the order is admittedly somewhat arbitrary, but at least now it's consistent across all parts of ScummVM
svn-id: r25837
2007-02-24 23:40:28 +00:00
Travis Howell
990132687d Add the Hand of Fate demo.
svn-id: r25816
2007-02-24 09:55:37 +00:00
Johannes Schickel
60fbbc2704 Fixed black screen in the outro sequence.
svn-id: r25791
2007-02-22 18:03:05 +00:00
Johannes Schickel
15168e6c42 c&p error
svn-id: r25775
2007-02-21 22:29:45 +00:00
Max Horn
227a080e5b Patch #1663933 (Kill premix channel) with a few tiny additional tweaks by me
svn-id: r25752
2007-02-20 18:50:17 +00:00
Torbjörn Andersson
1987813f53 Another batch of header consistency changes.
svn-id: r25746
2007-02-20 17:33:54 +00:00
Max Horn
b8aeefaffb Added finalize() method to Common::OutSaveFile (which by default just flushes the stream), changed engines to call that before deleting OutSaveFile instances (instead of just flushing)
svn-id: r25660
2007-02-17 18:55:51 +00:00
Torbjörn Andersson
546758a086 Only set up the Kyra 1 triggers for Kyra 1, not Kyra 2.
svn-id: r25650
2007-02-17 08:06:21 +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
Torbjörn Andersson
16e7a12878 Some very obvious cleanups.
svn-id: r25635
2007-02-16 17:13:29 +00:00
Johannes Schickel
940e89d00e Added support for Kyrandia 2 ADL files.
svn-id: r25634
2007-02-16 16:57:59 +00:00
Max Horn
7572d2b4f2 Changed detectBestMatchingGame to return a pointer to a ADGameDescription (or a subclass of it); added a (currently fake) fallback callback entry in ADParams
svn-id: r25574
2007-02-13 23:37:44 +00:00
Eugene Sandulenko
da7d8c9f35 Rename Common::GF_XXX to Common::ADGF_XXX
svn-id: r25545
2007-02-13 13:42:28 +00:00
Max Horn
55adc889e7 (re)added flags field to ADGameDescription, with currently only one value (GF_DEMO) -- this flag value is not yet used by anything (also, GF_DEMO hasn't been correctly set for AGI games yet)
svn-id: r25539
2007-02-13 01:28:18 +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
46747d8396 should fix warnings in msvc.
svn-id: r25484
2007-02-11 03:21:27 +00:00
Johannes Schickel
841fd4f94f cleanup
svn-id: r25479
2007-02-11 01:38:15 +00:00
Johannes Schickel
1cc18f6e7b Don't rely on assert when calling functions.
svn-id: r25426
2007-02-08 09:41:10 +00:00
Johannes Schickel
00d4aea7e6 Fixed GUI strings in FM-Towns version.
svn-id: r25425
2007-02-08 09:24:33 +00:00
Johannes Schickel
cab3b23ab2 ops.
svn-id: r25424
2007-02-08 08:41:14 +00:00
Johannes Schickel
aa38257840 - fixed crash in FM-Towns version when entering the grotto
- fixed some palette issues

svn-id: r25423
2007-02-08 08:39:33 +00:00
Johannes Schickel
6707dcbbb2 Fixed credits in FM-Towns version.
svn-id: r25417
2007-02-07 19:51:19 +00:00
Johannes Schickel
63e3dfb1d1 Support for new kyra.dat, which includes static data from the fm-towns version.
svn-id: r25416
2007-02-07 19:30:49 +00:00