libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-20 00:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
61,199 Commits 5 Branches 5 Tags 1.8 GiB
857d2e7bef
Commit Graph

2772 Commits

Author SHA1 Message Date
Johannes Schickel
3cd4d1493a KYRA: Unconfuse some MSVC versions by adding a space before a comment. 2011-12-26 17:09:12 +01:00
athrxx
2e517cc9ec KYRA: (EOB) - add EOB copyright strings to KyraMetaEngine::getOriginalCopyright() 2011-12-26 16:18:17 +01:00
athrxx
d807b3d42b KYRA: (EOB) - implement EOB1 party transfer 2011-12-26 16:18:17 +01:00
athrxx
c0e782fd0b KYRA: (EOB) - Start implementing EOB1 party transfer (not working yet) 
(ScummVM specific solution which allows the selection of save files of all configured EOB1 targets)
 2011-12-26 16:18:17 +01:00
athrxx
53e1bf21ec KYRA: (EOB) - get rid of loadVGAPalette7bit() 
(slightly change VGA palette loader to accomodate EOB1 palettes)
 2011-12-26 16:18:17 +01:00
athrxx
40b1b794ae KYRA: make bool variable const (again) 2011-12-26 16:18:17 +01:00
athrxx
692f9ee6d5 KYRA: whitespace cleanup 2011-12-26 16:18:17 +01:00
athrxx
0c7fbd788b KYRA: (EOB) - remove unneeded virtual declarations in screen.h 2011-12-26 16:18:17 +01:00
athrxx
60330556ff KYRA: (EOB/LOL) - move eob/lol specific screen code to new class 2011-12-26 16:18:16 +01:00
athrxx
8716ed1703 KYRA: (EOB/LOL) - again fix static resource loading for EOB when LOL is disabled 2011-12-26 16:18:16 +01:00
athrxx
0aa3238523 KYRA: (EOB/LOL) - rename some vars 
(all cases of Eob to EoB, all cases of Lol to LoL, all cases of LolEobCommon to RpgCommon)
 2011-12-26 16:18:16 +01:00
athrxx
4e4f4164be KYRA: (EOB) - fix eob2 sequence text fading 2011-12-26 16:18:16 +01:00
athrxx
36d85a315f KYRA: (EOB) - rename some files for a better match with the contained code 2011-12-26 16:18:16 +01:00
athrxx
4c6302943b KYRA: implement Screen::decodeFrame1() 
(required for decoding some EGA bitmaps in EOB1)
 2011-12-26 16:18:16 +01:00
athrxx
6c8fb30cbd KYRA: (EOB) - fix static resource loading for EOB when LOL is disabled 2011-12-26 16:18:16 +01:00
athrxx
8b618e46df KYRA: (EOB/LOL) - cleanup common code 
(rename some stuff and move EOB/LOL common code to separate files)
 2011-12-26 16:18:16 +01:00
athrxx
aac7e16afa KYRA: (EOB) - fix some more bugs 
- wrong usage of static array which caused issues when restarting after RTL
- portability issue with dialog labels
- (original code) bug in hold person spell
 2011-12-26 16:18:15 +01:00
athrxx
49c111f8ca KYRA: (EOB) - ignore 'EYE.PAK' file in resource loader 
(This seems to be some sort of installer archive which is not supported atm)
 2011-12-26 16:18:15 +01:00
athrxx
5837e0f94e KYRA: (EOB) - make sure that the music stops after character generation in Eob 1 
(also more cleanup)
 2011-12-26 16:18:15 +01:00
athrxx
a944990a68 KYRA: (EOB) - rename some saving throw related data 2011-12-26 16:18:15 +01:00
athrxx
812ea181b8 KYRA: (EOB) - cleanup 2011-12-26 16:18:15 +01:00
athrxx
532f8f33f2 KYRA: (EOB) - fix mem leak 2011-12-26 16:18:15 +01:00
athrxx
1cbd566930 KYRA: (EOB) - fix invalid string access 
(also fix several cpp-check warnings)
 2011-12-26 16:18:15 +01:00
athrxx
ac1aa43ca8 KYRA: (EOB) - fix char generator regression + cleanup 2011-12-26 16:18:15 +01:00
athrxx
68ed8b9598 KYRA: (EOB) - fix some valgrind warnings 2011-12-26 16:18:15 +01:00
athrxx
816b40ebf8 KYRA: (EOB) - add debugger, etc. 
- add basic debugger support
- fix several minor bugs
 2011-12-26 16:18:15 +01:00
athrxx
2448d885e4 KYRA: (EOB) - complete EOBII playability 
- fixed temp data generation, block data loading, some spell issues, etc.
- both EOB I and II should now be completable
- one big issue remaining (AdLib driver gets swamped with monster sounds which causes heavy lags in some levels)
 2011-12-26 16:18:14 +01:00
athrxx
c35de374df KYRA: (EOB) - lots of bug fixes, mostly for EOB II 2011-12-26 16:18:14 +01:00
athrxx
f7032c126d KYRA: (EOB) - fix some bugs 
- fix monster movement
- fix character level gain
- add some static res for party transfer
 2011-12-26 16:18:14 +01:00
athrxx
b3c8173bd4 KYRA: (EOB) - extend save/load dialogue to support 990 slots 2011-12-26 16:18:14 +01:00
athrxx
b288889c97 KYRA: (EOB) - implement wall of force spell 2011-12-26 16:18:14 +01:00
athrxx
0d54aff632 KYRA: (EOB) - add EOB 1 intro 
(also add and fix several other things, like cone of cold vortex, drawShape issues, etc.)
 2011-12-26 16:18:14 +01:00
athrxx
359f3efd03 KYRA: (EOB) - add some spells 
(shocking grasp, flame blade, vampiric touch etc.)
 2011-12-26 16:18:14 +01:00
