Commit Graph

1394 Commits

Author SHA1 Message Date
Willem Jan Palenstijn
a4dcfdd907 Fix uninitialized variables
svn-id: r48839
2010-04-28 22:13:11 +00:00
Nicola Mettifogo
122fde0775 Fixed leaks in parsing of examine and door zones.
svn-id: r48838
2010-04-28 22:13:02 +00:00
Willem Jan Palenstijn
ee63bf51bd Fix Nippon Safes test result label memory leak
svn-id: r48837
2010-04-28 21:50:54 +00:00
Willem Jan Palenstijn
9793430e58 Fix a destruction order issue and note two remaining issues from the label fixes (r48811)
svn-id: r48827
2010-04-28 18:50:22 +00:00
Max Horn
460d69e885 COMMON: Move DebugChannel stuff into a new DebugMan singleton
svn-id: r48821
2010-04-27 21:40:52 +00:00
Nicola Mettifogo
498d8000ca Fix bug 2969257 (labels) and hopefully plug all the leaks.
svn-id: r48811
2010-04-27 08:59:13 +00:00
Max Horn
a1840bd573 AUDIO: Rename Mixer::playInputStream to playStream
svn-id: r48637
2010-04-12 09:14:17 +00:00
Travis Howell
45651803f1 Disable the load from launcher button, in all games of Parallaction game engine.
svn-id: r48488
2010-04-03 14:16:36 +00:00
Travis Howell
1c7752d982 Fix bug #2976376 - NIPPON: Load from Launcher fails. By removing the kSupportsLoadingDuringStartup MetaEngineFeature flag (which was never supported).
svn-id: r48485
2010-04-03 14:01:12 +00:00
Travis Howell
397553cc56 Fix bug #2970141 - NIPPON: Crash at end of the game (regression). By reverting part of the changes to Parallaction_ns::cleanupGame() in revision 34939.
svn-id: r48480
2010-04-03 04:48:20 +00:00
Willem Jan Palenstijn
fe51070977 Fix whitespace
svn-id: r48477
2010-04-02 22:14:18 +00:00
Travis Howell
7e1f395e34 Fix bug #2969232 - NIPPON: Kos sprite broken (Regression). The current disk archive requires a higher priority, compared to the default disk archives.
svn-id: r48469
2010-04-02 13:49:59 +00:00
Travis Howell
a55cb7fa10 Fix bug #2979193 - NIPPON: Crash at character introduction (regression). By restoring the kEngineBlockInput engine flag.
svn-id: r48464
2010-04-02 12:51:42 +00:00
Nicola Mettifogo
1d2122d466 Let Parallaction return game-specific gameids. This completes the fix for bug 2969234 after LordHoto's patch. Users might need to readd their games.
svn-id: r48422
2010-03-30 05:53:36 +00:00
Johannes Schickel
db3f6be777 Use ConfMan to query the gameid of the passed target instead of deducing from the target to the gameid. Along with it fix the removeSaveState implementation.
Note that this is untested! Someone with some parallaction game should test it
before it can be considered to backport it to branch-1-1-0.

svn-id: r48418
2010-03-29 21:01:19 +00:00
Nicola Mettifogo
2872f197d8 Fixed bug 2969234 by tampering with the gameId. Probably not a nice solution, but hopefully ok for a while.
svn-id: r48415
2010-03-29 18:47:40 +00:00
Johannes Schickel
38b2b3c04f Move StringTokenizer to its own files (tokenizer.h/tokenizer.cpp).
svn-id: r48310
2010-03-20 12:56:56 +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
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
a505d32eff Replace use of Audio::makeRawMemoryStream by Audio::makeRawStream.
svn-id: r47716
2010-01-30 15:26:54 +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
aed02365ec Strip trailing spaces/tabs.
svn-id: r47541
2010-01-25 01:39:44 +00:00
Max Horn
4b996e7de7 Reorder params to Audio::makeRawMemoryStream
svn-id: r47492
2010-01-23 23:55:35 +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
Max Horn
8508a97add Get rid of two more FLAG_LOOP instances
svn-id: r47459
2010-01-23 00:35:14 +00:00
Torbjörn Andersson
1928a7ba38 Silenced some cppcheck warnings.
svn-id: r47427
2010-01-21 23:05:33 +00:00
Max Horn
24ae816395 cleanup
svn-id: r47399
2010-01-19 23:52:49 +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
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
Nicola Mettifogo
8e54ce73a5 Moved creation of 'beep' sound buffer to sound manager constructor.
svn-id: r47124
2010-01-07 15:38:29 +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
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
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
51933629d1 Changed foo(void) to foo() in almost all non-backend source files
svn-id: r45616
2009-11-02 21:54:57 +00:00
Max Horn
2bbf708dea Introduced new type Common::DisposeAfterUse::Flag
svn-id: r45233
2009-10-18 19:41:59 +00:00
Nicola Mettifogo
1535ae7f6e Rollback additional file committed in r45147.
svn-id: r45148
2009-10-16 04:25:28 +00:00
Nicola Mettifogo
c0a4881f5a Start the correct music inside the Hot Sushi. This fixes the part of ticket 2879793 that is actually a bug.
svn-id: r45147
2009-10-16 04:19:16 +00:00
Nicola Mettifogo
7e154726ff Fixed bug 2879799. Freshly loaded data was erased when changing to the new location and the character stayed the same.
svn-id: r45145
2009-10-16 03:49:27 +00:00
Nicola Mettifogo
1dfc808aad Fixed bug 2879805. Typo in inventory code made the inventory impossible to cleanup on loadgame.
svn-id: r45140
2009-10-16 00:08:18 +00:00
Nicola Mettifogo
d560de5234 Fixed bug 2879795. Ensure cursor is visible after save/load dialog and debugger are closed.
svn-id: r45138
2009-10-15 23:58:13 +00:00
Nicola Mettifogo
017b0e0acb Fixed bug 2879785. Dialogue commands were partly executed too early: see comment at line 480 in dialogue.cpp.
svn-id: r45120
2009-10-15 13:40:39 +00:00
Nicola Mettifogo
e5c88ffc7a Save/load dialog now uses GUI::SaveLoadChooser.
svn-id: r45119
2009-10-15 13:37:25 +00:00
Nicola Mettifogo
8c17b257ea Fixed regression bug #2874229. Regression had happened in r39878, when the dialogue code was refactored.
svn-id: r45053
2009-10-14 06:12:16 +00:00
Max Horn
d0876b06ed Remove some unused variables
svn-id: r44853
2009-10-09 22:21:45 +00:00
Max Horn
696fd7af20 Reduce usage of Common::String::emptyString
svn-id: r44603
2009-10-04 11:58:52 +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
Nicola Mettifogo
9be8a6e4f6 Simplified inventory handling (too much information hiding will kill you).
svn-id: r44485
2009-09-30 13:41:19 +00:00
Nicola Mettifogo
eb5beef6a1 * Added secondary inventories for BRA.
* Added comments where code must be added/updated to support multiple inventories.

