Commit Graph

8012 Commits

Author SHA1 Message Date
Max Horn
a6dd4b7d4d Moved base/game.* to engines/game.*
svn-id: r34589
2008-09-17 17:31:29 +00:00
Max Horn
bf76057ec4 Removed tons of unused 'length' variables, to silence compiler warnings
svn-id: r34585
2008-09-16 20:12:25 +00:00
Johannes Schickel
3739662b75 Added support for SCUMM savestates date/time and playtime info in the launcher load dialog.
svn-id: r34583
2008-09-16 14:56:02 +00:00
Johannes Schickel
2e9e661d5f Cleanup.
svn-id: r34582
2008-09-16 14:22:51 +00:00
Johannes Schickel
259d87a8a6 Added "querySaveMetaInfos" to MetaEngine.
-> Allows easy addition of save state specific infos like playtime, save date atc.
 -> Removed MetaEngine::loadThumbnailFromSlot, superseded by meta infos
 -> Changed SCUMM / KYRA to implement the newly added functionallity
 -> Removed hack in KYRAs listSavefiles, which is now handled via meta infos

svn-id: r34581
2008-09-16 14:10:55 +00:00
Filippos Karapetis
6a4d96649e - Moved some includes away from drascula.h
- Moved grr() to talk.cpp
- Removed the unnecessary parameter length from isTalkFinished()

svn-id: r34577
2008-09-16 11:49:40 +00:00
Max Horn
706fb37061 Modified uncompress in common/zlib.h to return a bool, so that we don't have to #include the real zlib.h; fixed PSP backend to not run uncompress inside an assert (which would cause it to not be invoked when turning off asserts)
svn-id: r34576
2008-09-16 11:42:21 +00:00
Filippos Karapetis
3bffca569f Fixed some glitches in the last part of Von Braun's story
svn-id: r34575
2008-09-16 10:53:57 +00:00
Filippos Karapetis
d95e0059a2 Cleaned up and fixed the cutscene with Von Braun's story. Fixes bugs #2111804 - "DRASCULA: Cut scene bugs" and #2059648 - "DRASCULA: VonBraun's song"
svn-id: r34574
2008-09-16 10:44:07 +00:00
Filippos Karapetis
c36c58ca40 Removed the confirmation speech when a game is saved - it's "99.als" instead of "s99.als", but the main problem is that it's not translated in the English version and it's in Spanish (plus it's creepy and annoying...)
svn-id: r34573
2008-09-16 08:24:42 +00:00
Filippos Karapetis
2748701dbe Assign _lang to the appropriate enum values
svn-id: r34572
2008-09-16 08:12:13 +00:00
Filippos Karapetis
4fced32082 Added a workaround to skip the silence in the beginning and end of file 3.als. Fixes bug #2111815 - "DRASCULA: Voice delayed"
svn-id: r34571
2008-09-16 08:10:08 +00:00
Filippos Karapetis
c655d72f5a - Fixed centerText() to print text at the correct height
- Removed some duplicate code

svn-id: r34569
2008-09-16 07:16:26 +00:00
Max Horn
880bc085b1 Fixed compiler warnings
svn-id: r34567
2008-09-15 22:37:45 +00:00
Willem Jan Palenstijn
395536be6e also check for premature end-of-stream when loading
svn-id: r34563
2008-09-15 19:34:06 +00:00
Filippos Karapetis
2884da1452 Show the blind man's dialog text at a bit better place
svn-id: r34561
2008-09-15 14:35:11 +00:00
Filippos Karapetis
7cac97629a Remove a workaround in textFitsCentered(). The blind man's dialog is a bit better placed now
svn-id: r34560
2008-09-15 14:17:51 +00:00
Filippos Karapetis
8a9dd3345e Fixed the phrase told by the protagonist when he talks to the blind man the second time
svn-id: r34559
2008-09-15 13:45:10 +00:00
Filippos Karapetis
7cf7f4bbf6 Rewrote the very confusing centerText() function into something that makes more sense, and matches the way that the original printed text on screen (in most cases)
Fixes bugs #2102657 - "DRASCULA: Crash when talking to the piano player" and #2111820 - "DRASCULA: Dialog texts too long"

svn-id: r34558
2008-09-15 13:37:28 +00:00
Travis Howell
1b34b58c01 Replace ioFailed by err.
svn-id: r34557
2008-09-15 12:37:24 +00:00
Filippos Karapetis
621847b2e2 Proper check for eos(), after the latest changes to OSystem
svn-id: r34554
2008-09-15 09:17:18 +00:00
Willem Jan Palenstijn
1e3402fb0c replace ioFailed by err
svn-id: r34553
2008-09-15 06:52:00 +00:00
Willem Jan Palenstijn
0046481763 fix listSaveGames
svn-id: r34552
2008-09-15 06:51:15 +00:00
Johannes Schickel
c1458bd2bb Fixed regression introduced with latest stream changes (it seems compressed savefiles ioFailed never returned true when only eos was set).
svn-id: r34551
2008-09-14 23:14:38 +00:00
Willem Jan Palenstijn
c8eeae8d4d Big patch changing semantics of ReadStream::eos():
eos() now only returns true _after_ trying to read past the end of the stream.

This has a large potential for regressions. Please test!

svn-id: r34549
2008-09-14 22:28:53 +00:00
Johannes Schickel
a4830d813e Cleanup.
svn-id: r34545
2008-09-14 21:41:27 +00:00
Johannes Schickel
77273facda Little cleanup.
svn-id: r34543
2008-09-14 21:34:49 +00:00
Johannes Schickel
725bd8b778 Added thumbnail support for launcher to SCUMM engine.
svn-id: r34540
2008-09-14 21:13:40 +00:00
Johannes Schickel
92fc264461 - Added thumbnail support to launcher load dialog.
- Adopted KYRA to support displaying thumbnails in load dialog (SCUMM engine has yet to follow)