athrxx
fc5b29fdbc KYRA: (EOB) - implemented some spells and fixed more bugs 2011-12-26 16:18:13 +01:00
athrxx
bac0caeb0f KYRA: (EOB) - lots of fixes towards EOB1 playability 
also implement some new code (EOB1 portals, burning hands spell, etc.)
 2011-12-26 16:18:13 +01:00
athrxx
aab9e62247 KYRA: (EOB) - some more sequence code and bug fixes 2011-12-26 16:18:13 +01:00
athrxx
48f83b7bb4 KYRA: (EOB) - implement npc sequences and fix some bugs 2011-12-26 16:18:13 +01:00
athrxx
84900e8e50 KYRA: (EOB) - add turn undead spell, add some screen fades, fix some bugs 2011-12-26 16:18:13 +01:00
athrxx
0e4c184e28 KYRA: (EOB) - implement some gui functionality, some bug fixes, etc. 2011-12-26 16:18:13 +01:00
athrxx
c302b3e43b KYRA: (EOB) - fix various bugs and implement some spells 2011-12-26 16:18:13 +01:00
athrxx
9140fd8e91 KYRA: (EOB) - implement party resting 2011-12-26 16:18:12 +01:00
athrxx
db83458330 KYRA: (EOB) - implement scribe scroll menu 2011-12-26 16:18:12 +01:00
athrxx
5baabf037d KYRA: (EOB) - implement save menu 2011-12-26 16:18:12 +01:00
athrxx
c53589bcda KYRA: (EOB) - implement load menu 
(only 6 slots supported for now)
 2011-12-26 16:18:12 +01:00
athrxx
76bfcf834d KYRA: (EOB) - some refactoring 2011-12-26 16:18:12 +01:00
athrxx
b7f7635876 KYRA: (EOB) - implement memorize/pray spells menu 2011-12-26 16:18:12 +01:00
athrxx
d7f2720b57 KYRA: (EOB) - match eob code with 3f2b5b9e8b 2011-12-26 16:18:12 +01:00
athrxx
8d4034f428 KYRA: (EOB) - add static resources for memorize/pray menu 2011-12-26 16:18:12 +01:00
athrxx
e29f639791 KYRA: (EOB) - fix monster distance attack bug 2011-12-26 16:18:12 +01:00
athrxx
97e5036bf0 KYRA: (EOB) - more work on ingame menus 2011-12-26 16:18:11 +01:00
athrxx
045d08986d KYRA: (EOB) - start implementing camp menu 2011-12-26 16:18:11 +01:00
athrxx
69ad70afbb KYRA: (EOB) - allow returning to the main menu from character generation via ESC 2011-12-26 16:18:11 +01:00
athrxx
894df5a4ac KYRA: (EOB) - extended saveload caps 
(also save/load inventory and spellbook display state)
 2011-12-26 16:18:11 +01:00
athrxx
6853452bcb KYRA: (EOB) - fix shift key input 2011-12-26 16:18:11 +01:00
athrxx
514c77625f KYRA: (EOB) - fix out of bounds mem access 2011-12-26 16:18:11 +01:00
athrxx
c8665d06bc KYRA: (EOB) - fix some warnings and add some menu code 2011-12-26 16:18:11 +01:00
athrxx
adbf14c3c4 KYRA: (EOB) - update static resources (menu strings) 2011-12-26 16:18:11 +01:00
athrxx
9a6be57afd KYRA: (EOB) - implement explodeObject() 2011-12-26 16:18:11 +01:00
athrxx
77d210765a KYRA: (EOB) - add some static res (flight object data) to kyra.dat 2011-12-26 16:18:11 +01:00
athrxx
089ad94b68 KYRA: (EOB) - minor cleanup 2011-12-26 16:18:10 +01:00
athrxx
80ece6caae KYRA: (EOB) - replace snprintf/sprintf 2011-12-26 16:18:10 +01:00
athrxx
aa031bf98e KYRA: (EOB) - minor code size reduction 2011-12-26 16:18:10 +01:00
athrxx
ff8a030c37 KYRA: (EOB) - fix EOB1 spell definitions 2011-12-26 16:18:10 +01:00
athrxx
540d081a6f KYRA: (EOB) - initial code base commit 2011-12-26 16:18:10 +01:00
athrxx
814c78e84e KYRA: (AdLib Driver) - fix queue handling for Eob 
Huge numbers of sound effects get started as soon as a couple of monsters are around. If we start dropping sound when the queue is full, we won't have any sounds in these situations, but we'll get tons of useless warnings instead.
 2011-12-26 16:18:10 +01:00
athrxx
2bcae2451a KYRA: (AdLib Driver) - prevent squashing of sounds during halt track execution 
This patch makes sure that the stopping track (track 0) does not squash sounds which get queued during the execution of the stopping track. This seems to be a hardware problem (original driver implementation not suitable for modern machines).
 2011-12-26 16:18:10 +01:00
athrxx
2da431aa65 KYRA: (AdLib Driver) - increase versions and add necessary EOB modifications 2011-12-26 16:18:09 +01:00
athrxx
93321ca485 KYRA: (AdLib Driver) - fix secondary effect 2011-12-26 16:18:09 +01:00
athrxx
86a8f694c0 KYRA: (AdLib Driver) - rename some variables to make more sense 2011-12-26 16:18:09 +01:00
athrxx
4098feff57 KYRA: (AdLib Driver) - allow sound trigger query 2011-12-26 16:18:09 +01:00
athrxx
f2a1ff3f78 KYRA: (AdLib Driver) - fix invalid memory write issue 2011-12-26 16:18:09 +01:00
athrxx
77a81a80b4 KYRA: (AdLib Driver) - implement sound effects volume 
(also make internal driver version more flexible)
 2011-12-26 16:18:09 +01:00