svn-id: r44476
2009-09-30 07:47:58 +00:00
Nicola Mettifogo
e660f31ed8 Provide only the data that is strictly needed when creating a new Inventory.
svn-id: r44475
2009-09-30 07:09:07 +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
Filippos Karapetis
6b79910bcb Fixed some more warnings about unreachable code
svn-id: r44300
2009-09-24 10:15:50 +00:00
Torbjörn Andersson
762d2dc03a Removed unnecessary semi-colons.
svn-id: r43409
2009-08-15 14:13:48 +00:00
Nicola Mettifogo
a811c1cfea When renaming old savefiles for Nippon Safes, don't assert if a file that matches the pattern game.* and is not a savefile is found in the savepath.
svn-id: r42958
2009-07-31 12:39:31 +00:00
Nicola Mettifogo
7fd0890e14 Cleanup the header file as I removed one function in r42922.
svn-id: r42924
2009-07-30 13:44:50 +00:00
Nicola Mettifogo
000dd0a880 Fixed typo in user message.
svn-id: r42923
2009-07-30 13:42:08 +00:00
Nicola Mettifogo
4f85e9d00d Use SaveFileMan::listSaveFiles() to build list of old savegames for Nippon Safes.
svn-id: r42922
2009-07-30 13:41:22 +00:00
Nicola Mettifogo
83c8679127 Moved parser functions arrays to file scope, as they were tripping up the obsolete gcc used for the BeOS/Haiku port. If anybody can work out a better solution please apply it, because this makes me sick.
svn-id: r42793
2009-07-26 08:37:03 +00:00
Johannes Schickel
7e71865e91 Move the event recorder to its own class (EventRecoder inside common/EventRecorder.[h/cpp]).
svn-id: r42751
2009-07-25 12:59:46 +00:00
Filippos Karapetis
8a783bdd76 Renamed sound/iff.* to sound/iff_sound.* to fix an issue with the upcoming changes to the MSVC project files (sound/iff.* produces iff.obj, which clashes with iff.obj from graphics/iff.*)
svn-id: r42287
2009-07-09 13:17:46 +00:00
Nicola Mettifogo
36828287ad * Moved the updated IFF code from Parallaction to common/
* Updated Parallaction and SAGA to use the new decoder infrastructure.

svn-id: r41465
2009-06-12 08:51:05 +00:00
Nicola Mettifogo
657e37985e Cleanup of sound code.
svn-id: r41461
2009-06-12 07:55:44 +00:00
Nicola Mettifogo
df1534ffd0 * Replaced the A8SVXDecoder class with a function to return an AudioStream in trunk/sound/.
* Refactored sound code in Parallaction to use the new Audio::make8SVXStream.

svn-id: r41460
2009-06-12 07:18:01 +00:00
Nicola Mettifogo
5915e60452 Removed a leftover printf().
svn-id: r41459
2009-06-12 06:20:11 +00:00
Nicola Mettifogo
5fccc0f98d * Final version of the IFF parsing code.
* Refactored ILBMDecoder usage from disk code.