svn-id: r34539
2008-09-14 21:00:24 +00:00
Johannes Schickel
41312a0ead Added ScummVM logo to GMM.
svn-id: r34537
2008-09-14 20:42:50 +00:00
Johannes Schickel
48adf18e21 Added autosave support in Kyra.
svn-id: r34535
2008-09-14 19:48:40 +00:00
Johannes Schickel
20a7a9112f Fix potentional bug in Screen::setResolution.
svn-id: r34533
2008-09-14 19:05:05 +00:00
Filippos Karapetis
371af75374 Slight cleanup of centerText()
svn-id: r34531
2008-09-14 18:30:08 +00:00
Johannes Schickel
38097172e2 Typo.
svn-id: r34528
2008-09-14 16:48:20 +00:00
Johannes Schickel
eddae0e105 Fixed thumbnail creation / loading in kyra.
svn-id: r34527
2008-09-14 16:29:14 +00:00
Filippos Karapetis
8316aba03d Fix for bug #2110375 - "DRASCULA: Mouse visible in screen saver", a regression from moving mouse handling to OSystem
svn-id: r34526
2008-09-14 16:21:31 +00:00
Johannes Schickel
a716fe8393 Implemented opcode 151: o1_resetMaskRegion
svn-id: r34524
2008-09-14 15:36:16 +00:00
Johannes Schickel
fbbe535645 Fixed regression introduced with r34522. (Now games without 'cdaudio' config value set should startup again).
svn-id: r34523
2008-09-14 15:35:40 +00:00
Johannes Schickel
53cf9e6409 Only setup 'cdaudio' config default for FM-Towns/PC98.
svn-id: r34522
2008-09-14 14:58:37 +00:00
Johannes Schickel
9ec7c3eaca Added a hack in KyraMetaEngine::listSaves to prevent slot 0 from being listed. Check comment for additional information.
svn-id: r34521
2008-09-14 14:08:14 +00:00
Johannes Schickel
ba58358c8d Rename save slots in KyraMetaEngine::removeSaveState, so it matches behavior in GUI_v2::deleteMenu at least a little bit more.
svn-id: r34520
2008-09-14 14:01:24 +00:00
Max Horn
f8ccd2dede SCUMM: Got rid of class Chunk
svn-id: r34518
2008-09-13 22:41:30 +00:00
Max Horn
15d16b94a7 SCUMM: Merged class Chunk & FileChunk
svn-id: r34517
2008-09-13 20:22:52 +00:00
Max Horn
71a204d63c SCUMM: Merged class BaseChunk & Chunk; got rid of MemoryChunk
svn-id: r34516
2008-09-13 20:04:19 +00:00
Max Horn
655ce26b3f Big patch changing the signature of various Stream methods (some ports may need to be slightly tweaked to fix overloading errors/warnings)
svn-id: r34514
2008-09-13 16:51:46 +00:00
Torbjörn Andersson
b86a047164 Indentation.
svn-id: r34513
2008-09-13 15:23:23 +00:00
Filippos Karapetis
cbf561a0a0 - Moved more animation data inside drascula.dat
- Merged copyRect and copyRectClip
- Added enums for all the possible character directions and removed duplicate directions
- Extended the talk sequence commands a bit
- Removed unnecessary buffer faceBuffer and the unneeded casts between byte * and char * that were used

svn-id: r34503
2008-09-12 12:54:16 +00:00
Johannes Schickel
31c72ace1b Fixed slot 0 savefile name in Kyra3. (Now using 'New game' instead of 'German')
svn-id: r34502
2008-09-12 12:25:56 +00:00
Johannes Schickel
0a35842954 Committed my patch #2105593 "Launcher/MetaEngine: Finnished removeSaveState".
svn-id: r34495
2008-09-11 19:47:45 +00:00
Filippos Karapetis
6fd2cb99db Cleanup
svn-id: r34494
2008-09-11 15:35:56 +00:00
Filippos Karapetis
a12e2b8037 - Merged openDoor() and closeDoor()
- Cleaned up updateDoor()
- Bugfixes to exitRoom() and gotoObject()
- Moved cursor-related functions to interface.cpp
- alapuertakeva -> roomExits