Andrea Corna
a6ec4f70da COMMON: Make more members of Archive constant. 2011-12-13 17:55:57 +01:00
Johannes Schickel
77959acd51 KYRA: Cast char to uint8 before passing it to getCharWidth. 
This assures getCharWidth really gets the character number and now sign
extended version of it in case char is signed.
 2011-12-13 16:18:12 +01:00
Johannes Schickel
efa52cb79c KYRA: Fix for bug #3459000 "KYRA1CD: Accented characters overdrawn in introduction". 2011-12-13 16:18:12 +01:00
Tarek Soliman
1305c5ab31 KYRA: Fix whitespace 2011-12-12 22:37:36 -06:00
Tarek Soliman
38ff68e449 KYRA: Use Common::KeyActionEntry table for LoL game keymap 
This is for the keymapper keymap
 2011-12-12 20:19:42 -06:00
athrxx
f19401b14c KYRA: (HOF CD Demo) - check shouldQuit() during ending text loop 2011-11-24 00:50:00 +01:00
athrxx
0565d7dc20 KYRA: (HOF) - fix ending text in the playable demo 2011-11-23 22:39:43 +01:00
Christoph Mallon
e578cb8976 ALL: Remove unnecessary forward declarations. 2011-11-21 15:59:19 +01:00
Johannes Schickel
cfac223cee KYRA: "Fix" bug #3166235 "KYRA: Crash on startup on OS X due to invalid PAK file". 
Now we can show such errors in the debugger, since we initialize and the
screen resolution and the debugger before initializing the resource manager.
This allows our error function to open up the debugger and show the error at
least.

A better feedback to the user might be desirable, but it is not really
feasible with our current possibilites for error reporting.
 2011-11-18 03:47:51 +01:00
Johannes Schickel
11a7993085 KYRA: Add some assert for debugging purposes. 2011-11-18 03:26:21 +01:00
Eugene Sandulenko
5420ad7619 Merge pull request #114 from tsoliman/keymapper2 
KEYMAPPER: Keymapper improvements 2
 2011-11-17 14:22:48 -08:00
Strangerke
bab4b6f729 LAUNCHER: Introduce GUIO0() in order to replace GUIO1(GUIO_NONE) 2011-11-16 22:38:58 +01:00
Johannes Schickel
7c2145f67c KYRA: Make message about missing save file a warning and no error. 2011-11-16 18:32:34 +01:00
Johannes Schickel
61795739f8 COMMON: Rename Common::set_to to Common::fill. 
This makes the name match with the name of the STL function with the same
behavior.
 2011-11-16 18:06:30 +01:00
Tarek Soliman
843f19788b KYRA: Fix some copy paste error in LoL keymap keycodes 2011-10-30 22:37:32 -05:00
Tarek Soliman
1ec5b491b7 KYRA: Remove usage of using namespace Common in the keymap code 
thanks LordHoto
 2011-10-28 19:30:59 -05:00
Tarek Soliman
f4fa37fdf8 KYRA: Move kKeymapName to be inside LoLEngine 
Thanks LordHoto
 2011-10-28 09:58:09 -05:00
Tarek Soliman
8d970f3568 KYRA: Cleanup game keymaps on RTL 
This fixes an RTL problem where the keymaps linger between same-engine games.
Meaning the lol keymap shows up in kyra1
 2011-10-27 10:46:22 -05:00
Tarek Soliman
719020a3e7 KYRA: Added basic game keymap for LoL 2011-10-27 10:46:21 -05:00
Strangerke
fa1e55181a KYRA: On demand of lordHoto, remove GUIO_NOASPECT as Jap. games are in 640x400 and not 640x480 2011-10-24 12:59:02 +02:00
Strangerke
b7284f3a37 LAUNCHER: Add GUIO_NOASPECT to Kyra 2011-10-23 22:53:39 +02:00
Eugene Sandulenko
32972a5ffb AD: Switched rest of the engines to new GUIO 2011-10-23 17:53:13 +01:00
Johannes Schickel
d8e50b8a03 KYRA: Fix memory leak when a sound is started but no free handles are left. 2011-10-22 19:37:49 +02:00
Johannes Schickel
6da0549133 KYRA: Fix minor bug in AdLibDriver::primaryEffect1. 2011-10-02 02:17:59 +02:00
Johannes Schickel
a3a40c4a6f KYRA: Fix bumping into a wall AdLib SFX in Lands of Lore. 2011-10-02 01:49:27 +02:00
Johannes Schickel
88fa659ace KYRA: Name another variable in the AdLib output code. 2011-10-02 00:13:41 +02:00
Johannes Schickel
2dd85c0cad KYRA: Some minor cleanup. 2011-10-02 00:13:41 +02:00
athrxx
9b2848ba90 KYRA: fix typo 2011-10-01 18:35:05 +02:00
Johannes Schickel
74f3a29c19 KYRA: Never allow slots 0 and 990-999 to be overwritten. 2011-10-01 17:03:29 +02:00
Tarek Soliman
4cd9c16867 KYRA: workaround to get maemo to even compile 
kyra has a file that won't compile in -Os
 2011-09-22 22:07:44 -05:00
Johannes Schickel
4f7768ec6e KYRA: Cleanup _saveSlots array sorting. 2011-11-14 15:54:50 +01:00
Willem Jan Palenstijn
59ed0ee9ed KYRA: Add comment hopefully explaining _saveSlots 2011-11-14 15:51:01 +01:00
Johannes Schickel
bac23bde27 KYRA: Whitespace fixes. 2011-11-14 15:44:58 +01:00
Johannes Schickel
f410480cfd KYRA: Fix bug #3437647 "LOL: Unexpected missing save file". 
Formerly the code was confused about what _saveSlots is doing, i.e. creating a
continous list of existing save slot ids.
 2011-11-14 15:42:20 +01:00