svn-id: r41458
2009-06-12 05:03:18 +00:00
Eugene Sandulenko
1bd6f6c99f Added game GUI options to advancedDetector and updated all engines
svn-id: r41272
2009-06-06 17:56:41 +00:00
Torbjörn Andersson
0999534749 The error() and warning() functions add ! and newline automatically. (I didn't
look at debug() and debugC(), since I'm really bored with this now. :-)

svn-id: r41061
2009-05-31 10:02:16 +00:00
Max Horn
fb79b18571 Changed SaveFileManager methods to take Common::String params (instead of char pointers)
svn-id: r41000
2009-05-29 14:38:22 +00:00
Nicola Mettifogo
465da49782 Made BRA demos start again by partially reverting commit 39773. Multiple inventory support must be done somehow differently.
svn-id: r40750
2009-05-21 08:06:15 +00:00
Nicola Mettifogo
3607c63758 Refactoring.
svn-id: r40210
2009-04-29 16:59:10 +00:00
Nicola Mettifogo
a8cccd0ced Removed obsolete TODO.
svn-id: r40194
2009-04-29 07:33:01 +00:00
Travis Howell
804cd38c83 Enable music and sound effects in BRA, by default.
svn-id: r40193
2009-04-29 05:47:10 +00:00
Nicola Mettifogo
9a78f6ef41 * Refactored existing save/load code to ease extension
* Added load/save dialogs using ScummVM's overlay for the moment (no actual saving is performed yet)
* Plugged the main menu so that it displays the load dialog when needed.

svn-id: r40191
2009-04-29 05:30:58 +00:00
Nicola Mettifogo
01fceec37c Implemented quit dialog box in BRA.
svn-id: r40181
2009-04-28 15:00:56 +00:00
Nicola Mettifogo
9108871833 Added in-game menu for BRA. Load/save is not supported yet.
svn-id: r40176
2009-04-28 12:25:41 +00:00
Nicola Mettifogo
19bd929a5d * Disk code cleanup.
* Added ability to load in-game menu graphics.

svn-id: r40175
2009-04-28 12:23:52 +00:00
Nicola Mettifogo
8151a1d878 Removed useless references to the global _vm.
svn-id: r39879
2009-04-06 17:31:22 +00:00
Nicola Mettifogo
0e05ec8cc8 Cleanup of Balloon and Dialogue code:
* moved version-specific code into DialogueManager's derivatives
* reworked construction of BalloonManager's derivatives
* moved a couple of globals used in dialogues (NS specific) to engine

svn-id: r39878
2009-04-06 17:21:23 +00:00
Nicola Mettifogo
20bdfe4173 Moved background and character loading code from LocationParser_br to the engine for BRA.
svn-id: r39814
2009-04-03 17:09:12 +00:00
Nicola Mettifogo
58df840a13 Moved Nippon Safes specific code from Parallaction to Parallaction_ns and adapted client code.
svn-id: r39813
2009-04-03 16:32:47 +00:00
Max Horn
fb6d0a7119 PARALLACTION: Fix silly Mingw 'shadowed declaration' warnings
svn-id: r39809
2009-04-03 14:53:15 +00:00
Nicola Mettifogo
0a2ff7f18f Fixed dialogue balloon appearing in the wrong position after commit 39772.
svn-id: r39774
2009-03-31 17:00:36 +00:00
Nicola Mettifogo
86a1926c19 Added basic multiple inventory support. This will be used for the GIVE and SWAP commands.
svn-id: r39773
2009-03-31 15:45:44 +00:00
Nicola Mettifogo
9880a2e578 There have been subclasses of DialogueManager for a while, so now we use their constructors for something.
svn-id: r39772
2009-03-31 14:35:06 +00:00
Nicola Mettifogo
b08b0f64af Character doesn't need a reference to the engine anymore.
svn-id: r39770
2009-03-31 06:49:44 +00:00
Johannes Schickel
a619443dbc PARALLACTION: Commit of parentheses patch from salty-horse. (from -devel "Enabling -Wparentheses in the Makefile").
svn-id: r39760
2009-03-30 12:09:03 +00:00
Nicola Mettifogo
5fa83a26e6 Implemented IFCHAR command. This makes part 3 of BRA completely explorable.
svn-id: r39742
2009-03-29 14:09:24 +00:00
Nicola Mettifogo
34c2546fdd Added declaration for Amiga BRA callables.
svn-id: r39741
2009-03-29 14:03:11 +00:00
Nicola Mettifogo
666f0720ab (Re)link bounding animations after location has been completely parsed. This avoids problems due to forward references.
svn-id: r39740
2009-03-29 13:56:16 +00:00
Nicola Mettifogo
340b0e632e Ensure zone and animation flags are restored when a location is reloaded. This should definitely fix bug #2718462.
svn-id: r39739
2009-03-29 13:17:34 +00:00
Nicola Mettifogo
011b73a09b Commands now evaluate their reference Zone at runtime, thus handling of forward references in the parser is no more needed.
svn-id: r39738
2009-03-29 12:41:00 +00:00
Nicola Mettifogo
01812f0830 Fixed several free/delete mismatches.
svn-id: r39736
2009-03-29 12:11:10 +00:00
Nicola Mettifogo
8b3f6b0299 Set main menu text height to the actual font height.
svn-id: r39735
2009-03-29 12:10:17 +00:00
Nicola Mettifogo
28465d73bb Merged CommandData into Command.
svn-id: r39732
2009-03-29 10:18:09 +00:00
Nicola Mettifogo
329c3321e8 Added workaround for script bug in ticket #2718449.
svn-id: r39724
2009-03-28 14:38:19 +00:00
Nicola Mettifogo
f2d7875db6 Added initialization for _index and _locationIndex in Zone objects.
svn-id: r39723
2009-03-28 14:17:17 +00:00
Nicola Mettifogo
a9f5340cba Save zone and animation flags when a location is closed. This fixes bug #2718462.
svn-id: r39722
2009-03-28 14:03:51 +00:00
Travis Howell
97abfc9181 Add sound effects support for Amiga demo of BRA.
svn-id: r39717
2009-03-28 10:06:43 +00:00
Travis Howell
4979179621 Add sound effects support for PC version of BRA.
svn-id: r39716
2009-03-28 09:56:39 +00:00
Travis Howell
9131f20587 Change the detection of Amiga versions of BRA, to a required data file (request.win).
svn-id: r39715
2009-03-28 06:45:22 +00:00
Nicola Mettifogo
146597dd2d Adjusted calculation of scanline width for ILBM files to account for occasional padding bytes. This fixes the loading of some backgrounds in BRA.
svn-id: r39705
2009-03-27 05:57:19 +00:00
Nicola Mettifogo
c1ff3aec3e Removed paranoia check.
svn-id: r39656
2009-03-24 09:01:44 +00:00
Nicola Mettifogo
76c0d08200 * Pushed evaluation of 'following question' from dialogue parsing to dialogue execution.
* Removed all the question forwards declaration code

svn-id: r39654
2009-03-24 08:20:08 +00:00
Nicola Mettifogo
0998f53cb0 Refactored the zone type parsers.
svn-id: r39650
2009-03-23 23:17:33 +00:00
Nicola Mettifogo
d82aea1e54 Turned ZoneTypes into a regular numeric id (no more a bitfield).
svn-id: r39648
2009-03-23 22:34:46 +00:00
Nicola Mettifogo
52b1c9e32f Oops.
svn-id: r39646
2009-03-23 20:42:53 +00:00
Nicola Mettifogo
2223627c75 Merged GetData, HearData, SpeakData, PathData, ExamineData, MergeData into TypeData struct. This simplifies life a bit especially in the parsers.
svn-id: r39645
2009-03-23 20:41:54 +00:00
Nicola Mettifogo
8cebcaf017 Pushed down dependencies from parser.h
svn-id: r39636
2009-03-23 17:42:08 +00:00
Travis Howell
92e788dbb6 Fix pallete for label font in the Amiga version of BRA.
svn-id: r39632
2009-03-23 12:30:47 +00:00
Nicola Mettifogo
d18274d0ee Implemented all variants of IF script instruction. Program class has been changed to store an Array of instruction instead of a List, so that references to instructions are integers.
svn-id: r39631
2009-03-23 11:38:09 +00:00
Travis Howell
e48cd66dab Correct label font used by Amiga version of BRA.
svn-id: r39629
2009-03-23 10:07:22 +00:00
Travis Howell
4f21bc467f Correct the fonts used by Amiga version of BRA.
svn-id: r39628
2009-03-23 09:16:26 +00:00
Nicola Mettifogo
4f2e22e87a Partly implemented the STOP script instruction.
svn-id: r39624
2009-03-23 08:05:20 +00:00
Nicola Mettifogo
5c714cb46e Implemented MOVE script instruction.
svn-id: r39623
2009-03-23 08:00:39 +00:00
Nicola Mettifogo
71f42a9549 Fully implemented scrolling.
svn-id: r39622
2009-03-23 00:56:05 +00:00
Nicola Mettifogo
052a6ea1f9 Stop erroring out if mask or shadow files are missing: not all location/objects have them.
svn-id: r39620
2009-03-22 23:07:51 +00:00
Nicola Mettifogo
77c97670a3 Added support for 3 bit deep ILBM images.
svn-id: r39619
2009-03-22 23:07:08 +00:00
Nicola Mettifogo
2b8140d765 Added simple IFF type verification to the parser.
svn-id: r39609
2009-03-22 15:30:42 +00:00
Nicola Mettifogo
631e0aaed5 Changed Disk code to provide SeekableReadStream's to sound routines as well.
svn-id: r39608
2009-03-22 15:25:55 +00:00
Nicola Mettifogo
e7a94e9dfe Set the right colors for dialogue text in BRA Amiga.
svn-id: r39595
2009-03-21 18:00:41 +00:00
Nicola Mettifogo
c3bac3d851 Fix build.
svn-id: r39586
2009-03-21 15:13:02 +00:00
Nicola Mettifogo
8f57c621d2 Some Surface tinkering, and added TODO's about it.
svn-id: r39585
2009-03-21 15:01:46 +00:00
Nicola Mettifogo
14e2793449 Changed Nippon Safes to make use of the new ILBMDecoder.
svn-id: r39584
2009-03-21 15:00:44 +00:00
Nicola Mettifogo
9682ae5947 Extended the IFF parser to handle 1 and 5 bits deep images.
svn-id: r39583
2009-03-21 14:58:36 +00:00
Travis Howell
bd8b94ee8a Fix regression when loading icons in Amiga versions of BRA.
svn-id: r39580
2009-03-21 01:08:04 +00:00
Jordi Vilalta Prat
16c2c37dba Fix namespace name
svn-id: r39574
2009-03-20 21:22:30 +00:00
Nicola Mettifogo
db5150dd7c Added TODO's about replacing usage of the old ILBM decoder in Nippon Safes.
svn-id: r39573
2009-03-20 20:38:33 +00:00
Nicola Mettifogo
742c9c9d6a * Reimplemented routine using the old ILBM decoder to use the new one
* Fixed all remaining issues with masks.

svn-id: r39572
2009-03-20 20:37:58 +00:00
Nicola Mettifogo
286abed4e7 Added more flexible IFF parser and ILBM decoder.
svn-id: r39571
2009-03-20 20:37:06 +00:00
Nicola Mettifogo
739181c3b7 Postpone loading of mask and path data on BRA. This fixed locations in which mask and path are defined before the screen bitmap.
svn-id: r39512
2009-03-18 10:55:05 +00:00
Nicola Mettifogo
71f8b83c47 Fixing the last commit, by using the right type in the cast.
svn-id: r39491
2009-03-17 19:36:38 +00:00
Nicola Mettifogo
dc2002348d Another explicit cast for a historic compiler.
svn-id: r39490
2009-03-17 19:13:45 +00:00
Nicola Mettifogo
3a98786bc0 Removed one of the overloads of SoundMan::execute(), to make retarded compiler happy. Added a couple of explicit casts from bool to int, so that other compiler don't complain instead.
svn-id: r39489
2009-03-17 19:04:59 +00:00
Nicola Mettifogo
7697fd9cc7 Fixed the transparency problems of static objects in BRA.
svn-id: r39486
2009-03-17 16:45:09 +00:00
Nicola Mettifogo
92c9365650 Additional palette is loaded on colors 1-15.
svn-id: r39474
2009-03-17 07:02:14 +00:00
Nicola Mettifogo
17d38f2763 Fixed the remaining palette problems by loading the shadow (mask) file for static objects.
svn-id: r39473
2009-03-17 06:57:49 +00:00
Travis Howell
cb837c3fe0 Fix regression, caused by my change to adjustForPalette().
svn-id: r39472
2009-03-17 05:29:59 +00:00
Travis Howell
e47c9189d4 Fix graphical glitches in the Amiga version of BRA, the height seems to be off by one.
svn-id: r39471
2009-03-17 04:41:23 +00:00
Travis Howell
6df028151e Fix regression in the Amiga demo of BRA, the common sub directory doesn't exist in the demo.
svn-id: r39470
2009-03-17 04:32:12 +00:00
Travis Howell
4a45b4408c Sound files don't always exist in the Amiga version of BRA.
svn-id: r39469
2009-03-17 04:07:56 +00:00
Travis Howell
2e321f81ed Sound files don't always exist in the Amiga version of BRA.
svn-id: r39468
2009-03-17 04:07:02 +00:00
Travis Howell
7d1aed7c83 Add support for loading palette files in the Amiga version of BRA.
svn-id: r39467
2009-03-17 03:58:57 +00:00
Travis Howell
0434c13713 Enable sound effects in the Amiga version of BRA.
svn-id: r39466
2009-03-17 03:32:03 +00:00
Travis Howell
331399db9b Change adjustForPalette(), to skip transparency color (zero).
svn-id: r39464
2009-03-17 00:00:29 +00:00
Travis Howell
5f087d5ad6 Cleanup.
svn-id: r39463
2009-03-16 23:58:19 +00:00
Travis Howell
99bd2b4d40 Update main menu items, to match original Amiga version of BRA.
svn-id: r39448
2009-03-16 14:38:57 +00:00
Travis Howell
5aaa9870b1 Add talk position adjustment to loadTalk for Amiga version of BRA too.
svn-id: r39446
2009-03-16 14:35:18 +00:00
Travis Howell
7d85194eaa Fix crash regression in BRA introduction for now.
svn-id: r39444
2009-03-16 09:38:20 +00:00
Nicola Mettifogo
1ac00f210b Fixed most palette issues in BRA Amiga.
svn-id: r39441
2009-03-16 09:11:51 +00:00
Nicola Mettifogo
9e792deb3e Added mouse cursor to BRA Amiga. To be perfected.
svn-id: r39434
2009-03-16 00:03:22 +00:00
Nicola Mettifogo
6ecc3991ed Fixed typo in r39418.
svn-id: r39419
2009-03-15 14:17:01 +00:00
Travis Howell
e486374152 Fix crash regression in the Amiga BRA demo, by checking if mask buffer exists, before using it.
svn-id: r39418
2009-03-15 13:28:20 +00:00
Travis Howell
08638c5f77 The Amiga demo of BRA doesn't have quite as many icons.
svn-id: r39415
2009-03-15 09:51:02 +00:00
Travis Howell
e27d2f7144 Set mouse buffers in Amiga version of BRA, so selecting inventory object no longer crashes.
svn-id: r39414
2009-03-15 09:39:16 +00:00
Travis Howell
7f99a190cb Fix loading objects in the Amiga version of BRA.
svn-id: r39413
2009-03-15 09:29:25 +00:00
Nicola Mettifogo
bcabf5e53f Fixed regression from r39410, by reimplementing the decompression routine. The backgrounds in the DOS version of Nippon Safes are compressed by something that looks like PackBits, but is not PackBits. Hence, the change to make PackBitsReadStream behave as the standard broke it.
svn-id: r39412
2009-03-15 08:17:57 +00:00
Travis Howell
13497da82e Ooops, actually set _mixer.
svn-id: r39411
2009-03-15 06:23:16 +00:00
Travis Howell
a6497584cc Enable music in Amiga version of BRA too.
svn-id: r39409
2009-03-15 06:07:57 +00:00
Nicola Mettifogo
82e1d15aef Added missing initializations.
svn-id: r39407
2009-03-15 04:29:26 +00:00
Filippos Karapetis
d953ddd376 GfxObj is a class, not a struct
svn-id: r39402
2009-03-14 17:42:48 +00:00
Nicola Mettifogo
6398e56d09 Added midi support to BRA. So far music starts, but related script commands haven't been implemented yet.
svn-id: r39397
2009-03-14 17:02:28 +00:00
Nicola Mettifogo
14ced31851 Fixed building on 64-bit architectures.
svn-id: r39395
2009-03-14 15:34:28 +00:00
Nicola Mettifogo
8723afd6f4 * Added a generic sound manager that hides engine-specific managers and allows accessing them through a simplified command/parameter interface.
* Updated client code to use the new manager.
* Moved Nippon Safes sound code from sound.cpp to sound_ns.cpp.

svn-id: r39394
2009-03-14 15:09:31 +00:00
Max Horn
f9ecd95d69 Whitespace cleanup: Convert space followed by tab to just tab
svn-id: r39203
2009-03-07 19:24:31 +00:00
Max Horn
05b4370c21 Fix for bug #2664460: Various SeekableReadStream::seek() implementations (as well as our unit tests, ouch) handled SEEK_END incorrectly (using -offset instead of offset), contrary to what the docs said and what fseek does. Hopefully I found and fixed all affected parts, but still watch out for regressions
svn-id: r39135
2009-03-05 20:37:53 +00:00
Jordi Vilalta Prat
047f116515 Renamed MetaEngine::getCopyright() to getOriginalCopyright() to better match the meaning of the returned string, as discussed some time ago in scummvm-devel
svn-id: r39132
2009-03-05 12:04:58 +00:00
Nicola Mettifogo
040da3353f Marked PUT, PRINT and WAIT commands as not used in the scripts of BRA (thus they won't be implemented).
svn-id: r39075
2009-03-02 15:31:07 +00:00
Nicola Mettifogo
11a49681e4 Implemented 'open', 'close' and 'leave' commands.
svn-id: r39073
2009-03-02 11:58:40 +00:00
Nicola Mettifogo
310036788a Enabled walking delay for follower animation.
svn-id: r39067
2009-03-02 09:16:03 +00:00
Nicola Mettifogo
f1044e85b2 Fixed selection of zone and animation for removal in BRA. This enables the follower animation to follow the main character across location switches.
svn-id: r39065
2009-03-02 08:44:30 +00:00
Nicola Mettifogo
33a8fe7a7e Initialize and save zones flags and follower position when a location switch occurs.
svn-id: r39064
2009-03-02 08:36:42 +00:00
Nicola Mettifogo
813bd1ac7a Fixed overflow in flag table.
svn-id: r39062
2009-03-02 06:14:25 +00:00
Max Horn
3fcbda829a Merged Engine::go() and ::init() into a new run() method (currently implemented by calling the existing init&go methods; to be cleaned up by engine authors
svn-id: r39002
2009-03-01 04:30:55 +00:00
Nicola Mettifogo
4bd19f7a7f Improved debug output when listing animations.
svn-id: r38948
2009-02-28 06:21:24 +00:00
Nicola Mettifogo
44906f574f The engine has now to build the drawing list for the graphic department, instead of setting visibility flags; the new field _prog has been added to GfxObj to help sorting the list.
The outcome is that cleaning up unused resources on location switches is now easier to manage, and less error prone.

svn-id: r38928
2009-02-27 08:56:19 +00:00
Nicola Mettifogo
e17a140019 Improved debugger output.
svn-id: r38927
2009-02-27 08:46:39 +00:00
Nicola Mettifogo
09196a35ad Added filter to preserve needed Animation across location switch.
svn-id: r38903
2009-02-26 14:53:57 +00:00
Nicola Mettifogo
b76ad3dc4f changeLocation now uses the internal variable _newLocationName instead of an input parameter.
svn-id: r38902
2009-02-26 14:42:03 +00:00
Nicola Mettifogo
88efc8603e Removed null*Ptr dummy objects, using SharedPtr's reset method to null pointers instead.
svn-id: r38897
2009-02-26 10:44:01 +00:00
Nicola Mettifogo
76283e3f73 Merged walk code for NS, and simplified handling.
svn-id: r38894
2009-02-26 09:42:08 +00:00
Nicola Mettifogo
3efffe511b Fixed crashes and leaks when quitting BRA from menu and splash screen.
svn-id: r38893
2009-02-26 09:12:29 +00:00
Nicola Mettifogo
d5d006bb30 Cleanup of CommandExec and ProgramExec, and pushed down dependencies from exec.h.
svn-id: r38892
2009-02-26 06:16:35 +00:00
Nicola Mettifogo
301e9d73d1 * Rebased Parallaction_br to inherit from Parallaction instead of Parallaction_ns
* Same as above for CommandExec_br and ProgramExec_br
This should finally kill most issues with destruction, at the cost of some code duplication.

svn-id: r38877
2009-02-25 09:15:53 +00:00
Nicola Mettifogo
93666ef53c Updated all for(;;) loops to use prefix increment on iterators.
svn-id: r38876
2009-02-25 08:53:58 +00:00
Nicola Mettifogo
8ba9e804a8 Fixed segfault when quitting BRA.
svn-id: r38875
2009-02-25 03:52:16 +00:00
Nicola Mettifogo
b3d2429b04 Fixed shadowed name.
svn-id: r38841
2009-02-24 15:21:53 +00:00
Nicola Mettifogo
6334125d1c Implemented follower support, except that:
* follower is forgotten when location changes (see freeLocation)
* the final walking frame is screwed

svn-id: r38838
2009-02-24 11:20:45 +00:00
Nicola Mettifogo
5dff53a2fa Added preliminary code for following walker support in BRA.
svn-id: r38837
2009-02-24 09:18:20 +00:00
Nicola Mettifogo
659c9fb901 Changed interface to walk code, to better handle the differences between games. Moreover:
* merged PathBuilder_BR into PathWalker_BR
* implemented checkTrap routine for BRA

svn-id: r38836
2009-02-24 08:42:46 +00:00
Nicola Mettifogo
e3afa772e2 Cleanup.
svn-id: r38817
2009-02-23 12:17:25 +00:00
Nicola Mettifogo
9bef5a0cfc Rewrote the sarcophagus puzzle in Nippon Safes, since I finally understood how it was implemented in the original!
svn-id: r38816
2009-02-23 11:55:25 +00:00
Nicola Mettifogo
edaf382d2f * Refactored drawAnimations to be more easily extensible when adding game-specific features.
* Added a new zonesToUpdate list to keep track of movable zones.

svn-id: r38815
2009-02-23 11:50:10 +00:00
Nicola Mettifogo
3874465bdb Fix for bug #1864270. Music now goes on after the the credits have been displayed in the Amiga demo version of Nippon Safes.
svn-id: r38664
2009-02-21 05:19:35 +00:00
Nicola Mettifogo
e088f680a6 Fix for bug #2619824. Command list execution is now paused when showing credits. This fixes the Amiga demo of Nippon Safes, which would otherwise quit without displaying the credits.
svn-id: r38662
2009-02-21 04:44:20 +00:00
Johannes Schickel
5417f6bacb - Replace OSystem::clearScreen with OSystem::fillScreen as discussed on -devel.
- Update BaseBackend and DC port to properly implement OSystem::fillScreen (now only PalmOS has to be updated).
- Update all client code which relied on OSystem::clearScreen so far.

svn-id: r38304
2009-02-15 21:20:21 +00:00
Nicola Mettifogo
d1b71335d6 Fixed support for walking zones in BRA:
* patches are not applied if the zone is not visible when loading 
* when applying a patch, always overwrite the existing data instead of OR'ing

svn-id: r36209
2009-02-03 10:42:27 +00:00
Nicola Mettifogo
0a42482fc3 Removed newlines from debug statements.
svn-id: r36208
2009-02-03 10:38:56 +00:00
Max Horn
7cb437b56f Renamed SpecialDebugLevel to DebugChannel
svn-id: r36142
2009-01-30 05:10:24 +00:00
Max Horn
28cf213605 Moved AdvancedDetector from common/ to engines/
svn-id: r36132
2009-01-29 22:13:01 +00:00
Max Horn
14c5bbbccf Renamed Archive::openFile to createReadStreamForMember
svn-id: r36021
2009-01-23 04:45:44 +00:00
Max Horn
9861afd8fd Renamed ArchiveMember::open -> createReadStream, and made it a cv member (const); same for Archive::openFile
svn-id: r36020
2009-01-23 04:36:18 +00:00
Nicola Mettifogo
b2a9393eee Replacement an immediate with the appropriate #define constant.
svn-id: r35950
2009-01-20 12:47:39 +00:00
Nicola Mettifogo
545b76876a Character is now placed at the right spot when a new location is entered. Size may be still not right, though.
svn-id: r35945
2009-01-20 11:07:27 +00:00
Nicola Mettifogo
3e611e1eb7 Adapted fixed-sized arrays to cope with the larger dialogues in BRA. Maybe they should be turned into dynamic data structures...
svn-id: r35944
2009-01-20 10:39:16 +00:00
Nicola Mettifogo
e5d75d1f7b Fixed regression from revision 35765. Mask and path patches were destroyed before getting a chance to be used.
svn-id: r35835
2009-01-12 13:14:09 +00:00
Nicola Mettifogo
99d603c332 Attempted fix of bug #2438637 (Dino not erased in introduction screen on Amiga Nippon Safes), by not forcing the character visible on a location switch.
svn-id: r35786
2009-01-08 14:34:22 +00:00
Nicola Mettifogo
4b402e4cd8 Fixed points 2 and 3 of bug #2438549, spotlight wasn't displayed correctly.
svn-id: r35785
2009-01-08 14:12:46 +00:00
Nicola Mettifogo
beacae5efd Trim resource filenames to 8 characters as a last resort on BRA. Script files are unbelievably broken.
svn-id: r35784
2009-01-08 07:31:32 +00:00
Nicola Mettifogo
294c76f4c4 Don't assert anymore when a command flag doesn't exist, but ignore it and print a warning instead. Some location scripts in BRA are totally broken.
svn-id: r35783
2009-01-08 07:11:32 +00:00
Max Horn
e955e0b4c4 Fixed warnings
svn-id: r35780
2009-01-07 23:30:31 +00:00
Nicola Mettifogo
5cf67c6ed7 Implemented Engine::getDebugger().
svn-id: r35768
2009-01-07 15:30:38 +00:00
Nicola Mettifogo
f1ad8b6934 Extended PathBuffer to support BRA.
svn-id: r35766
2009-01-07 08:16:18 +00:00
Nicola Mettifogo
21fae9d029 * moved more mask management to BackgroundInfo
* simplified mask management for client code
* reduced the clutter into graphics.h by moving the implementations of BackgroundInfo, MaskBuffer and PathBuffer to graphics.cpp
* preparation for the full implementation of BRA's PathBuffer

svn-id: r35765
2009-01-07 07:35:11 +00:00
Nicola Mettifogo
ef05ed7a98 Cleanup.
svn-id: r35764
2009-01-07 07:21:50 +00:00
Nicola Mettifogo
fa1d881ad4 Implemented pauseEngineIntern, and fixed music volume handling in SoundMan.
svn-id: r35756
2009-01-06 16:21:23 +00:00
Nicola Mettifogo
c6935f2f69 Fixed broken condition check for displaying dialogue balloons.
svn-id: r35748
2009-01-06 06:13:45 +00:00
Nicola Mettifogo
2d74085545 Deleted unused declarations, sorted others, and removed some dead code.
svn-id: r35739
2009-01-05 14:07:26 +00:00
Max Horn
83a8f7bc29 Fixed warning
svn-id: r35730
2009-01-04 17:17:28 +00:00
Nicola Mettifogo
7a0b782a3c Made sure to display labels on animations.
svn-id: r35726
2009-01-04 15:37:46 +00:00
Nicola Mettifogo
a53fa36913 Made sure each event is processed only once. This wasn't always the case when _inputMode changed as a result of a game action. This also caused the comment mode to be apparently skipped.
svn-id: r35725
2009-01-04 15:09:28 +00:00
Nicola Mettifogo
f2b495ba2d Implemented counters in BRA. Only valid answer options are shown, and counter calculations in scripts are performed.
svn-id: r35723
2009-01-04 14:23:20 +00:00
Nicola Mettifogo
b2d7ae871b Dropped the script preprocessor introduced to fix the broken scripts. The parser has evolved in the meantime and can deal with it accordingly.
svn-id: r35700
2009-01-03 14:03:12 +00:00
Nicola Mettifogo
f32f4e5cec Another change I forgot to do in revision 35447.
svn-id: r35619
2008-12-30 05:14:27 +00:00
Max Horn
f26f85ee96 GUI: Added Widget::setVisible convenience wrapper
svn-id: r35572
2008-12-27 14:36:28 +00:00
Nicola Mettifogo
b3b23642bf Fixed selection of invalid frame numbers. This means that most locations can be switched to and don't crash up anymore!
svn-id: r35550
2008-12-26 05:44:32 +00:00
Max Horn
df20d264fd Pushing down some header deps (on common/system.h, mostly)
svn-id: r35542
2008-12-25 20:40:00 +00:00
Johannes Schickel
45529628e1 Fix for bug #2464538 "PARALLACTION: Compiler error on AmigaOS4",
svn-id: r35533
2008-12-25 00:18:01 +00:00
Nicola Mettifogo
cae7c2346f Questions in dialogues can have up to 10 answers in BRA.
svn-id: r35524
2008-12-24 10:35:34 +00:00
Nicola Mettifogo
41ebd732f5 Fixed display of location background when changing from a scrollable to a non-scrollable one.
svn-id: r35522
2008-12-24 09:53:00 +00:00
Nicola Mettifogo
6c1dc0c03b Simplified destructions of Balloon objects.
svn-id: r35521
2008-12-24 09:51:07 +00:00
Nicola Mettifogo
e11c17a005 Moved more GfxObj management to Gfx object.
svn-id: r35466
2008-12-21 15:42:47 +00:00
Nicola Mettifogo
74b251d45d Added a stub to dialogue parser, so that dialogue lines controlled by counters are displayed.
svn-id: r35465
2008-12-21 15:41:41 +00:00
Nicola Mettifogo
025b2a93e9 Moved mask creation/handling to Gfx.
svn-id: r35447
2008-12-20 08:15:09 +00:00
Nicola Mettifogo
774773b7cd Reduced code duplication when manipulating Animations, and cleanup.
svn-id: r35408
2008-12-17 11:15:47 +00:00
Nicola Mettifogo
c76f0bdb10 Weeded out some more unused code, and some restructuring.
svn-id: r35377
2008-12-15 07:15:29 +00:00
Nicola Mettifogo
dc3e9027f4 Removed references to _vm from the engine itself.
svn-id: r35358
2008-12-14 10:32:26 +00:00
Nicola Mettifogo
e98bc7e402 Removed some unused code.
svn-id: r35357
2008-12-14 10:08:31 +00:00
Nicola Mettifogo
5b39775184 Some more restructuring of rendering code.
svn-id: r35343
2008-12-13 17:52:37 +00:00
Nicola Mettifogo
800db6f142 Restructuring of rendering code.
svn-id: r35342
2008-12-13 17:31:48 +00:00
Nicola Mettifogo
b3475d8178 * Replaced char* with Common::String in the parser.
* Enforced const-correctness on related routines.

svn-id: r35326
2008-12-13 03:37:43 +00:00
Nicola Mettifogo
6724097f67 Fixed positioning of inventory.
svn-id: r35325
2008-12-13 03:36:28 +00:00
Nicola Mettifogo
7e7d5c68ed Initialised variables to silence lots of valgrind's warnings.
svn-id: r35312
2008-12-12 04:52:37 +00:00
Nicola Mettifogo
6ecc17010d Fixed some more leaks and mismatched allocations/deallocations.
svn-id: r35277
2008-12-07 14:33:30 +00:00
Nicola Mettifogo
b557c58d3b Missing break statement caused many broken warning messages.
svn-id: r35271
2008-12-07 12:47:14 +00:00
Nicola Mettifogo
db88c544b7 Fixed assorted leaks in Parallaction.
svn-id: r35270
2008-12-07 12:41:50 +00:00
Eugene Sandulenko
00de4b2b3c Fix bug #2401150: "Compiler: No matching function (Parallaction / Amiga)"
svn-id: r35269
2008-12-07 09:21:01 +00:00