Commit Graph

2430 Commits

Author SHA1 Message Date
Max Horn
4bac9e1b75 COMMON: Cleanup ConfigManager code
* get rid of ConfigManager::_emptyString
* get rid of ConfigManager::Domain::get (use getVal instead)
* remove some dead code

svn-id: r48417
2010-03-29 20:31:23 +00:00
Johannes Schickel
5315993ffc Remove pointer dereferencation in a place, where the result is not used at all.
svn-id: r48396
2010-03-24 21:39:02 +00:00
Max Horn
92c896d883 Patch #2973290: Semicolon cleanup
svn-id: r48359
2010-03-22 20:28:08 +00:00
Johannes Schickel
01f5610836 Fix out of bounds access.
svn-id: r48338
2010-03-20 20:25:37 +00:00
Max Horn
cac0ac66e2 COMMON: Get rid of Common::StringList
svn-id: r48287
2010-03-18 15:54:40 +00:00
Max Horn
d78dba3bca COMMON: Move Common::RandomSource to common/random.*
svn-id: r48279
2010-03-18 15:07:11 +00:00
Max Horn
4e99cfc549 Switch from Common::tag2string(foo).c_str() to tag2str(foo)
svn-id: r48276
2010-03-18 15:04:38 +00:00
Torbjörn Andersson
65585f6433 Silenced some harmless cppcheck warnings about unreachable code after a return.
In this case, it was always a break after a return in a switch case. There are
similar cases which cppcheck didn't detect, and a couple of cases where we have
a break after a continue in a switch case (where the continue refers to an
outer loop), but I didn't touch those. Not yet, at least.

svn-id: r48218
2010-03-10 06:39:23 +00:00
Max Horn
f24cc1c8be Tweak makeVOCDiskStream
* now takes a SeekableReadStream *pointer* like (almost) all other
  audiostream factories
* fix potential memory leak in it
* rename takeOwnershipOfStream to disposeAfterUse for consistency