athrxx
001f7d6403 KYRA: fix bug #3429455 
(signed/unsigned bug in LoLEngine::olol_getWallType)
 2011-11-08 22:29:55 +01:00
Johannes Schickel
9fa9f68789 AUDIO: Implement a basic VocStream class. 
Now all VOCs are streamed rather than preloaded. This deprecates the
STREAM_AUDIO_FROM_DISK define, which was previously used to stream VOCs from
disk.

This might very well break some engines which relied on the stream not being
changed after makeVOCStream! I adapted all engines which had a check for
STREAM_AUDIO_FROM_DISK in their code.

It would be wise to check all other engines using VOC to see if this might
cause any problems for them.
 2011-11-06 13:30:34 +01:00
athrxx
dbbfca37a2 KYRA: add missing (maybe unused) case to LoLEngine::olol_getGlobalVar() 2011-11-04 21:46:35 +01:00
athrxx
4f948b3309 KYRA: replace invalid memset call and add a warning 2011-11-04 21:46:34 +01:00
athrxx
1527e7b1b4 KYRA: (LOL) minor fix, cleanup and renaming 2011-11-04 21:46:32 +01:00
athrxx
99aaf24201 KYRA: fix monster hp in LoL 2011-11-04 21:46:31 +01:00
athrxx
19458cf03f KYRA: rename script proc and fix some debug messages 2011-11-04 21:46:29 +01:00
Johannes Schickel
6a3a14ab6b KYRA: Reduce size of KyraEngine_LoK::_entranceMouseCursorTracks. 
Also clear the whole array in enterNewScene. This is not needed since the last
value is only used when the first four values are set up valid, but it removes
an annoying warning in PVS-Studio and makes the code a bit clearer.
 2011-11-04 20:15:05 +01:00
Johannes Schickel
3c4bb82799 KYRA: Use "0xFF" instead of "0xFFFF" as memset's second parameter. 2011-11-04 20:15:05 +01:00
Johannes Schickel
7157e75ed9 KYRA: Remove FIXME, which should've been removed with 4410e61... 2011-11-04 20:03:59 +01:00
Johannes Schickel
4410e61238 KYRA: Simplify getMoveTableSize. 
This also removes two FIXME comments. The original did the same checks as we
had before, but as PVS-Studio noticed the expression was excessive. I changed
it to a simpler expression now and removed the FIXMEs.
 2011-11-04 20:01:57 +01:00
athrxx
286c319719 KYRA: fix minor bug in LoLEngine::playCharacterScriptChat() 2011-11-03 23:05:04 +01:00
Filippos Karapetis
d3999850e7 KYRA: Added FIXMEs for two odd checks 2011-11-03 23:09:38 +02:00
Johannes Schickel
57ca48d547 KYRA: Fix Common::List::erase usage. 
Thanks to Tron for pointing that out.
 2011-11-01 16:35:11 +01:00
Johannes Schickel
fcf63d0261 KYRA: Update engine description comment. 2011-10-29 03:26:18 +02:00
Johannes Schickel
a588d6e3e2 KYRA: Add another delay for new tracks in the AdLib driver. 
This is to play really safe and to avoid messing up of sound data.
 2011-10-29 02:50:52 +02:00
Johannes Schickel
488fb5c14b KYRA: Fix haltTrack and beginFadeOut for AdLib driver. 
Formerly the were not executed properly when the sfx output was disabled.
 2011-10-29 02:40:50 +02:00
Johannes Schickel
8ea2d5dbb1 KYRA: Simplify AdLib output code a bit. 
This might cause nasty regressions, since it changes the way sounds are
started. On the other hand it gets rid of the low level driver interface
which was implemented before. And it should be a bit better secured against
race conditions.
 2011-10-29 02:37:44 +02:00
Johannes Schickel
1706ff039c KYRA: Mark overwritten methods of SoundAdLibPC as virtual. 2011-10-29 01:00:18 +02:00
Johannes Schickel
4d5f186a34 KYRA: Get rid of old-style loadSoundFile in SoundAdLibPC. 2011-10-29 01:00:18 +02:00
Johannes Schickel
7469187ef3 KYRA: Move MixedSoundDriver implementation to sound.cpp. 2011-10-29 01:00:18 +02:00
Johannes Schickel
9d9837f217 KYRA: Prefer Common::String over plain char arrays in Sound. 2011-10-29 01:00:18 +02:00
Johannes Schickel
951cb8ea71 KYRA: Get rid of Sound's voiceFileIsPresent in favor of isVoicePresent. 2011-10-29 01:00:18 +02:00
Johannes Schickel
17883b9137 KYRA: Make more methods of Sound const. 2011-10-29 01:00:18 +02:00
Johannes Schickel
5be3ac9fcc KYRA: Move non-empty virtual methods of Sound from sound.h to sound.cpp. 2011-10-29 01:00:18 +02:00
Johannes Schickel
d0bc84d5b7 KYRA: Implemented LoL style volume control in AdLib output. 2011-10-29 01:00:18 +02:00
Johannes Schickel
1fa858d339 KYRA: Made some more static data const. 2011-09-08 00:33:10 +02:00
Christoph Mallon
e35b4f20c1 GRAPHICS: Simplify the interface of Graphics::loadThumbnail(). 
Now it returns the Surface, so the caller does not need to create one and pass it.
 2011-08-07 15:19:09 +02:00