svn-id: r34493
2008-09-11 14:49:04 +00:00
Filippos Karapetis
224f95537b Code optimizations from Fingolfin
svn-id: r34491
2008-09-11 12:04:45 +00:00
Filippos Karapetis
c6af2e81e8 Cleanup
svn-id: r34490
2008-09-11 09:37:42 +00:00
Filippos Karapetis
02aad34ec7 Fixed the hotspot for the crosshair cursor
svn-id: r34489
2008-09-11 09:33:15 +00:00
Filippos Karapetis
fa3d3e3643 - The game's cursor is now handled via ScummVM's cursor manager, instead of the game itself (this means that there might be regressions where the cursor is visible when it shouldn't be)
- Removed the textSurface pointer, which was used in the Spanish version. Non-Spanish versions of the game hold the font data in the tableSurface buffer (which contains picture 96). The font data for Spanish versions is in picture 974. Now both versions load their font data from the tableSurface buffer
- hay_que_load -> loadedDifferentChapter
- Merged withoutVerb() and selectVerb()
This is a big change, it might lead to regressions!

svn-id: r34488
2008-09-11 09:31:45 +00:00
Max Horn
62a75f2615 Added detection for 4-language floppy version of DW (see report on forum post 39703)
svn-id: r34486
2008-09-11 09:26:27 +00:00
Johannes Schickel
25d79f8918 Cleanup.
svn-id: r34484
2008-09-10 20:47:58 +00:00
Johannes Schickel
a54d1dbde6 Cleanup.
svn-id: r34481
2008-09-10 18:01:02 +00:00
Filippos Karapetis
77cd9d6230 Removed the unused variable changeColor
svn-id: r34480
2008-09-10 13:06:40 +00:00
Filippos Karapetis
f5fecc864f Merged all the methods to assign and set default palettes
svn-id: r34479
2008-09-10 12:03:42 +00:00
Filippos Karapetis
3202ef4dd1 Reduced game memory usage by about 400KB by only loading the current language strings, not all strings
svn-id: r34472
2008-09-10 08:25:12 +00:00
Filippos Karapetis
cde2ee58b1 Fix for bug #2102828 - "AGOS - compilation error, uninitialized variable"
svn-id: r34469
2008-09-10 06:59:55 +00:00
Filippos Karapetis
fbc75cc8e5 Fix in the Igor engine for bug #2101083 - "ANY - MSVC71 compilation fails due to warnings-as-errors"
svn-id: r34468
2008-09-10 06:57:32 +00:00
Johannes Schickel
6fad6711d9 Changed static resource code to use Streams instead of operating on buffers.
svn-id: r34467
2008-09-09 18:09:46 +00:00
Filippos Karapetis
932399481a - Cleanup and simplification
- Moved several simple animations out of animation.cpp
- Moved some animations with talk sequences inside drascula.dat
- A new version of drascula.dat is needed (will be uploaded shortly)

svn-id: r34464
2008-09-09 15:59:06 +00:00
Filippos Karapetis
2ddadd7a45 Cleanup of exitRoom()
svn-id: r34463
2008-09-09 12:57:57 +00:00
Filippos Karapetis
d829f40f08 Cleanup
svn-id: r34462
2008-09-09 12:57:12 +00:00
Filippos Karapetis
dc304dbde2 Cleanup. Simplified converse()
svn-id: r34460
2008-09-09 11:20:34 +00:00
Filippos Karapetis
726e7e7ef9 Committed patch #2100962 - "Saga engine reduced memory usage"
svn-id: r34458
2008-09-09 07:05:47 +00:00
Filippos Karapetis
814e27fe40 Fix for bug #2101083 - "ANY - MSVC71 compilation fails due to warnings-as-errors"
svn-id: r34457
2008-09-09 06:47:41 +00:00
Florian Kagerer
2c0c67c08a HOF: msvc8 compile fix (ARRAYSIZE used with run-time allocated array)
svn-id: r34454
2008-09-08 21:57:38 +00:00
Johannes Schickel
c5e049bce8 Made some filenames uppercase for consistency.
svn-id: r34452
2008-09-08 18:55:29 +00:00
Johannes Schickel
c6b6a99f2a Fixed LoL file loading regression.
svn-id: r34451
2008-09-08 18:48:39 +00:00
Filippos Karapetis
655bb0b165 Don't use fileName both as a structure and as a function parameter
svn-id: r34449
2008-09-08 14:00:26 +00:00
Filippos Karapetis
1c687f98e7 Reduced calls to File::exists()
svn-id: r34443
2008-09-08 10:36:53 +00:00
Filippos Karapetis
4be8764428 Free the current voice lookup table a bit earlier in loadGlobalResources()
svn-id: r34442
2008-09-08 08:26:54 +00:00
Filippos Karapetis
ea5ad543d9 Cleanup
svn-id: r34440
2008-09-08 08:07:06 +00:00
Johannes Schickel
a8c4ffa93f Changed priorities for search paths. (Just in case system specific data paths contain an outdated kyra.dat version)
svn-id: r34438
2008-09-07 22:41:57 +00:00
Johannes Schickel
06d57a54f3 - Fixed regression in Resource::unloadPakFile
- Changed priority value for OSystem::addSysArchivesToSearchSet call

svn-id: r34436
2008-09-07 22:35:13 +00:00
Johannes Schickel
bd10e674a3 Got rid of all Common::File usages in Kyra.
svn-id: r34435
2008-09-07 22:30:34 +00:00
Max Horn
2bc093828f Replaced Engine::_gameDataPath (a String) by Engine::_gameDataDir (an FSNode); adapted code to that (by using getChild() to get subdirs, not string concatenation
svn-id: r34434
2008-09-07 22:10:58 +00:00
Max Horn
3c48fb7eae Fix warning about missing virtual destructor
svn-id: r34433
2008-09-07 22:00:04 +00:00
Johannes Schickel
7aaf6139e2 Moved Kyra resource code to a SearchSet/Archive based implementation, this removes dependencies on Common::File.
svn-id: r34428
2008-09-07 21:46:37 +00:00
Max Horn
d48a57723a added two FIXMEs to M4 -- somehow, adding two subdirs of CWD named 'goodstuf' and 'resource' to the list of default dirs doesn't sound very sensible to me ;)
svn-id: r34426
2008-09-07 21:43:36 +00:00
Max Horn
2f30e5f63d Comment out some #defines in skydefs.h as they conflict with other headers (esp. T2 conflicts with some template defs)
svn-id: r34425
2008-09-07 21:38:53 +00:00
Lars Persson
f6c4df8281 Symbian already store all paths with a trailing "\".
Quick fix waiting for proper solution

svn-id: r34423
2008-09-07 19:19:45 +00:00
Sven Hesse
f2ef3015f9 Added polish version of Woodruff, as supplied by goodoldgeorg in bug report #2098838
svn-id: r34415
2008-09-07 16:27:04 +00:00
Sven Hesse
07b59d1936 Added a spanish floppy version of Gob3, as supplied by SiRoCs in bug report #2098621
svn-id: r34413
2008-09-07 15:39:06 +00:00
Sven Hesse
7eaad9da66 Actually, /now/ the values are sane ^^; (also fixes Ween mouse position bug #2046244)
svn-id: r34411
2008-09-07 15:29:47 +00:00
Sven Hesse
a7d917ea43 Clipping setMousePos() parameters to sane values
svn-id: r34409
2008-09-07 15:21:52 +00:00
Max Horn
f5462901b2 Temporary workaround for bug #2098279: ALL: Game path with no trailing backslash fails
svn-id: r34408
2008-09-07 15:16:45 +00:00
Sven Hesse
d26982eaf2 Added another demo version of Gobliiins (bug #2098412)
svn-id: r34404
2008-09-07 13:16:58 +00:00
Max Horn
6bfa3e274a Got rid of File::eof()
svn-id: r34396
2008-09-06 21:23:08 +00:00
Max Horn
1cecbebc49 Switched class File & DumpFile to use StdioStream internally
svn-id: r34391
2008-09-06 20:49:48 +00:00
Max Horn
088a1c0806 ScummFile: Don't use the File::_ioFailed flag, rather track the io status separately; also, changed eof() -> eos()
svn-id: r34389
2008-09-06 20:34:21 +00:00
Travis Howell
123acb857e Add Wii version of SPY Fox 1.
svn-id: r34378
2008-09-06 07:03:38 +00:00
Travis Howell
52ec841cd4 Add debugInput opcode for HE 100 games.
svn-id: r34375
2008-09-06 01:02:45 +00:00
Lars Persson
f01fc82f2e Enum needs to be minimum four chars to compile (32 bit number I guess)
svn-id: r34353
2008-09-05 14:11:23 +00:00
Travis Howell
4bb1decf79 Use exact case numbers, to avoid unneeded subtractions.
svn-id: r34352
2008-09-05 13:35:27 +00:00
Filippos Karapetis
6d4900ad06 Hopefully fixed the chaos with the SAGA volume values. This also fixes the broken volume introduced with the introduction of the RTL code in the engine
svn-id: r34349
2008-09-05 13:02:03 +00:00
Torbjörn Andersson
ba07d1dd0a Use readLine() instead of readLine_OLD().
svn-id: r34336
2008-09-04 21:40:32 +00:00
Sven Hesse
cf7ab829e3 Added another version of Lost in Time CD, as supplied by SiRoCs in bug report #2093672
svn-id: r34332
2008-09-04 19:20:51 +00:00
Travis Howell
fa5f22944d Add missing case in o100_resourceRoutines.
svn-id: r34328
2008-09-04 14:12:27 +00:00
Travis Howell
7208a28980 Correct HE version for Wii version of Freddi Fish 1.
svn-id: r34323
2008-09-04 08:11:35 +00:00
Max Horn
ad87f08192 Changed some code to use the new Stream::readLine() method
svn-id: r34318
2008-09-03 18:40:49 +00:00
Max Horn
57e724bfc3 Renamed SeekableReadStream::readLine to SeekableReadStream::readLine_OLD; added a new alternate SeekableReadStream::readLine() instead
svn-id: r34315
2008-09-03 17:53:25 +00:00
Max Horn
d3642080de Moved check for shouldRTL() from engines to scummvm_main
svn-id: r34310
2008-09-03 16:56:40 +00:00
Travis Howell
ee32e242df Added more versions of HE games.
svn-id: r34305
2008-09-03 13:49:24 +00:00
Max Horn
531bcf847c Moved FilesystemNode / FSList to namespace Common; also got rid of some 'typedef Common::String String;' name aliases
svn-id: r34302
2008-09-03 11:22:51 +00:00
Filippos Karapetis
4019bb3e37 Silence MSVC warning about uninitialized variables
svn-id: r34298
2008-09-03 10:00:43 +00:00
Filippos Karapetis
dd8e875b00 Commented out currently broken code, adding a FIXME
svn-id: r34297
2008-09-03 09:58:28 +00:00
Filippos Karapetis
80c47666db Silence MSVC warning about ambiguous usage of CLIP
svn-id: r34296
2008-09-03 09:55:29 +00:00
Travis Howell
1163c4b7c1 Add another Dutch demo of Pajama Sam 1.
svn-id: r34291
2008-09-03 02:06:11 +00:00
Travis Howell
b0a4658038 Add Nintendo Wii versions of Freddi Fish 1 and Pajama Sam 1.
svn-id: r34290
2008-09-03 01:47:01 +00:00
Florian Kagerer
b7d260330b some minor bug fixes
svn-id: r34288
2008-09-02 21:31:53 +00:00
Sven Hesse
eadde9d6e4 Added French Bargon Attack, as supplied by kizkoool in bugreport #2089734
svn-id: r34287
2008-09-02 21:29:06 +00:00
Sven Hesse
741364602c Urban Runner stubs
svn-id: r34286
2008-09-02 20:15:42 +00:00
Johannes Schickel
ced14e186e Cleanup: Remove now unneeded KyraEngine_v1::quitGame.
Peres proposal for this commit log was: 'fixing .... as peres pointed out in his very interesting mail on -devel that everybody should read'.

svn-id: r34282
2008-09-02 14:36:47 +00:00
Nicola Mettifogo
4ab5d3fdc4 Merging more of the GSoC 2008 RTL branch: PARALLACTION
svn-id: r34268
2008-09-02 01:58:55 +00:00
Joost Peters
3fef592c20 fix Virgin logo screen breakage that was introduced in the RTL merge
svn-id: r34267
2008-09-02 00:31:27 +00:00
Filippos Karapetis
ac38ca32b9 Silence MSVC warning about empty switch statement
svn-id: r34266
2008-09-01 23:37:24 +00:00
Filippos Karapetis
3d8e7580a0 Silence MSVC warning about empty switch statement
svn-id: r34265
2008-09-01 23:36:59 +00:00
Max Horn
40e05acff3 TINSEL: Enabled listSaves support
svn-id: r34263
2008-09-01 21:13:11 +00:00
Max Horn
4567cfc61c Document each MetaEngineFeature (instead of listing just 'examples'). Wording could be better, feel free to improve it
svn-id: r34262
2008-09-01 21:06:32 +00:00
Max Horn
f455b15bde Clarified clarification ;)
svn-id: r34261
2008-09-01 20:41:43 +00:00
Max Horn
898a7f4b2d Clarified some comments
svn-id: r34260
2008-09-01 20:31:44 +00:00
Florian Kagerer
2f884b4f25 - kyra: fm-towns/pc-98 audio: restructured driver, added rhythm channel data
svn-id: r34259
2008-09-01 20:23:25 +00:00
Max Horn
8d16013895 Merging more of the GSoC 2008 RTL branch: TOUCHE
svn-id: r34258
2008-09-01 20:22:29 +00:00
Max Horn
958647a6b5 Merging more of the GSoC 2008 RTL branch: TINSEL
svn-id: r34257
2008-09-01 20:22:10 +00:00
Max Horn
7002aa8981 Merging more of the GSoC 2008 RTL branch: SWORD2
svn-id: r34256
2008-09-01 20:21:53 +00:00
Max Horn
f2b26c5615 Merging more of the GSoC 2008 RTL branch: SWORD1
svn-id: r34255
2008-09-01 20:21:30 +00:00
Max Horn
5013b01e74 Merging more of the GSoC 2008 RTL branch: SKY
svn-id: r34254
2008-09-01 20:20:57 +00:00
Max Horn
5ceb635420 Merging more of the GSoC 2008 RTL branch: SCUMM
svn-id: r34253
2008-09-01 20:20:20 +00:00
Max Horn
2a06141644 Merging more of the GSoC 2008 RTL branch: SAGA
svn-id: r34252
2008-09-01 20:19:28 +00:00
Max Horn
10a8cdee39 Merging more of the GSoC 2008 RTL branch: LURE
svn-id: r34251
2008-09-01 20:18:17 +00:00
Johannes Schickel
8c58e27ab1 Cleanup.
svn-id: r34248
2008-09-01 18:14:55 +00:00
Max Horn
dcd52c1210 Merging more of the GSoC 2008 RTL branch: QUEEN
svn-id: r34247
2008-09-01 17:55:52 +00:00
Max Horn
91df44f8f6 Merging more of the GSoC 2008 RTL branch: KYRA
svn-id: r34246
2008-09-01 17:52:50 +00:00
Max Horn
7953312bc6 Merging more of the GSoC 2008 RTL branch: GOB
svn-id: r34245
2008-09-01 17:50:00 +00:00
Max Horn
a41c681d9d Merging more of the GSoC 2008 RTL branch: CINE
svn-id: r34244
2008-09-01 17:47:36 +00:00
Max Horn
358c314381 Merging more of the GSoC 2008 RTL branch: AGOS
svn-id: r34243
2008-09-01 17:46:53 +00:00
Max Horn
42a5aa567b Merging more of the GSoC 2008 RTL branch: AGI
svn-id: r34242
2008-09-01 17:46:05 +00:00
Max Horn
027ae0a6f6 First part of GSoC2008 RTL branch merge
svn-id: r34241
2008-09-01 17:30:03 +00:00
Filippos Karapetis
7eb072064a Silence MSVC warning about potentially uninitialized variable
svn-id: r34236
2008-09-01 10:09:48 +00:00
Max Horn
a11e2902bc Fix warnings
svn-id: r34228
2008-08-31 15:30:07 +00:00
Sven Hesse
8e03cb1f14 Shutting up a warning on systems where char is signed by default
svn-id: r34225
2008-08-31 11:37:07 +00:00
Nicola Mettifogo
ccf88578c8 Fixed leak with Input class, introduced in commit 34206.
svn-id: r34224
2008-08-31 10:43:32 +00:00
Nicola Mettifogo
4cda7abda1 More cleanup.
svn-id: r34223
2008-08-31 10:24:32 +00:00
Nicola Mettifogo
6db501d612 Cleanup.
svn-id: r34222
2008-08-31 09:30:16 +00:00
Nicola Mettifogo
fc518efe08 Removed extra semicolon detected by salty-horse pesky compiler.
svn-id: r34221
2008-08-31 08:27:40 +00:00
Nicola Mettifogo
1fd91e2bb0 Moved save/load code into SaveLoad class.
svn-id: r34220
2008-08-31 06:14:45 +00:00
Nicola Mettifogo
983863bef3 Uniformed the interface of Parallaction class (and its hierarchy) with regards of gui code, which is now independent of engine version.
svn-id: r34219
2008-08-31 05:18:25 +00:00
Sven Hesse
805a46b229 Added some The Last Dynasty stubs
svn-id: r34217
2008-08-30 23:59:46 +00:00
Max Horn
2c3f2829fa cleanup
svn-id: r34215
2008-08-30 22:16:59 +00:00
Max Horn
4875b44052 TINSEL: The engine version is an integer, not a bitfield
svn-id: r34214
2008-08-30 22:10:48 +00:00
Max Horn
aa463878a3 TINSEL: Remove some unused code; and duplicated the 4-FLAGS version detection entry (one copy for each language) for the user's convenience
svn-id: r34213
2008-08-30 22:09:35 +00:00
Max Horn
be85bf25a5 TINSEL: Write config changes to disk
svn-id: r34212
2008-08-30 21:51:13 +00:00
Max Horn
fb66f42002 cleanup
svn-id: r34211
2008-08-30 21:43:36 +00:00
Max Horn
396d815e15 TINSEL: Added support for the 3,4 and 5 FLAGS (multi lingual) versions of DW (only 4 flags version has been tested; see also bug #2048383)
svn-id: r34210
2008-08-30 21:03:15 +00:00
Nicola Mettifogo
2e9bdfb3b1 Removed global g_system.
svn-id: r34209
2008-08-30 15:49:54 +00:00
Torbjörn Andersson
28ce384cb6 Added a whitespace, just for salty-horse.
svn-id: r34208
2008-08-30 12:54:54 +00:00
Nicola Mettifogo
0a387bca12 Moved mouse cursor loading/handling to Input class.
svn-id: r34206
2008-08-30 10:27:20 +00:00
Max Horn
c657f1d09a Made out-of-memory error in SCUMM a bit more verbose
svn-id: r34201
2008-08-29 09:44:05 +00:00
Max Horn
79fafb7b6a Fix bug #2078922: DW: Pushing ESC repeatedly at beginning causes odd behavior
svn-id: r34196
2008-08-27 19:29:41 +00:00
Max Horn
baf975f072 cleanup
svn-id: r34191
2008-08-27 17:41:05 +00:00
Filippos Karapetis
de64aa9c4a Document some animations
svn-id: r34190
2008-08-27 10:00:32 +00:00
Filippos Karapetis
c89281e4a3 Fix for bug #2057200 - "IHNM: Invisible inventory objects"
svn-id: r34189
2008-08-26 14:26:43 +00:00
Filippos Karapetis
cd3a904f78 Correct fix for bug #2073159 - "MICKEY: Incomplete computer message"
svn-id: r34186
2008-08-26 12:34:05 +00:00
Nicola Mettifogo
a403372ae1 Cleanup.
svn-id: r34185
2008-08-26 12:15:11 +00:00
Travis Howell
8669e6dcf4 Add more versions of HE games.
svn-id: r34184
2008-08-26 11:15:01 +00:00
Filippos Karapetis
d431bfa137 Removed some unneeded sanity checks that have been introduced with the latest cleanups
svn-id: r34183
2008-08-26 10:59:59 +00:00
Filippos Karapetis
dbbfaa4c83 talk_dr_grande -> talk_drascula_big
talk_baul -> talk_trunk

svn-id: r34182
2008-08-26 08:35:02 +00:00
Filippos Karapetis
0a2a468d83 Simplified several calls to copyBackground()
svn-id: r34181
2008-08-26 08:21:21 +00:00
Filippos Karapetis
3b0aba1c38 Merged talk_vonBraun and talk_vonBraunpuerta
svn-id: r34180
2008-08-26 08:05:36 +00:00
Filippos Karapetis
3a782bfc48 Cleanup
svn-id: r34179
2008-08-26 07:48:19 +00:00
Torbjörn Andersson
235ab94ef3 Refined the workaround for wrongly compressed audio. If the sample rate is given
as 11025 Hz, it should be 11840 Hz. However, a fixed version of compress_queen
won't necessarily produce files with that sample rate, since LAME will resample
the sounds to 12000 Hz. I.e. we can only override the rate if it's exactly 11025.

svn-id: r34169
2008-08-25 18:47:27 +00:00
Filippos Karapetis
e2fe740e35 Fix for original game bug with the wall plug in chapter 5.
Fixes bug #2059621 - DRASCULA: Plug bug

svn-id: r34160
2008-08-25 15:58:45 +00:00
Johannes Schickel
a6c931459b Implemented continous screen updating while waiting for text input in v2 GUI. (based on LoK implementation)
svn-id: r34157
2008-08-25 15:14:29 +00:00
Filippos Karapetis
4abc98dfdf Fix for bug #2062024 - "DRASCULA: Error talking with blind man"
svn-id: r34154
2008-08-25 15:07:05 +00:00
Filippos Karapetis
a3404665f6 Fix for bug #2073159 - "MICKEY: Incomplete computer message".
Random numbers are calculated from 1 onwards in the preAGI engines, but there was an off-by one error. I'm currently hesitant to add this fix to the 0.12.0 branch, as I'm unsure if it has any possible regressions in Troll's Tale or Winnie the Pooh

svn-id: r34152
2008-08-25 14:55:11 +00:00
Johannes Schickel
3b90f69a6e Added short delay(Millis) call while waiting for text input, should reduce CPU usage a little bit.
svn-id: r34149
2008-08-25 13:52:10 +00:00
Kari Salminen
41bbdc427d Added a warning to bug #2055912's fix committed in revision 34132.
svn-id: r34146
2008-08-25 12:00:38 +00:00
Nicola Mettifogo
18250a8560 Fixed regression: show mouse and enable input in NS Demo.
svn-id: r34144
2008-08-25 09:35:22 +00:00
Nicola Mettifogo
08f5ac5c4d Added workaround for bug 2070751, long standing issue with item matching exposed after revision 32873.
svn-id: r34135
2008-08-25 06:32:08 +00:00
Kari Salminen
81e54d0555 Fix for bug #2055912: FW: incrustSprite fails on savegame loading.
What little testing I did, this seems to work, but more testing
would be nice.

svn-id: r34132
2008-08-24 23:16:37 +00:00
Eugene Sandulenko
a64491e905 Italian version now has properly translated verbs area as well as numerous
fixes to object names. So new version of packet.005 was prepared.

svn-id: r34124
2008-08-24 21:31:20 +00:00
Eugene Sandulenko
9521b9a12a Fix inventory.
svn-id: r34122
2008-08-24 21:28:20 +00:00
Paweł Kołodziejski
1f04462011 remove broken code, but i'll add better feature into compression tool
svn-id: r34119
2008-08-24 07:54:36 +00:00
Travis Howell
cfc274b695 Add more versions of HE games.
svn-id: r34116
2008-08-24 07:48:44 +00:00
Sven Hesse
5c060ef5d9 Fixing _itemsMap access (bug #2069177)
svn-id: r34113
2008-08-23 14:18:12 +00:00
Travis Howell
2f5da4f356 Another French version Humongous Catalog and another English DOS version of Fatty Bear's Birthday Surprise.
svn-id: r34107
2008-08-23 06:09:30 +00:00
Kari Salminen
d9d77fef03 Designate fix for bug #2057619 as a hack, as that's what it is.
svn-id: r34102
2008-08-22 12:11:51 +00:00
Nicola Mettifogo
fc4256ca85 Fixed error in parsing.
svn-id: r34093
2008-08-22 06:32:12 +00:00
Travis Howell
b9ac54024a Add another 3DO version of Fatty Bear's Birthday Surprise.
svn-id: r34090
2008-08-22 03:37:43 +00:00
Nicola Mettifogo
f2f0b04627 Implement transition when entering a new location for BRA. Not pixel-perfect, but... let's e happy about it.
svn-id: r34089
2008-08-22 00:19:12 +00:00
Florian Kagerer
f0ea072df6 KYRA: Towns/PC-98-Audio: fixed bug where notes for which the hold flag was set were turned off nonetheless
svn-id: r34087
2008-08-21 18:24:52 +00:00
Torbjörn Andersson
5f79db5d9d Fixed warning.
svn-id: r34086
2008-08-21 14:52:55 +00:00
Kari Salminen
4d6101cff9 Fix typo.
svn-id: r34084
2008-08-21 14:43:03 +00:00
Kari Salminen
d976f8a0fe Fix for bug #2057619: FW: Glitches in title display of demo (regression).
This fix doesn't seem to break other Future Wars versions like r34039 did.
Some versions of TITRE.ANI use 15 for transparency color, others use 0.
Previously only one of the choices was supported, now both are recognized.

svn-id: r34081
2008-08-21 14:14:33 +00:00
Nicola Mettifogo
47b1a06e3b Removed unused code and structures, and a bit of cleanup.
svn-id: r34080
2008-08-21 12:11:24 +00:00
Florian Kagerer
513f5ae150 KYRA: Towns/PC-98-Audio: increased precision for envelope generator timing and tempo when using "odd" output rates like 48 kHz or 8 kHz
svn-id: r34079
2008-08-21 12:04:55 +00:00
Florian Kagerer
99790e7915 KYRA: Towns/PC-98-Audio: tempo fix for output rates other than 44100 Hz
svn-id: r34078
2008-08-21 02:17:52 +00:00
Florian Kagerer
1a7d3ef5ee KYRA: Towns/PC-98-Audio: fix bug where pitch wheel is processed twice instead of once
svn-id: r34076
2008-08-20 22:38:36 +00:00
Florian Kagerer
bfd1723998 - add support for Italian floppy version
- more work on fm-towns music tempo

svn-id: r34067
2008-08-20 19:57:57 +00:00
Kari Salminen
d26a62effa Fix font loading:
Fixes bug #2058539: OS: Assert starting demo (regression).
May possibly also fix bug #2019344: FW: crash with Amiga Italian version (photocopy room),
but not sure about that because I couldn't reproduce the bug myself.

svn-id: r34065
2008-08-20 17:31:35 +00:00
Florian Kagerer
023189d6f1 tempo fix
svn-id: r34064
2008-08-20 16:14:10 +00:00
Johannes Schickel
1c351a7f82 Oops fix save loading after last commit.
svn-id: r34061
2008-08-20 15:12:36 +00:00
Johannes Schickel
f01a4a8845 Cleanup of thumbnail saving/loading code.
svn-id: r34060
2008-08-20 15:08:00 +00:00
Kari Salminen
f28b93e7c7 Fix compilation: Changed 'not' to '!'.
svn-id: r34057
2008-08-20 14:56:46 +00:00
Johannes Schickel
430977e438 Committed patch #2055831 "KYRA: ResFileEntry parent cache optimization".
svn-id: r34055
2008-08-20 14:30:40 +00:00
Johannes Schickel
9138128f5c - Committed Max' compressed save backseeking support from patch #2050337 "KYRA/SCUMM: Thumbnail support/improvement"
- Extended SCUMM engine to support savegames without thumbnail header. (Increased savegame version to prevent saves to be loaded from older ScummVM versions)
- Fixed KYRA to properly support savegames without thumbnail header.

svn-id: r34054
2008-08-20 14:24:16 +00:00
Johannes Schickel
f4fc8c3e4c Committed patch #2050337 "KYRA/SCUMM: Thumbnail support/improvement". (Without Max' compressed backward seeking support for now)
svn-id: r34053
2008-08-20 14:03:34 +00:00
Torbjörn Andersson
35b02acb39 Moved the mutex locking a bit. (Consistent with how the AGOS engine does it.)
svn-id: r34050
2008-08-20 09:15:59 +00:00
Torbjörn Andersson
eb35835f5e I believe the setVolume() function has to be guarded by a mutex. (I added this to
the Tinsel engine a while back to fix mysterious problems, but forgot to add it
elsewhere.) Maybe this will fix the mysterious IHNM crashes, as well?

svn-id: r34048
2008-08-20 09:12:11 +00:00
Nicola Mettifogo
9549cbee7f Engine now returns to the menu when intro is over.
svn-id: r34047
2008-08-20 04:02:12 +00:00
Nicola Mettifogo
d5d4500b64 * Enlarged buffer for frame decoding. Crashes in the introduction were caused by a small buffer and subsequent out-of-bound writes.
* Disabled debug code.

svn-id: r34046
2008-08-20 03:36:49 +00:00
Nicola Mettifogo
86c3ddc23c Deleted debug code that slipped in.
svn-id: r34041
2008-08-19 14:36:05 +00:00
Kari Salminen
44c24e922b Fix for bug #2057619: FW: Glitches in title display of demo (regression).
Removed incorrect transparency data used for logo. Now it's shown correctly.

svn-id: r34039
2008-08-19 14:19:28 +00:00
Nicola Mettifogo
389575b5c1 Fixed bug in low-level parser. Block comments weren't interpreted correctly.
svn-id: r34038
2008-08-19 14:07:48 +00:00
Kari Salminen
b7dce00942 Fix for bug #2057656: FW: Assert during demo (regression).
Future Wars's Amiga demo is trying to load collision data files
'L8_MK.NEO' and 'L23_MK.NEO' that aren't supplied with the demo.
Previous code crashed when a file couldn't be found,
now it gives a warning instead.

svn-id: r34036
2008-08-19 13:05:38 +00:00
Kari Salminen
97463309ba Fix for bug #2057637: FW: Spaceship glitches in demo (regression).
This was caused by assuming in-place decompression is ok, it wasn't,
although AFAIK the original did decompression in-place too.
Changed unpacking to be done not in-place and the glitch vanished.
Also changed the unpacker to also handle uncompressed input data.

svn-id: r34034
2008-08-19 11:55:20 +00:00
Max Horn
05bac1e74e Fixed GCC warning
svn-id: r34032
2008-08-19 10:52:39 +00:00
Filippos Karapetis
8b48de9949 Fix for bug #2057664 - "DRASCULA: No GUI warning when playing from CD"
svn-id: r34030
2008-08-19 10:12:35 +00:00
Filippos Karapetis
148ef16d8b Fixed regression from commit #33576. Fixes bug #2056282 - "DRASCULA: can't use inventory objects"
svn-id: r34028
2008-08-19 10:05:07 +00:00
Lars Persson
983e07ff6e Use the correct and specified datatype int32 instead of only int.
svn-id: r34027
2008-08-19 09:26:41 +00:00
Filippos Karapetis
15722c8ee8 Fix for bug #2057194 - "IHNM: -x option crashes ScummVM, if savegame doesn't exist"
svn-id: r34023
2008-08-19 08:49:53 +00:00
Nicola Mettifogo
c528106b86 Fixed segfault when quitting BRA.
svn-id: r34022
2008-08-19 08:08:32 +00:00
Florian Kagerer
cb5162fad6 fixed warnings
svn-id: r34019
2008-08-19 06:31:57 +00:00
Florian Kagerer
95745179f5 fixed bug that caused a lockup in certain configurations when the music was fading
svn-id: r34015
2008-08-19 01:00:15 +00:00
Bertrand Augereau
0e99719b3a Compile fix for 34006
svn-id: r34009
2008-08-18 20:43:44 +00:00
Robin Watts
90b59af2ba Updates to the scummvm blitting code as discussed on the mailing list.
1) Remove DS version of the ARM blitters in favour of the 'normal' ARM one.
 2) Update normal ARM blitter to use Carlo's clever algorithm.
 3) Update C version with Max Horns patch (slightly tweaked - counting down
on loops is better, M'kay).

svn-id: r34006
2008-08-18 20:04:15 +00:00
Florian Kagerer
92f545ba66 KYRA: FM-Towns/PC-98 Audio:
- adpcm decoding for rhythm channel
- cleanup

svn-id: r33993
2008-08-18 17:42:32 +00:00
Kostas Nakos
b809665671 do away with the smush force redraw hack
svn-id: r33991
2008-08-18 17:24:25 +00:00
Nicola Mettifogo
c2089be660 * Split up blt routine (there is room for a ton of improvements)
* Added scaling as a new blt option
* Activated scaling for the main character in BRA

svn-id: r33985
2008-08-18 07:12:05 +00:00
Florian Kagerer
87164b6c05 KYRA: FM-Towns/PC-98 Audio:
- improved accuracy
- complete percussion channel support (does not work atm though, since the instrument data is missing)
- some cleanup

svn-id: r33980
2008-08-17 22:49:34 +00:00
Kari Salminen
95aa2ce56f Added some documentation about how data is unpacked in gfxConvertSpriteToRaw (Learned this from trying to implement convertPI1_2 i.e. gfxConvertSpriteToRaw myself to see if that was the problem with the Operation Stealth's labyrinth arcade sequence).
svn-id: r33976
2008-08-17 20:53:18 +00:00
Eugene Sandulenko
19b6334418 Patch #2045543: Possible fix for Drascula's decodeRLE()
svn-id: r33973
2008-08-17 18:58:23 +00:00
Kari Salminen
a32cae809b Forwardport of branch-0-12-0's r33966: Fix to Future Wars's rendering of type 0 overlays (i.e. color sprites). Objects with negative frame values are supposed to be jumped over (Verified with disassembly).
svn-id: r33967
2008-08-17 10:43:54 +00:00
Christopher Page
f45749759e Added ScummVM Title and version info to GMM
svn-id: r33955
2008-08-17 02:02:22 +00:00
Christopher Page
d370c8eedd Agos volume levels changed by the keyboard correspond now sync with the config manager
svn-id: r33954
2008-08-16 22:42:19 +00:00
Christopher Page
370cc6615e Fixed volume change after loading a game in Saga
svn-id: r33952
2008-08-16 22:30:19 +00:00
Kari Salminen
cc82aeb18d Workaround for bug #2054882 (FW: Impossible to survive entering monastery (regression)):
For Future Wars o1_compareGlobalVar now compares global variable 255 to be equal to everything.
The scripts probably tested global variable 255 for equality with some value (Maybe 143?)
to see whether copy protection was properly passed.

svn-id: r33950
2008-08-16 22:15:57 +00:00
Christopher Page
58166351c6 Made sure to set the loading slot AFTER selecting the active domain when loading from the launcher. Also fixed the flickering Virgin logo in BASS
svn-id: r33949
2008-08-16 22:06:44 +00:00
Johannes Schickel
08b4cf127b Cleanup.
svn-id: r33948
2008-08-16 21:51:56 +00:00
Florian Kagerer
cc80af1448 KYRA: Fm-Towns Audio: fixed crash
svn-id: r33943
2008-08-16 15:24:52 +00:00
Florian Kagerer
193f52906c KYRA: Fm-Towns Audio: fixed music fading
svn-id: r33942
2008-08-16 14:25:03 +00:00
Nicola Mettifogo
fbc9483ed2 Extended balloon manager to handle color constants and fixed color of text in balloons for BRA.
svn-id: r33940
2008-08-16 13:10:54 +00:00
Nicola Mettifogo
b08a3885a8 Multiple balloons (answers) are now positioned correctly in BRA.
svn-id: r33939
2008-08-16 12:49:27 +00:00
Florian Kagerer
807bfe5079 - KYRA: FM-Towns/PC-98 Audio: fixed several bugs and got rid of some floating point arithmetic (or at least replaced some doubles with floats)
- Improved support for PC-98 music: HOF tracks seem to be fine, KYRA should be okay, too (I can't compare with an emulator since I am missing the floppy boot disk with the executable)
- There are still tempo issues. Some tracks play way too slow, others way too fast
- PC-98 sound effects in Kyra 1 don't work (I would need the floppy disk with the executable for that)

svn-id: r33938
2008-08-16 12:38:37 +00:00
Torbjörn Andersson
49aff727e2 Removed unused variable.
svn-id: r33936
2008-08-16 11:50:36 +00:00