svn-id: r48184
2010-03-08 10:27:42 +00:00
Johannes Schickel
4221460f6d Fix item exchange string in Kyra 1 Amiga (both English and German).
svn-id: r48159
2010-03-04 16:34:27 +00:00
Yotam Barnoy
ef330ed9b4 Patch for bug 2943361 by littleboy, adding full kb modifier support to all engines + GUI and proper keypad handling
svn-id: r48101
2010-02-21 04:04:13 +00:00
Johannes Schickel
049b4384bc Fix for bug #2954279 "KYRA: Error when loading non-existent savegame".
svn-id: r48089
2010-02-19 14:05:55 +00:00
Johannes Schickel
c8470e1d89 Use Common::KEYCODE_* instead of ASCII values for keycode comparison.
svn-id: r48079
2010-02-17 16:18:23 +00:00
Johannes Schickel
5d6b9af72a Use Common::KeyCode instead of int as key type for KeyMap.
svn-id: r48078
2010-02-17 16:08:47 +00:00
Florian Kagerer
9b6042efb4 LOL: fixed script bug in castle cimmeria that would cause out of bounds mem access (should fix bug #2948109)
svn-id: r48016
2010-02-09 21:09:29 +00:00
Florian Kagerer
d4a0375f7e LOL: fixed handling of invalid monster attack sfx in the Urbish mines (should fix bug no #2945950)
svn-id: r47967
2010-02-07 16:12:31 +00:00
Johannes Schickel
fe35d372da - Rename FlacStream to FLACStream.
- Rename makeFlacStream to makeFLACStream.

svn-id: r47846
2010-02-03 09:42:11 +00:00
Johannes Schickel
a505d32eff Replace use of Audio::makeRawMemoryStream by Audio::makeRawStream.
svn-id: r47716
2010-01-30 15:26:54 +00:00
Johannes Schickel
8e69a24783 Fix yet another use of possibly undefined behavior reported by syke.
svn-id: r47689
2010-01-29 23:52:58 +00:00
Johannes Schickel
595a2e16f1 Fix use of undefined behavior. (Thanks to syke for reporting)
svn-id: r47685
2010-01-29 22:43:23 +00:00
Johannes Schickel
812603e29e Fix invalid sample position on Timestamp to sample conversion for Stereo streams.
svn-id: r47591
2010-01-27 08:08:33 +00:00
Max Horn
1565f14bc1 Moved audio stream implementations (for MP3, FLAC, etc.) to new dir sound/decoders/
svn-id: r47579
2010-01-26 22:48:45 +00:00
Johannes Schickel
2eb16caade Remove HACK, which is obsolete because of r47336.
svn-id: r47548
2010-01-25 03:05:39 +00:00
Johannes Schickel
aed02365ec Strip trailing spaces/tabs.
svn-id: r47541
2010-01-25 01:39:44 +00:00
Torbjörn Andersson
45cbc7b265 Fixed warning.
svn-id: r47504
2010-01-24 17:24:11 +00:00
Florian Kagerer
4eb077dcf3 LOL: save/load menu speed up
svn-id: r47501
2010-01-24 15:40:36 +00:00
Max Horn
4b996e7de7 Reorder params to Audio::makeRawMemoryStream
svn-id: r47492
2010-01-23 23:55:35 +00:00
Johannes Schickel
4fcc82e7a6 Paranoia change: add some explicit terminating 0 after some strncpy uses.
svn-id: r47479
2010-01-23 16:15:18 +00:00
Max Horn
b036392a7b Get rid of deprecated makeRawDiskStream variants; rename deprecated makeRawMemoryStream variant to makeRawMemoryStream_OLD; adapt some code to this change
svn-id: r47472
2010-01-23 13:34:29 +00:00
Torbjörn Andersson
4818467908 Silenced some more cppcheck warnings. Some of these may seem silly, but the way
I figure it the changes are harmless at worst, and making them will make it
easier to find real errors in the (still quite long) list of warnings.

svn-id: r47443
2010-01-22 19:05:02 +00:00
Max Horn
dc5e08e623 Move raw audio flags from sound/mixer.h to sound/raw.h
svn-id: r47395
2010-01-19 22:30:33 +00:00
Max Horn
557bb394de Get rid of Mixer::FLAG_AUTOFREE.
Also fix several recently introduced new/delete vs. malloc/free mismatches.

svn-id: r47369
2010-01-19 00:56:29 +00:00
Max Horn
69be747621 Move raw audio streams to new header sound/raw.h
svn-id: r47368
2010-01-19 00:54:06 +00:00
Max Horn
349fcd1d71 Rename 'Linear' audio streams to 'raw'
svn-id: r47367
2010-01-19 00:52:41 +00:00
Florian Kagerer
0fd8008296 LOL: minor key map fix
svn-id: r47359
2010-01-18 19:15:05 +00:00
Florian Kagerer
4c9f323199 LOL: cleanup last commit
svn-id: r47354
2010-01-18 07:21:54 +00:00
Florian Kagerer
371a2a9ee9 LOL: fixed spell array size
svn-id: r47353
2010-01-18 00:56:30 +00:00
Johannes Schickel
e11e9338d1 Delay the time a sysEx takes to send instead of the old (incorrect) way of delaying only 45ms between two sysEx calls. (Code thankfully borrowed from waltervn).
svn-id: r47336
2010-01-17 02:42:31 +00:00
Max Horn
7ec2da968c Switch most AudioStream factories to use DisposeAfterUse::Flag
svn-id: r47334
2010-01-16 21:36:08 +00:00
Johannes Schickel
0d995c5920 Rename all "Adlib" uses to "AdLib" to match the real name of the sound card / company.
Check this for reference:
http://en.wikipedia.org/wiki/Ad_Lib,_Inc.
http://www.crossfire-designs.de/images/articles/soundcards/adlib.jpg (note the upper left of the card)

This commit does not touch "adlib" and "ADLIB" uses!

Also it does not update all the SCUMM detection entries, which still use "Adlib".

svn-id: r47279
2010-01-12 21:07:56 +00:00
Johannes Schickel
6ca0570fe3 - Add a SubLoopingAudioStream, which loops a nested part of a stream and thus features the same looping capabilites as LinearMemoryStream and LinearDiskStream.
- Remove custom looping code from LinearMemoryStream and LinearDiskStream.
- Adapt various client code to the changes.

svn-id: r47226
2010-01-10 15:20:14 +00:00
Max Horn
be8371fb07 Replace AppendableAudioStream by QueuingAudioStream
svn-id: r47189
2010-01-09 00:19:13 +00:00
Max Horn
f720d99b0a Switch Mixer::playInputStream to use DisposeAfterUse::Flag
svn-id: r47182
2010-01-08 22:09:43 +00:00
Max Horn
0cf53b025d Move DisposeAfterUse::Flag from Common to global namespace, and into a new header common/types.h
svn-id: r47180
2010-01-08 22:07:35 +00:00
Johannes Schickel
616e4626f5 Since AudioStream looping is no longer handled by the Mixer, drop Mixer::playAudioStreamLooping. (There's Audio::makeLoopingAudioStream).
svn-id: r47160
2010-01-08 16:27:29 +00:00
Johannes Schickel
297a955579 - Simplify Audio::calculateSampleOffset.
- Made Audio::calculateSampleOffset accessable from outside audiostream.cpp.
- Adapt KYRA's AUDStream to use Audio::calculateSampleOffset.

svn-id: r47082
2010-01-06 15:40:49 +00:00
Johannes Schickel
0e420431fd Adapt KYRA to use the new FLAC, Vorbis and MP3 factories.
svn-id: r47062
2010-01-06 00:00:25 +00:00
Johannes Schickel
79ee2b0895 Properly adapt AUDStream to be a SeekableAudioStream and switched KYRA3 to use playAudioStreamLooping for its looping purposes.
svn-id: r47060
2010-01-05 23:05:31 +00:00
Johannes Schickel
920dac2f9d Remove unsafe getTotalPlayTime from AudioStream.
svn-id: r47037
2010-01-05 20:14:28 +00:00
Johannes Schickel
e9a94ecb9b Add a "getLength" function to SeekableAudioStream.
svn-id: r47036
2010-01-05 20:13:31 +00:00
Johannes Schickel
f5c3bd887e - Add a new SeekableAudioStream interface. Soon to be used to replace audio stream specific looping code by generic code in Mixer...
- Adapted some existing AudioStreams to implement that interface (not tested!)

svn-id: r47013
2010-01-05 02:27:24 +00:00
Torbjörn Andersson
72eb9ec9ea Fixed a bunch of cppcheck warnings. Mostly about checking if a pointer is null
before freeing it, which isn't necessary.

svn-id: r46941
2010-01-03 19:37:43 +00:00
Johannes Schickel
c671c17258 Use Common::StackLock.
svn-id: r46870
2010-01-02 00:54:11 +00:00
Florian Kagerer
998d511eeb LOL: cleanup
svn-id: r46866
2010-01-01 23:57:16 +00:00
Johannes Schickel
8817d6eeb5 Merge update_nop1 and update_nop2.
svn-id: r46860
2010-01-01 22:33:45 +00:00
Johannes Schickel
82b4b65bdc - Fix out of bounds array access.
- Add some asserts in output related functions

svn-id: r46859
2010-01-01 22:26:26 +00:00
Johannes Schickel
671cc15bd1 - Add some asserts
- Renamed snd_unkOpcode3 to snd_stopChannel
- Cleanup

svn-id: r46855
2010-01-01 21:59:11 +00:00
Johannes Schickel
e757e7a60a Fix out of bounds access reported by syke.
svn-id: r46844
2010-01-01 19:45:49 +00:00
Florian Kagerer
9f63095688 LOL: fixed debug message
svn-id: r46675
2009-12-28 15:08:53 +00:00
Florian Kagerer
2a0b03218c LOL: - added workaround for portrait speech animations which would sometimes "freeze"
- renamed some stuff

svn-id: r46601
2009-12-26 19:02:16 +00:00
Florian Kagerer
193b23bcad LOL: fixed minor bug in lamp code
svn-id: r46587
2009-12-26 14:12:38 +00:00
Florian Kagerer
7bf92fc795 LOL: fixed minor bug in lamp code
svn-id: r46534
2009-12-24 18:41:26 +00:00
Florian Kagerer
c1eaafcac7 LOL: removed unused variable
svn-id: r46434
2009-12-20 16:23:44 +00:00
Florian Kagerer
a21a808250 LOL: fixed text fading
svn-id: r46431
2009-12-20 14:11:56 +00:00
Florian Kagerer
42c306208b LOL: fixed regression
svn-id: r46366
2009-12-13 20:37:26 +00:00
Florian Kagerer
adba314fc6 LOL: some cleanup for recent code changes
svn-id: r46358
2009-12-13 15:19:56 +00:00
Florian Kagerer
35c695929a LOL: fixed regression
svn-id: r46354
2009-12-12 21:21:38 +00:00
Florian Kagerer
90b4d4b45c LOL: fix compilation when the LOL engine is disabled
svn-id: r46352
2009-12-12 20:50:41 +00:00
Florian Kagerer
f4c54fb636 LOL: moved TIM animation code into a separate class
svn-id: r46351
2009-12-12 20:06:42 +00:00
Max Horn
c8873d8492 Changed MidiDriver::createMidi to take a MidiDriverType instead of an int
svn-id: r46316
2009-12-09 18:12:51 +00:00
Johannes Schickel
babb38230e Hopefully silencing C4121 in MSVC.
svn-id: r46278
2009-12-07 16:21:33 +00:00
Johannes Schickel
3b7082c32b Fix overflow of glyph count for CREDIT6.FNT, this fixes credits for Kyra1 floppy/FM-TOWNS/PC98.
svn-id: r46269
2009-12-06 00:54:24 +00:00
Torbjörn Andersson
039d7d5e1c Removed unnecessary semi-colons.
svn-id: r46232
2009-12-01 19:19:58 +00:00
Johannes Schickel
780ede2e71 Formatting.
svn-id: r46195
2009-11-29 13:55:26 +00:00
Johannes Schickel
46cf13307d Cleanup.
svn-id: r46194
2009-11-29 13:52:02 +00:00
Florian Kagerer
4f84154875 KYRA/PC98: fixed regression
svn-id: r46190
2009-11-29 12:18:42 +00:00
Florian Kagerer
8b0f3ee4b5 KYRA: fixed pc98 intro sfx (regression)
svn-id: r46185
2009-11-29 00:39:22 +00:00
Florian Kagerer
5f3e54fcb7 KYRA: removed hack in staticres loader
svn-id: r46181
2009-11-28 23:44:06 +00:00
Florian Kagerer
c7371320d6 KYRA: added HOF PC-98 static data to kyra.dat
svn-id: r46180
2009-11-28 23:34:12 +00:00
Johannes Schickel
0e5de0c36d Fix for bug #2905439 "AmigaOS: Recent Kryandia changes broke compilation".
svn-id: r46178
2009-11-28 20:13:45 +00:00
Florian Kagerer
ac19f4146b LOL/Floppy: fixed crash
svn-id: r46177
2009-11-28 20:08:20 +00:00
Johannes Schickel
6fb79b8b3c Fix compilation on 64bit systems.
svn-id: r46176
2009-11-28 18:58:55 +00:00
Florian Kagerer
5905b9e479 LOL: completed support for floppy installer files
svn-id: r46174
2009-11-28 18:40:37 +00:00
Johannes Schickel
109dff89dd Typos.
svn-id: r46159
2009-11-26 20:33:27 +00:00
Johannes Schickel
40f038c7f1 Initial doxygen description of the Kyrandia engine.
svn-id: r46158
2009-11-26 19:50:09 +00:00
Max Horn
df651bf20f Added Doxygen comments for the various engine namespaces (currently mostly without details; help filling these out is welcome)
svn-id: r46128
2009-11-24 22:10:14 +00:00
Max Horn
0d9609f7f9 Fix incorrectly placed doxygen comments; replace Common::ID2string by Common::tag2string
svn-id: r46127
2009-11-24 22:08:34 +00:00
Johannes Schickel
485159f0dc Slight simplification.
svn-id: r46093
2009-11-22 18:21:40 +00:00
Johannes Schickel
fa84949479 Remove dead code.
svn-id: r46092
2009-11-22 18:17:05 +00:00
Johannes Schickel
d2d3a9a9eb - Store ID map for static resources in kyra.dat instead of hardcoding it in the main KYRA source
- Changed how static resource types are specified
- Rebuilt kyra.dat

svn-id: r46091
2009-11-22 18:16:25 +00:00
Johannes Schickel
a2b056c288 More cleanup.
svn-id: r46055
2009-11-21 23:44:52 +00:00
Johannes Schickel
ed1c0fcde8 Cleanup.
svn-id: r46054
2009-11-21 23:23:07 +00:00
Johannes Schickel
d167197a52 Cleanup: remove never used support for builtin static data in StaticResource.
svn-id: r46053
2009-11-21 23:06:22 +00:00
Johannes Schickel
77fda6cf93 Cleanup.
svn-id: r46052
2009-11-21 23:05:25 +00:00
Johannes Schickel
ea5bf444d3 Fix mismatching resource type IDs for Lands of Lore in kyra.dat.
svn-id: r46051
2009-11-21 22:15:20 +00:00
Johannes Schickel
1ade0efbf2 Flag credits data for Kyrandia 1 as language specific data. (Fixes language of credits for Amiga versions.)
svn-id: r46049
2009-11-21 20:30:38 +00:00
Johannes Schickel
1ba750063c Ooops...
svn-id: r46048
2009-11-21 20:26:55 +00:00
Johannes Schickel
bf5ce985a0 - Got rid of hardcoded filename list for kyra.dat
- Synced static resource definitions between KYRA main codebase and create_kyradat
- Rebuilt kyra.dat

svn-id: r46047
2009-11-21 20:20:24 +00:00
Johannes Schickel
7a8e452f12 Change special palette loading for Kyrandia 1 from kyra.dat to match kyra.dat internals.
svn-id: r46040
2009-11-21 17:05:33 +00:00
Johannes Schickel
3ee2d9375c Changed kyra.dat to use a global "INDEX" file instead of INDEX files for every game variant.
svn-id: r46025
2009-11-20 21:25:36 +00:00
Johannes Schickel
90ba6a8c7a Flag Kyra3 as talkie version in kyra.dat.
svn-id: r46022
2009-11-20 21:24:15 +00:00
Florian Kagerer
1a984d8e7d LOL: add support for pc speaker sfx
svn-id: r45992
2009-11-19 22:17:27 +00:00
Johannes Schickel
2a4e630967 Properly handle Kyra 2 Talkie demo in kyra.dat.
svn-id: r45990
2009-11-19 17:44:19 +00:00
Florian Kagerer
99111a75c1 KYRA: fixed save menu glitch in Japanese versions
svn-id: r45956
2009-11-17 16:26:40 +00:00
Florian Kagerer
3013a63890 LOL: fixed minor glitch in the ending sequence
svn-id: r45933
2009-11-15 23:26:47 +00:00
Florian Kagerer
9a57665abf LOL/PC-98: fixed regression (missing static data for pc98 version)
svn-id: r45927
2009-11-15 21:25:26 +00:00
Johannes Schickel
d3fb917ee8 Formatting.
svn-id: r45909
2009-11-15 02:37:15 +00:00
Florian Kagerer
4f85684931 KYRA: cleanup
svn-id: r45908
2009-11-15 00:53:57 +00:00
Johannes Schickel
c80456dd17 Fix warning.
svn-id: r45907
2009-11-14 23:01:51 +00:00
Florian Kagerer
9bd5e07d90 KYRA: added kyra 1 pc98 static data to kyra.dat (intro forest sequence is still broken)
svn-id: r45906
2009-11-14 22:51:35 +00:00
Johannes Schickel
b9b5511b3c Cleanup.
svn-id: r45904
2009-11-14 19:34:44 +00:00
Florian Kagerer
e36594dbe9 LOL: - cleanup
svn-id: r45852
2009-11-12 07:41:33 +00:00
Florian Kagerer
c0fc64ecbf LOL: - fixed transparency tables in PC-98 16 color version
- renamed some variables

svn-id: r45847
2009-11-11 23:05:19 +00:00
Johannes Schickel
c2a5b3feea Fix some delays in Kyrandia 1 when clicking very often, while a sequence plays.
svn-id: r45731
2009-11-07 15:06:49 +00:00
Johannes Schickel
0d79ace422 Access _keyMap a little different, so that no additional entries are created, when an unmapped key is pressed.
svn-id: r45730
2009-11-07 15:06:25 +00:00
Johannes Schickel
373b5d1013 Formatting.
svn-id: r45729
2009-11-07 15:06:03 +00:00
Max Horn
51933629d1 Changed foo(void) to foo() in almost all non-backend source files
svn-id: r45616
2009-11-02 21:54:57 +00:00
Florian Kagerer
0bf6303213 Kyra/FM-Towns: make sure that at least the synthesizer music plays when no cd audio tracks are found
svn-id: r45589
2009-11-01 01:31:23 +00:00
Johannes Schickel
a510481202 Clean up comment a bit.
svn-id: r45583
2009-10-31 19:59:48 +00:00
Johannes Schickel
fa506b5f0a Fix missing inventory in Kyrandia 1 PC98 16 color version, when loading a save via launcher or command line.
svn-id: r45581
2009-10-31 19:53:52 +00:00
Johannes Schickel
45208bc53d Fix certain scenes incorrectly appearing as fireberry bushes in floppy/FM-Towns/PC98 versions of Kyrandia 1.
svn-id: r45580
2009-10-31 19:52:46 +00:00
Johannes Schickel
93d26113fd Fix some memory leaks in Kyrandia 1 (this hopefully fixes crashes on NDS after a long playtime).
svn-id: r45572
2009-10-31 18:32:17 +00:00
Johannes Schickel
0a1a4c7eb4 Fix regression in r45414.
svn-id: r45495
2009-10-29 00:14:09 +00:00
Johannes Schickel
a30b8f0bdc - Fix some missing initialization warnings from cppcheck
- Fix two invalid memory accesses reported by cppcheck

svn-id: r45414
2009-10-26 20:07:37 +00:00
Florian Kagerer
b07e8d3c20 LOL: fixed bug in spell casting code
svn-id: r45361
2009-10-24 18:52:57 +00:00
Florian Kagerer
6248d3a21d LOL: fixed minor regression
svn-id: r45349
2009-10-23 19:20:59 +00:00
Florian Kagerer
1fb02d2c4b LOL/PC-98: fixed glitch in text displayer
svn-id: r45276
2009-10-20 18:34:12 +00:00
Florian Kagerer
557f32cdb1 LOL/PC-98: match vaelan's cube behaviour with original code
svn-id: r45252
2009-10-19 21:27:39 +00:00
Max Horn
2bbf708dea Introduced new type Common::DisposeAfterUse::Flag
svn-id: r45233
2009-10-18 19:41:59 +00:00
Florian Kagerer
237b66beca LOL: - added some updateInputs to spell animation code
- improved sfx volume code

svn-id: r45227
2009-10-18 17:28:00 +00:00
Florian Kagerer
8b993ce863 LOL: this should fix a valgrind warning
svn-id: r45221
2009-10-18 12:47:54 +00:00
Florian Kagerer
4b1f310f2d LOL: this (hopefully) fixes a minor glitch that might occur when using the freeze spell
svn-id: r45210
2009-10-17 23:52:57 +00:00
Johannes Schickel
bcac203098 Fix memory leak.
svn-id: r45208
2009-10-17 22:47:42 +00:00
Johannes Schickel
f62f3eea89 Fix valgrind warning.
svn-id: r45207
2009-10-17 22:47:21 +00:00
Johannes Schickel
51975b50cb Add LoL PC98 credits entries to kyra.dat.
svn-id: r45082
2009-10-14 14:17:15 +00:00
Florian Kagerer
73fa80d940 LOL/PC-98: fixed outro
svn-id: r45046
2009-10-13 19:48:41 +00:00
Florian Kagerer
c693401dce LOL/PC-98: fix decoration shape drawing
svn-id: r44947
2009-10-11 20:41:02 +00:00
Florian Kagerer
2109a0ff9d LOL/PC-98: cleanup
svn-id: r44946
2009-10-11 20:29:38 +00:00
Florian Kagerer
7449091202 KYRA: fix sjis dialgue text display
svn-id: r44943
2009-10-11 20:09:35 +00:00
Florian Kagerer
22ffa71c0a LOL/PC-98: fix outro music
svn-id: r44941
2009-10-11 19:33:38 +00:00
Florian Kagerer
16e852159a LOL/PC-98: fix king richard healing sequence
svn-id: r44936
2009-10-11 18:40:21 +00:00
Johannes Schickel
097d6d298d Print warning, when the number of colors in a palette file exceed the number of colors in the target palette on load.
svn-id: r44922
2009-10-11 13:54:35 +00:00
Johannes Schickel
f4288516e8 Revert commits r44912 and r44905, seems like the original FM-Towns/PC98 games did only allow ASCII input, thus they didn't use the SJIS font in the save/load menus.
svn-id: r44916
2009-10-11 12:51:13 +00:00
Johannes Schickel
47988039ea Fix text input font for LoL PC98.
svn-id: r44912
2009-10-11 12:05:55 +00:00
Johannes Schickel
e90f337bd2 Fix regression introduced with r44907.
svn-id: r44911
2009-10-11 12:01:20 +00:00
Johannes Schickel
ea28351862 Cleanup.
svn-id: r44907
2009-10-11 11:34:30 +00:00
Johannes Schickel
6e93add43f Cleanup.
svn-id: r44906
2009-10-11 11:30:24 +00:00
Johannes Schickel
8f6e9f0bf2 Fix FM-Towns/PC98 menu code.
svn-id: r44905
2009-10-11 11:29:34 +00:00
Johannes Schickel
6492c00a3a Revert changes to graphics/sjis.h in r44709.
svn-id: r44904
2009-10-11 11:28:43 +00:00
Florian Kagerer
7c065c84cb LOL/PC-98: implemented drawing code for teleporters
svn-id: r44883
2009-10-10 18:45:33 +00:00
Florian Kagerer
a15cf067a7 LOL/PC-98: fixed minor glitch in wsa code
svn-id: r44879
2009-10-10 17:15:10 +00:00
Florian Kagerer
3e259dea30 LOL/PC-98: fixed two minor bugs
svn-id: r44870
2009-10-10 12:29:36 +00:00
Max Horn
d0876b06ed Remove some unused variables
svn-id: r44853
2009-10-09 22:21:45 +00:00
Florian Kagerer
6f1c43a731 LOL/PC-98: fixed last commit
svn-id: r44849
2009-10-09 21:42:37 +00:00
Max Horn
a8cd7694cc Fix warnings about non-static const member in class without a constructor
svn-id: r44848
2009-10-09 21:36:09 +00:00
Florian Kagerer
0d7d2b8371 LOL/PC-98: fixed monster drawing bug (some wrong pixels)
svn-id: r44847
2009-10-09 21:35:48 +00:00
Florian Kagerer
7825128639 LOL/PC-98: fixed minor bugs in text displayer
svn-id: r44834
2009-10-09 17:31:01 +00:00
Florian Kagerer
64c4a8f901 LOL/PC-98: fixed lightning spell
svn-id: r44798
2009-10-08 20:37:10 +00:00
Florian Kagerer
f8cdacdeea LOLLOL/PC-98: fixed add-spell-to-scroll animation
svn-id: r44797
2009-10-08 20:22:12 +00:00
Florian Kagerer
a121c822eb LOLLOL/PC-98: fixed ghorka swamp freeze mode
svn-id: r44794
2009-10-08 19:42:39 +00:00
Florian Kagerer
35f8e6ec05 LOL/PC-98: fixed freeze spell
svn-id: r44753
2009-10-07 20:25:49 +00:00
Florian Kagerer
4991a87b53 Kyra: fix kyra 3 font
svn-id: r44710
2009-10-06 17:28:32 +00:00
Florian Kagerer
45fda46cf3 KYRA/LOL: - get rid of ascii/sjis detection which could cause problems when typing savegame names
- fixed some minor bugs

svn-id: r44709
2009-10-06 17:22:40 +00:00
Max Horn
f242266f6d Change a couple places from 'end of namespace' to 'End of namespace', for consistency
svn-id: r44634
2009-10-04 21:26:33 +00:00
Johannes Schickel
eaca55ee50 Some fixes to comply with our coding guidelines.
svn-id: r44624
2009-10-04 17:54:08 +00:00
Johannes Schickel
41e4a1ddb6 LoL PC98: Fix thumbnail creation for quick saves and autosave.
svn-id: r44623
2009-10-04 17:38:15 +00:00
Johannes Schickel
fc4d7b7d1d LoL PC98: Fix thumbnail generation via ingame menu.
svn-id: r44622
2009-10-04 17:37:46 +00:00
Florian Kagerer
ae737ca2c2 LOL/PC-98: fixed save menu
svn-id: r44608
2009-10-04 15:12:05 +00:00
Florian Kagerer
f8e8e764ce LOL/PC-98: some more work on sjis font support for the text displayer
svn-id: r44602
2009-10-04 11:42:26 +00:00
Florian Kagerer
b8e02a03c1 LOL: fixed minor bugs in text displayer
svn-id: r44582
2009-10-04 01:05:27 +00:00
Florian Kagerer
0e5836bb34 LOL/PC-98: add keyboard support for menus
svn-id: r44577
2009-10-03 22:39:46 +00:00
Florian Kagerer
f6de0b4ec9 LOL/PC-98: add keyboard support
svn-id: r44564
2009-10-03 20:42:26 +00:00
Florian Kagerer
e515b57b67 LOL/PC-98: fixed automap
svn-id: r44554
2009-10-03 13:42:24 +00:00
Florian Kagerer
548d139b48 LOL: cleanup
svn-id: r44549
2009-10-02 23:13:47 +00:00
Florian Kagerer
14d6b33e4f LOL/PC-98: fixed death menu, live/magic bar colors and money box
svn-id: r44548
2009-10-02 22:13:39 +00:00
Florian Kagerer
e5aae67e39 LOL/PC-98: - some more fixes for level graphics (shapes are still not quite right)
- fixed heal spell

svn-id: r44547
2009-10-02 21:27:10 +00:00
Florian Kagerer
598056ead0 LOL/PC-98: - fixed TIM dialogue button text colors
- fixed menu text alignment

svn-id: r44501
2009-09-30 21:46:00 +00:00
Florian Kagerer
94572773d0 LOL/PC-98: - fix spell effect colors
- fix some font color glitches

svn-id: r44498
2009-09-30 20:42:58 +00:00
Max Horn
8ba75fc522 Fix code formatting (esp. 'if(' -> 'if (' etc., but also indention and other things)
svn-id: r44495
2009-09-30 16:16:53 +00:00
Johannes Schickel
2240886315 Got rid of old workaround, which was only needed because our SJIS font did not feature any ASCII chars.
svn-id: r44489
2009-09-30 14:54:18 +00:00
Johannes Schickel
438244a016 Adapt KYRA engine to use the ASCII and half-width katakana support of the SJIS font. (required for LoL PC98)
svn-id: r44488
2009-09-30 14:53:57 +00:00
Johannes Schickel
b8c7237d12 Cleanup: got rid of Screen::ShadeType.
svn-id: r44487
2009-09-30 14:53:34 +00:00
Johannes Schickel
03a26923c9 Implemented support for drawing 8x16 chars from our custom SJIS font.
svn-id: r44486
2009-09-30 14:53:07 +00:00
Johannes Schickel
95cd669efb Fix for bug #2868581 "KYRA1: Invisible Brandon".
svn-id: r44450
2009-09-28 21:58:48 +00:00
Florian Kagerer
00504a893b LOL/PC-98: fix menu colors
svn-id: r44381
2009-09-26 21:17:47 +00:00
Florian Kagerer
5d17bae120 LOL/PC-98: more fixes for text displayer and character inventory
svn-id: r44380
2009-09-26 18:25:36 +00:00
Florian Kagerer
84accad507 LOL/PC-98: start fixing sequences (like broken arms inn and king richard getting poisoned)
svn-id: r44375
2009-09-26 13:17:11 +00:00
Florian Kagerer
73a4b7857f LOL/PC-98: fixed gui colors (money stash, live and magic bars, scroll)
svn-id: r44370
2009-09-25 22:07:34 +00:00
Florian Kagerer
77a27acf83 LOL/PC-98: fixed dialoge box sizes
svn-id: r44369
2009-09-25 21:33:00 +00:00
Florian Kagerer
229aee065c LOL/PC-98: start fixing text displayer
svn-id: r44363
2009-09-25 18:56:53 +00:00
Filippos Karapetis
b4f1960318 Reverted parts of revisions #44298, #44299 and #44300, to prevent warnings and issues in compilers which don't support NORETURN
svn-id: r44314
2009-09-24 17:52:53 +00:00
Johannes Schickel
0ea3cde160 Turn an error into a warning.
svn-id: r44313
2009-09-24 17:28:14 +00:00
Filippos Karapetis
16d7d9ba23 Fixed some more warnings about unreachable code
svn-id: r44299
2009-09-24 10:02:13 +00:00
Johannes Schickel
9eabcb7baa Cleanup.
svn-id: r44228
2009-09-20 23:56:42 +00:00
Johannes Schickel
df4978b776 Fix valgrind warning.
svn-id: r44227
2009-09-20 23:56:21 +00:00
Johannes Schickel
c9d8146c64 Fix compilation under Linux.
svn-id: r44226
2009-09-20 23:38:35 +00:00
Florian Kagerer
4d9258d3e5 LOL/PC-98: start fixing color issues (still not working correctly though)
svn-id: r44223
2009-09-20 23:25:39 +00:00
Johannes Schickel
a9f1063ae1 Some more paranoia asserts.
svn-id: r44217
2009-09-20 16:56:44 +00:00
Johannes Schickel
af553f33fa Implement yet another slight palette handling difference in Kyrandia 1 Amiga, which caused a palette glitch in Kyrandia 1 Amiga German.
svn-id: r44216
2009-09-20 16:54:44 +00:00
Johannes Schickel
5bed17efa9 - Add support for Kyrandia 1 German Amiga in create_kyradat.
- Increase kyra.dat version.
- Rebuilt kyra.dat.
- Some slight adaptions for Kyrandia 1 German in the ScummVM source.

svn-id: r44215
2009-09-20 16:54:23 +00:00
Johannes Schickel
7c2e3aaa44 Fix removal of SJIS characters in LoL PC98 menu.
svn-id: r44213
2009-09-20 15:01:50 +00:00
Johannes Schickel
156f9d4899 Fix language settings in LoL PC98, this fixes the ingame menu usage.
svn-id: r44212
2009-09-20 14:44:15 +00:00
Johannes Schickel
6236a88ac2 This hopefully fixes threading issues in PC98 sound driver.
svn-id: r44210
2009-09-20 14:29:08 +00:00
Johannes Schickel
566ea2f57e Implement slight differences for PC98 version in TextDisplayer_LoL::printDialogueText and TextDisplayer_LoL::preprocessString.
svn-id: r44209
2009-09-20 14:16:31 +00:00
Johannes Schickel
46b3779ae5 Fix bug in LoLEngine::decodeSjis.
svn-id: r44208
2009-09-20 13:21:18 +00:00
Johannes Schickel
59f72d111f Add checks for half-width katakana, which are currently unsupported.
svn-id: r44204
2009-09-20 12:44:35 +00:00
Florian Kagerer
5acbc3c482 LOL/PC-98: fixed block drawing (colors are still wrong)
svn-id: r44198
2009-09-19 23:51:19 +00:00
Florian Kagerer
ea2b6d12dc LOL/PC-98: fix some asserts
svn-id: r44197
2009-09-19 17:39:31 +00:00
Florian Kagerer
6e4f1482c1 LOL: fix warning/error
svn-id: r44196
2009-09-19 13:29:21 +00:00
Florian Kagerer
8f4bba878f LOL: start on pc98 support (still messed up and not working though)
svn-id: r44195
2009-09-19 13:17:55 +00:00
Johannes Schickel
39b071bed5 Call updateScreen after setScreenPalette in olol_restoreMagicShroud, so that the palette is updated correctly.
svn-id: r44182
2009-09-18 12:38:11 +00:00
Johannes Schickel
e4fd4e827c Fix some memory leaks, caused by a recent regression in StaticResource::unloadId.
svn-id: r44180
2009-09-18 11:38:01 +00:00
Florian Kagerer
559f1f087b LOL: cleanup (replaced some uint8 arrays with new palette objects)
svn-id: r44179
2009-09-17 22:22:25 +00:00
Florian Kagerer
35de9e6e3e LOL/Floppy: fix king richard healing sequence
svn-id: r44178
2009-09-17 20:56:25 +00:00
Johannes Schickel
bb7463638e - Add preliminary support for Lands of Lore PC98 in create_kyradat
- Increase kyra.dat version
- Rebuilt kyra.dat

svn-id: r44177
2009-09-17 19:51:16 +00:00
Johannes Schickel
cfd6d4722c Changed olol_restoreMagicShroud to be a bit more talkative on errors.
svn-id: r44174
2009-09-17 17:14:38 +00:00
Johannes Schickel
cbf0ca2f6d Typo.
svn-id: r44165
2009-09-17 16:08:27 +00:00
Johannes Schickel
d9ea1fd3d5 Enable delay for Ninteno DS in all occasions in o2_isAnySoundPlaying.
svn-id: r44164
2009-09-17 16:03:48 +00:00
Johannes Schickel
d98b1472ca Add workaround in "o2_isAnySoundPlaying", which will hopefully make Kyra2 work on the Nintendo DS.
svn-id: r44163
2009-09-17 16:01:21 +00:00
Johannes Schickel
f0ccad5bbd - Increase kyra.dat version
- Fix language settings of some game entries

svn-id: r44157
2009-09-17 13:46:01 +00:00
Johannes Schickel
f8f776364e Increase kyra.dat version.
svn-id: r44119
2009-09-16 21:07:14 +00:00
Florian Kagerer
361fd53ef3 Kyra/LoL: fix pc98 audio driver destructor
svn-id: r44117
2009-09-16 20:42:10 +00:00
Florian Kagerer
811596fde2 LOL/Floppy: fixed outro
svn-id: r44116
2009-09-16 20:05:12 +00:00
Florian Kagerer
8a29adab6f LOL: fix some regressions
svn-id: r44092
2009-09-14 22:24:30 +00:00
Johannes Schickel
b6d33f1667 - Cleanup
- Fix mismatching new[]/delete

svn-id: r44075
2009-09-13 21:48:02 +00:00
Florian Kagerer
b73f9ab41e KYRA: - add sfx support for PC98-Version
svn-id: r44074
2009-09-13 21:41:29 +00:00
Johannes Schickel
16305d3b29 Preliminary support for German Kyrandia 1 Amiga.
svn-id: r44071
2009-09-13 21:05:52 +00:00
Johannes Schickel
6488cdc4fc Fix gcc warning.
svn-id: r44070
2009-09-13 20:21:08 +00:00
Johannes Schickel
072aca05dc Modify Kyrandia 1 Amiga detection entry to allow the detector to differentiate between different languages.
svn-id: r44069
2009-09-13 20:10:56 +00:00
Johannes Schickel
7cc0ff23a0 Proper fix for bug #2835715 "KYRA: GFX glitch at the bridge". The old fix broke saves, which were made in front of the castle door.
svn-id: r44065
2009-09-13 19:54:41 +00:00
Johannes Schickel
0af418e7ea Fix regression caused by OSystem::updateScreen call limitation, which caused certain animations not to display at all.
svn-id: r44063
2009-09-13 18:37:19 +00:00
Johannes Schickel
a2900bf246 Fix bug when skipping Kyrandia 1 Intro, when no restart save game file is present.
svn-id: r44062
2009-09-13 18:35:42 +00:00
Florian Kagerer
525c084456 LOL/Floppy: fixed size of menu boxes
svn-id: r44061
2009-09-13 14:44:37 +00:00
Florian Kagerer
6d24808bc2 LOL: add missing opcode
svn-id: r44053
2009-09-13 11:04:52 +00:00
Florian Kagerer
5e57474eb9 LOL: fix bug that would sometimes accidently swap the freeze palette and the normal palette in the ghorka swamp
svn-id: r44040
2009-09-12 13:16:47 +00:00
Florian Kagerer
5c2f872ba4 LOL: added another missing opcode
svn-id: r44037
2009-09-11 21:31:14 +00:00
Florian Kagerer
4e34275af1 LOL: add missing opcode
svn-id: r44036
2009-09-11 21:15:48 +00:00
Florian Kagerer
68ae279aff LOL/Floppy: fixed gfx tables generation
svn-id: r44034
2009-09-11 17:38:36 +00:00
Florian Kagerer
3259a6f0b5 LOL/Floppy: - fix spell book animation
svn-id: r44021
2009-09-09 22:12:21 +00:00
Florian Kagerer
7e3616f3a5 LOL/Floppy: implemented missing opcode
svn-id: r43997
2009-09-06 23:02:52 +00:00
Florian Kagerer
c5b2840f98 LOL: add message to load/delete menus when no save files are present
svn-id: r43992
2009-09-06 18:39:03 +00:00
Florian Kagerer
25429b6605 LOL: fixed bug in delete menu code
svn-id: r43991
2009-09-06 17:04:58 +00:00
Florian Kagerer
0c6aa2ef0d LOL: fixed warning
svn-id: r43971
2009-09-06 01:30:45 +00:00
Florian Kagerer
79228dbd45 LOL/Floppy: fix menus
svn-id: r43970
2009-09-06 01:24:54 +00:00
Florian Kagerer
5d8453b09d LOL/Floppy: fix compass
svn-id: r43968
2009-09-05 22:28:18 +00:00
Florian Kagerer
a4cf9a39e5 LOL/Floppy: fix bug in dialogue displayer
svn-id: r43967
2009-09-05 22:00:17 +00:00
Florian Kagerer
295f432b87 LOL: fix floppy version static data
svn-id: r43962
2009-09-05 15:57:41 +00:00
Florian Kagerer
99df32af02 LOL: fix inventory drawing in floppy version
svn-id: r43960
2009-09-05 14:15:36 +00:00
Florian Kagerer
1dfb5c2b30 LOL: some more work on the floppy version (drawing code is still broken)
svn-id: r43923
2009-09-03 21:03:10 +00:00
Florian Kagerer
3dca56bdd5 LOL: - fix speech/text settings
- start fixing floppy version

svn-id: r43914
2009-09-02 23:42:07 +00:00