Christoph Mallon
3ee307e6b3 KYRA: Simplify initializing a buffer with a string. 2011-08-07 15:19:08 +02:00
Christoph Mallon
ab80b20a30 COMMON: Replace x + ARRAYSIZE(x) by the simpler ARRAYEND(x). 2011-08-07 15:19:08 +02:00
Christoph Mallon
23a0f5318c JANITORIAL: Remove trailing empty lines. 2011-08-07 13:53:33 +02:00
Bastien Bouclet
3384f9146c KYRA: Don't loose the next event when leaving the text input event loop. 2011-08-06 15:48:12 +02:00
athrxx
f44874f0a6 KYRA: add support for Russian Kyra 1 floppy fan translation 2011-07-27 16:38:31 +02:00
athrxx
f2f6ddced9 KYRA: add support for Kyra 2 Russian floppy 2011-07-25 17:57:33 +02:00
athrxx
ec55336393 LOL: add support for Russian CD-ROM version 2011-07-24 22:49:21 +02:00
athrxx
7174f14c61 LOL: add support for Russian floppy version 2011-07-24 20:39:08 +02:00
Eugene Sandulenko
79e08c68ac KYRA: Add detection for Russian versions of Kyra1 & LoL 2011-07-13 12:39:31 +01:00
athrxx
f80b2383e7 KYRA: cleanup last commit 2011-07-04 20:22:16 +02:00
athrxx
7e2f7dce3a KYRA: fix pauseEngineIntern regression in MR 2011-07-04 19:52:14 +02:00
athrxx
38d18a6e78 KYRA: fix ingame menu save slots 
- long GMM save descriptions will be trimmed to fit the ingame menu save slots
- prevent writing beyond the right margin in Kyra 1 save slots
 2011-07-04 19:52:11 +02:00
athrxx
90fa4cf15f KYRA: formatting 2011-07-03 14:40:55 +02:00
Johannes Schickel
933ee5b156 GRAPHICS: Remove default values from FontSJIS::drawChar. 
drawChar is overloaded in FontSJIS. One takes a "Surface &" as first
parameter another one "void *", they furthermore have the exact same
number of required parameters. The one "void *" just had a few extra
parameters with default values. This resulted in a bug in SCUMM, where
"VirtScreen *" (a subclass of Surface) was passed instead of "VirtScreen &"
and thus the method taking "void *" was incorrectly used.

To make it easier to spot such bugs in the future I just removed the default
values and thus disallow such calls.
 2011-07-01 05:42:54 +02:00
Johannes Schickel
b66ca60088 KYRA: _athrxx is the new Kyra maintainer. 2011-06-25 19:25:56 +02:00
athrxx
3f2b5b9e8b KYRA: revert d7e700f370 
The GMM mouse cursor bug has now been fixed inside the GMM and CursorMan code.
 2011-06-25 15:54:37 +02:00
Littleboy
b694a78f62 ANALYSIS: Add static casts to is* functions 
This fixes a potential problem with passing char values that would be sign-extended and yield unexpected results.
See http://msdn.microsoft.com/en-us/library/ms245348.aspx
 2011-06-23 08:52:52 -04:00
Julien
69c7673e53 KYRA: Allocate screen region buffer on the heap 2011-06-23 15:11:38 +08:00
Max Horn
88913c0139 ALL: Remove trailing whitespaces 
This tries to make our code a bit more compliant with our code formatting
conventions. For future use, this is the command I used:
  git ls-files "*.cpp" "*.h" | xargs sed -i -e 's/[ \t]*$//'
 2011-06-20 00:59:48 +02:00
athrxx
48e5bd36e9 LOL: fix bug reported on forum 
In cases where the script failed to delete a certain character from the party (because that character was not a party member) it would add this character to the party instead. E.g. when returning to Gladstone without having picked up Timothy, he would get added to the party after the throne room scene. The same happened with Lora at the Draracle if she wasn't picked up on the way.
 2011-06-19 00:59:16 +02:00
Max Horn
d74e2d3224 KYRA: Replace vsprintf by Common::String::vformat 2011-06-18 01:36:16 +02:00
Max Horn
7c992d6598 DETECTOR: Merge ADParams into AdvancedMetaEngine 2011-06-14 18:17:01 +02:00
Thierry Crozat
06bbb57ad7 I18N: Make many more GUI MessageDialog strings translatable 2011-06-13 22:19:18 +01:00
athrxx
d9dcb5725a LOL: fix typo 2011-06-12 16:46:08 +02:00
athrxx
aeff4b623e LOL: add another detection entry for Italian fan translation 
(this detection entry applies if the game has been patched with the official 1.02 patch before using the translation patch)
 2011-06-12 15:15:22 +02:00
athrxx
4338c4dccf LOL: update kyra.dat for italian fan translation 2011-06-11 16:28:44 +02:00
athrxx
afbfb056f7 LOL: fix so-called bug #3313950 
(LoL support for Italian fan translation)
 2011-06-10 22:45:44 +02:00
Max Horn
a29bc37eee KYRA: Switch to alternate AdvancedMetaEngine, avoid ADParams 2011-06-10 22:15:42 +02:00
Max Horn
4827cc914a ENGINES: Change incorrect use of 'target' to 'gameid' 2011-06-10 22:15:40 +02:00
Johannes Schickel
f13143ef7d KYRA: Add a default case to a switch statement. 
This includes a TODO, about what to do if we ever hit this case.
 2011-06-09 19:13:30 +02:00
Johannes Schickel
80d0bc0c85 KYRA: Get rid of most snprintf usages. 
Thanks to digitall for his initial patch, which I only altered slightly.
 2011-06-09 19:10:54 +02:00
athrxx
920c3bb172 KYRA: fix audio detection 
Don't attempt to detect PC devices for non-PC versions of the game, because this might trigger unnecessary detection failure messages.
 2011-06-05 18:29:16 +02:00
athrxx
75297cb124 KYRA: fix GMM saving 
(match with 477d6233c3)
 2011-06-05 11:58:15 +02:00
athrxx
66c982b38c LOL: cleanup 
- fix RTL during outro/credits
- get rid of _animator
- fix wrong memset
 2011-06-05 01:37:59 +02:00
athrxx
3f603ce0ab LOL: changed workaround for fireball bug 
(see comment in items_lol.cpp)
 2011-06-04 16:03:14 +02:00
athrxx
717248e162 KYRA: improve readability of key mapping code 2011-06-03 00:41:09 +02:00
athrxx
d7f877b3ab KYRA: pause midi sounds while gmm is running 2011-05-29 01:04:08 +02:00
athrxx
187ecdd54f KYRA: remove useless mutex from sound_towns 2011-05-29 01:03:49 +02:00
Matthew Hoops
9539017ee3 ALL: initialise -> initialize 2011-05-25 11:17:11 -04:00
athrxx
8fb5906117 FM-TOWNS AUDIO: Some midi code fixes and some renaming 2011-05-17 20:36:31 +02:00
athrxx
d9772ff88f FM-TOWNS AUDIO: Some renaming in the euphony driver code 2011-05-17 20:33:03 +02:00
Max Horn
4cbe4ede66 COMMON: Registers RandomSources in constructor with the event recorder 
This also removes the dependency of engines on the event recorder header
and API, and will make it easier to RandomSources that are not properly
registered.
 2011-05-17 12:17:26 +02:00
Thierry Crozat
3062681eb5 KYRA: Change engine name to Kyra 2011-05-16 23:58:46 +01:00
Thierry Crozat
3c59e37035 ENGINES: Unify engine names 
This unifies the engine names in MetaEngine::getName() and the
credits. In particular drop "Engine" or "engine" from the names when
it was present and use expanded names in credits when the
MetaEngine uses it (e.g. "Beneath a Steel Sky" instead of "BASS").
 2011-05-16 00:11:32 +01:00
strangerke
69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Johannes Schickel
9fb92f4b7e KYRA: Fix compilation when LoL is disabled. 2011-04-28 18:16:01 +02:00
Johannes Schickel
7d03da14cb KYRA: Clean up of header includes. 2011-04-28 15:39:57 +02:00
Ori Avtalion
9414d7a6e2 JANITORIAL: Reduce header dependencies in shared code 
Some backends may break as I only compiled SDL
 2011-04-28 15:08:58 +03:00
Max Horn
73f04118f3 COMMON: Rename Error to ErrorCode, introduce new Error class 2011-04-18 18:22:02 +02:00
Johannes Schickel
64c4e65201 KYRA: Enforce use of American English in comments. 2011-04-14 14:03:07 +02:00
Max Horn
0ce2ca4e00 COMMON: Replace MKID_BE by MKTAG 
MKID_BE relied on unspecified behavior of the C++ compiler,
and as such was always a bit unsafe. The new MKTAG macro
is slightly less elegant, but does no longer depend on the
behavior of the compiler.
Inspired by FFmpeg, which has an almost identical macro.
 2011-04-12 16:53:15 +02:00
Johannes Schickel
d9441aeb80 KYRA: Add some assertion to prevent out of bounds access. 2011-04-11 00:36:03 +02:00
Johannes Schickel
073da68efa KYRA: Constify static data table in LoL code. 2011-04-11 00:35:28 +02:00
Johannes Schickel
93f591580a KYRA: Get rid of non-const static variable in Kyra2 code. 2011-04-11 00:34:16 +02:00
Johannes Schickel
8fe9f8e73a KYRA: Cleanup. 2011-04-11 00:31:24 +02:00
Johannes Schickel
ee4699a495 KYRA: Get rid of non-const static variables in HoF. 2011-04-11 00:21:18 +02:00
Max Horn
6cf1de87ac DEVTOOLS: Renamed 'tools' directory to 'devtools' 2011-04-09 23:47:35 +02:00
Johannes Schickel
eb731514f7 KYRA: Slight cleanup. 
This more or less silently fixes the silent music introduced with f19e201, by
me setting volume to "true" instead of "255". Whoops.
 2011-04-07 01:09:52 +02:00
Johannes Schickel
f19e2019b8 KYRA: Cleanup background music looping of Kyra3. 2011-04-07 01:01:55 +02:00
Johannes Schickel
6d0bb19a51 KYRA: Cleanup static variable usage in LoK. 2011-04-07 00:11:36 +02:00
Johannes Schickel
f4dde64406 KYRA: Slight cleanup. 2011-04-07 00:11:36 +02:00
dhewg
d83a83ef50 JANITORIAL: Remove/comment unused vars 
Found by GCC 4.6's -Wunused-but-set-variable
 2011-03-29 21:57:56 +02:00
Max Horn
29847ea42d AUDIO: Change several fake MidiDrivers to MidiDriver_BASE subclasses 
Many engines follow the advice in audio/midiparser.h and create a
"pseudo-MidiDriver" subclass. But MidiParser really only needs a tiny
subset of the MidiDriver capabilities, namely those found in
MidiDriver_BASE. So we try to subclass from that whenever possible; this
allows us to remove many stub methods, and enables further future
simplifications.
 2011-03-23 15:25:47 +01:00
Max Horn
8982fff1b7 AUDIO: Add pure virtual MidiDriver::isOpen() method 
This in turn enables modifying MidiDriver_MPU401::close() to allow
it to be called on a midi driver that has not yet been opened.

The specific issue that triggered me to make these changes was a
crash-upon-quit in HUGO, caused by it instantiating a midi driver,
then encountering an error (missing hugo.dat) *before* having
opened the new midi driver; the general cleanup code then tries
to close the (not yet opened) midi driver -> kaboom

Also fixed some engines which were leaking MidiDriver instances.
 2011-03-22 23:51:47 +01:00
Johannes Schickel
16be240ab1 KYRA: Fix regression in Screen::setInterfacePalette. 
This fixes an out of bounds write introduced with 9216c7e.
 2011-02-20 21:37:39 +01:00
Johannes Schickel
e21d6e0d11 Merge branch 'osystem-palette' of https://github.com/lordhoto/scummvm into master 
Conflicts:
	backends/platform/android/android.cpp
	engines/sci/graphics/screen.cpp
	engines/sci/graphics/transitions.cpp
 2011-02-19 21:46:45 +01:00
Johannes Schickel
b5d1c66915 KYRA: Set type for NULL MIDI driver to PC Speaker. 
This avoids a dialog about MT-32 to General MIDI conversion shown when running
Kyrandia 1. Formerly the NULL MIDI output type was set to General MIDI, which
caused the aforementioned dialog to show up, because Kyrandia 1 has no General
MIDI tracks.
 2011-02-16 23:30:03 +01:00
athrxx
e23696d900 KYRA/LOL: add comments for last commit 2011-02-16 16:31:22 +01:00
athrxx
d7e700f370 KYRA/LOL: fixed hand item cursor bug 
This fixes a bug when loading savegames with different active hand items via GMM. The mouse cursor was not set to the active hand item in these cases.
 2011-02-16 16:23:44 +01:00
Johannes Schickel
9216c7e3de KYRA: Adapt to setPalette/grabPalette RGBA->RGB changes. 2011-02-14 17:08:32 +01:00
Johannes Schickel
24eab0ac73 KYRA: Rename KyraEngine_MR::runDialog to doDialog to avoid name clashes with Engine::runDialog. 
svn-id: r55864
 2011-02-10 01:19:48 +00:00
Johannes Schickel
a9361da157 KYRA: Remove superfluous const in type conversion. 
svn-id: r55863
 2011-02-10 01:19:24 +00:00
Max Horn
42ab839dd6 AUDIO: Rename sound/ dir to audio/ 
svn-id: r55850
 2011-02-09 01:09:01 +00:00
Max Horn
2d1c8a3533 ALL: Fix whitespaces / indention 
svn-id: r55818
 2011-02-07 23:01:06 +00:00
Max Horn
ab039812e7 COMMON: OSystem now has a PaletteManager 
svn-id: r55806
 2011-02-07 17:52:38 +00:00
Johannes Schickel
d925e38acf KYRA: Hopefully fix valgrind warnings in the HoF intro when text is disabled. 
svn-id: r55623
 2011-01-29 19:03:50 +00:00
Johannes Schickel
2cc3bd880f KYRA: Clean up main menu code in Kyra2/Kyra3. 
svn-id: r55620
 2011-01-29 18:40:04 +00:00
David Turner
450dac35c7 KYRA: Fix Valgrind Uninitialized Memory Read at end of VQA Playback. 
svn-id: r55619
 2011-01-29 18:20:38 +00:00
David Turner
f050e2d66f KYRA: Close Memory Leaks in Kyra 3 (Malcolm's Revenge) Menu. 
svn-id: r55618
 2011-01-29 18:18:29 +00:00
Florian Kagerer
8347b44fb2 KYRA FM-TOWNS: improved cd audio music fading 
svn-id: r55039
 2010-12-25 22:10:51 +00:00
Max Horn
6edc86a19b DEBUG: Let GUI::Debugger::preEnter and postEnter (un)pause the engine 
svn-id: r54815
 2010-12-07 18:54:21 +00:00
Jordi Vilalta Prat
d5a4f554af ALL: Fix a few typos 
svn-id: r54716
 2010-12-01 20:03:05 +00:00
Max Horn
2180b2d6b5 COMMON: Split common/stream.h into several headers 
svn-id: r54385
 2010-11-19 17:03:07 +00:00
Max Horn
a0df86955f ALL: Push down deps on stream.h from .h to .cpp files 
svn-id: r54358
 2010-11-19 01:37:04 +00:00
Max Horn
ee4770ffb6 ENGINES: Change 'colour' to 'color' 
Only changed this in engines where 'color' was/is already used
almost exclusively

svn-id: r54288
 2010-11-17 12:22:08 +00:00
Max Horn
059944e59c COMMON: Push #include audiocd.h in system.h out to .cpp files 
svn-id: r54148
 2010-11-08 23:07:42 +00:00
Max Horn
82e473bc3b BACKENDS: Partial merge of gsoc2010-opengl: Audio CD changes only 
This commit contains the AudioCDManager changes from the gsoc2010-opengl
branch. The other changes in that branch are restricted to the backends
directory only (plus configure).

The Nintendo DS and Dreamcast ports still need to be ported over to
the new Audio CD system, but that should be fairly easy to do.

svn-id: r54147
 2010-11-08 22:53:36 +00:00
Florian Kagerer
97a98cf9db LOL: fixed minor text displayer bug 
svn-id: r54132
 2010-11-08 00:08:38 +00:00
Max Horn
4d3a07b494 COMMON: Rename and tweak MD5 functions 
* names now comply to our naming conventions
* the function computeStreamMD5AsString which computes the MD5
  as a hex string now returns it as a Common::String
* add doxygen comments

svn-id: r54121
 2010-11-07 17:16:59 +00:00
Max Horn
18d40017e8 ENGINES: Unify code layout of all ADParams instances 
svn-id: r54105
 2010-11-07 01:01:18 +00:00
Johannes Schickel
8252fc30ce KYRA: Pause engine when the debugger is open. 
svn-id: r54032
 2010-11-01 22:19:16 +00:00
Max Horn
a984fb17c2 GUI: Add GCC_PRINTF to GUI::Debugger::DebugPrintf & fix resulting warnings 
svn-id: r54007
 2010-11-01 16:03:35 +00:00
Max Horn
e27b05ef35 COMMON: Rename String::printf() to String::format() 
This is a first step towards getting rid of all uses of regular printf,
fprintf, vprintf, vfprintf, puts, fputs, etc. in our codebase.

The name format() reflects the purpose of the function, and parallels
String.format() in Java, boost::format, and others.

svn-id: r54004
 2010-11-01 16:02:28 +00:00
Florian Kagerer
ec680ef8aa LOL: fixed bug #3099321 
(Crash in Yvel tavern basement)

svn-id: r53973
 2010-10-31 00:20:30 +00:00
Florian Kagerer
a04b4e6517 LOL: workaround for bug #3098935 
(Vaelan's Cube can be duplicated at Scotia's Barrier)
This is a bug in the game data of early unpatched floppy versions.
This can also be fixed by applying the official patch (ftp://ftp.westwood.com/pub/lands1/updates/lolus123.exe).

svn-id: r53954
 2010-10-30 18:37:15 +00:00
Florian Kagerer
c9442e26ad KYRA: match music settings with latest launcher code changes. 
(Last commit got trunkated somehow)

svn-id: r53927
 2010-10-29 19:00:37 +00:00
Florian Kagerer
67566890bd KYRA: match music settings with latest launcher code changes. 
(Users will get AdLib music at default unless they have specified a MIDI device in the launcher (MT-32 for KYRA, GM for HOF and LOL.)

svn-id: r53926
 2010-10-29 18:57:19 +00:00
Johannes Schickel
07e9c6a035 KYRA: Minor formatting cleanup. 
svn-id: r53915
 2010-10-29 00:40:35 +00:00
Johannes Schickel
32338876f8 KYRA: Rename KyraEngine::saveGameState to KyraEngine::saveGameStateIntern. 
This is to avoid name similarity between KyraEngine::saveGameState(Intern)
and Engine::saveGameState.

svn-id: r53912
 2010-10-28 23:57:24 +00:00
Johannes Schickel
607920c869 KYRA: Fix some code errors reported by ICC (i.e. subclasses not overwriting methods by missing a const.) 
svn-id: r53911
 2010-10-28 23:56:36 +00:00
Florian Kagerer
bf5ae45490 KYRA/PC98: workaround for missing delay opcodes 
The sequence data for the forest sequence in the Kyra PC-98 intro has no delay opcodes making it play way too fast on modern systems. This workaround adds the same delay opcodes to the sequence data that the other Kyra versions have.

svn-id: r53761
 2010-10-24 13:00:47 +00:00
Florian Kagerer
09f77eb464 LOL: - fix invalid mem access 
- also extend LordHoto's recent item code changes to LOL

svn-id: r53740
 2010-10-23 16:01:40 +00:00
Max Horn
3534cff8ef ALL: Fix indention (whitespaces -> tabs) 
svn-id: r53738
 2010-10-23 15:46:50 +00:00
Florian Kagerer
d6e4c07dac LOL: fix possible regressions 
svn-id: r53700
 2010-10-22 13:10:41 +00:00
Johannes Schickel
b816a81c02 KYRA: More cleanup. 
svn-id: r53699
 2010-10-22 02:11:50 +00:00
Johannes Schickel
5ff20cb12d KYRA: Cleanup. 
svn-id: r53698
 2010-10-22 02:11:00 +00:00
Johannes Schickel
03e2d54ca7 KYRA: Adapt Kyra2+3 to use the newly added item type too. 
svn-id: r53697
 2010-10-22 02:10:22 +00:00
Johannes Schickel
3653613443 KYRA: Add a datatype for the item ids and convert Kyra1 to use it. 
svn-id: r53696
 2010-10-22 02:09:16 +00:00
Johannes Schickel
38463e6161 KYRA: A little refactoring (name change). 
svn-id: r53695
 2010-10-22 02:08:26 +00:00
Florian Kagerer
1d87f434a2 SCUMM/FM-TOWNS JAPANESE: implement flipped text 
(used in the MI1 circus scene after Guybrush gets shot out of the cannon)

svn-id: r53616
 2010-10-19 16:58:27 +00:00
Florian Kagerer
c841c3fb7c SCUMM/FM-TOWNS: more improvements to japanese font drawing 
- made use of LordHotos graphics/sjis code to reduce code duplication
- japanese mode for version 3 and 5 works fine now with few exceptions (some line spacing glitches in MI1 intro etc.)

svn-id: r53554
 2010-10-17 13:08:00 +00:00
Johannes Schickel
36d7ec96b9 KYRA: Fix valid warnings of bug #3087837 "KYRA: Code analysis warnings". 
svn-id: r53494
 2010-10-15 14:14:10 +00:00
Max Horn
4ccce19876 ENGINES: Enhance namespace comments a bit 
svn-id: r53484
 2010-10-15 12:48:19 +00:00
Johannes Schickel
75e8452b6e OPENGL: Merged from trunk, from rev 52105 to 53396. 
This includes an rather hacky attempt to merge all the recent gp2x backend
changes into the branch. I suppose the gp2x backend and probably all new
backends, i.e. gph, dingux etc., might not compile anymore.

Since I have no way of testing those it would be nice if porters could look
into getting those up to speed in this branch.

svn-id: r53399
 2010-10-13 03:57:44 +00:00
Torbjörn Andersson
54b2a8c98d JANITORIAL: Cleanup (mostly whitespace) 
svn-id: r53161
 2010-10-12 04:19:58 +00:00
Florian Kagerer
5ce63fb78f KYRA: fix regression in Screen_v2::generateOverlay() 
(very noticeable in LOL PC-98)

svn-id: r53102
 2010-10-09 14:55:33 +00:00