Commit Graph

5298 Commits

Author SHA1 Message Date
Filippos Karapetis
e010c59277 Oops, made _speakerStream private again
svn-id: r29574
2007-11-19 22:47:58 +00:00
Filippos Karapetis
2d3316a570 _speakerStream should be public. Also, when preAGI engine closes, the speaker handle is freed
svn-id: r29573
2007-11-19 22:37:52 +00:00
Nicola Mettifogo
f8e1da5b60 * made engine use Inventory and InventoryRenderer
* inventory drawing is now performed directly in the framebuffer instead of using the game screen buffer
* specialized jobs to handle inventory drawing have been deleted as they had become obsolete

svn-id: r29571
2007-11-19 20:46:28 +00:00
Eugene Sandulenko
7270c8113e oops. that's what last minute moves may result in.
svn-id: r29570
2007-11-19 20:41:13 +00:00
Eugene Sandulenko
8a145bbb53 Hook PC Speaker to Troll's Tale. Though pitch and duration are wrong
svn-id: r29569
2007-11-19 20:34:26 +00:00
Nicola Mettifogo
d86246308d Walk and script handling are now directly handled by the main loop, instead of relying on the job list.
svn-id: r29568
2007-11-19 20:23:01 +00:00
Sven Hesse
b1f6be7baa Moved Gob's square wave generator to sound/softsynth/pcspk.h
svn-id: r29564
2007-11-18 23:35:09 +00:00
Sven Hesse
40a5f8028a Muting the compiler :P
svn-id: r29563
2007-11-18 22:22:38 +00:00
Nicola Mettifogo
28289fb694 Cleanup.
svn-id: r29562
2007-11-18 21:32:22 +00:00
Nicola Mettifogo
7731af9833 Partly decoupled rendering from game data update. Graphics routines to draw/erase animations and labels are now invoked explicitly instead of being handled in the job list.
svn-id: r29561
2007-11-18 21:16:27 +00:00
Gregory Montoir
c76c6e2256 added rjp1 module specific pattern playback
svn-id: r29559
2007-11-18 20:27:31 +00:00
Nicola Mettifogo
9e58b0253d Removed other paranoia code from the original engine (as in revision 29505).
svn-id: r29558
2007-11-18 18:04:41 +00:00
Nicola Mettifogo
6471eb84f2 Cleanup.
svn-id: r29556
2007-11-18 13:22:38 +00:00
Torbjörn Andersson
ade0b5a212 Fixed sluggish mouse cursor on restart/restore screen.
svn-id: r29555
2007-11-18 10:08:43 +00:00
Paul Gilbert
9195905008 Further fixes to sound code (thanks to eriktorbjorn)
svn-id: r29554
2007-11-18 08:11:29 +00:00
Paul Gilbert
ab445635cb Added some extra mutex locks to the sound code to hopefully prevent randomo crashes
svn-id: r29553
2007-11-18 07:42:49 +00:00
Gregory Montoir
0867e09a81 - added CTMF music support
- fixed dialogue in PART12

svn-id: r29552
2007-11-18 06:25:23 +00:00
Paul Gilbert
7b458c96b0 Bugfix to only delay showing a new talk dialog if there isn't one active in the current room
svn-id: r29550
2007-11-18 06:16:58 +00:00
Paul Gilbert
3364e03517 Reordered savegame content to fix bug where restoring a savegame from after a fight caused the opponent to briefly appear alive again
svn-id: r29549
2007-11-18 06:14:53 +00:00
Paul Gilbert
eadb5b7292 Added sounds to endgame animation sequence
svn-id: r29548
2007-11-18 05:11:38 +00:00
Paul Gilbert
4d21471155 Cleaned up animation player and added support for a set of sounds to be played during an animation
svn-id: r29547
2007-11-18 05:10:56 +00:00
Travis Howell
2670862c33 Update comment for workaround for bug #1745996.
svn-id: r29545
2007-11-18 04:42:40 +00:00
Travis Howell
4ce9b7fa15 Switch invalid items back to error message, since restart state issues are fixed now..
svn-id: r29544
2007-11-18 04:34:08 +00:00
Travis Howell
70c4f25aef Fix loading restart state file in Amiga version of Waxworks.
svn-id: r29543
2007-11-18 04:02:11 +00:00
Travis Howell
7bc422a8e9 Use unique save game naming for PC versions of Elvira 2 and Waxworks, due to the save game format differences.
svn-id: r29539
2007-11-17 12:48:28 +00:00
Paul Gilbert
9a07589de8 Bugfix to properly clear previous room layers and fade in the screen when restoring a game
svn-id: r29537
2007-11-17 11:03:18 +00:00
Paul Gilbert
813ca5cf39 Added missing code to deactivate animations that have finished
svn-id: r29536
2007-11-17 10:49:14 +00:00
Torbjörn Andersson
14ac86abe0 Fixed sluggish mouse cursor during palette fade ins/outs.
svn-id: r29535
2007-11-17 10:47:37 +00:00
Travis Howell
f10f40aff0 Fix bug #1759850 - ELVIRA2: Restart state file causes crash. The itemStore data needed to be adjusting, when loading or saving in the AtariST and Amiga versions.
svn-id: r29534
2007-11-17 10:27:31 +00:00
Paul Gilbert
2e3866b6f4 Identified some more Endian issues (thanks to Max)
svn-id: r29533
2007-11-17 10:21:27 +00:00
Nicola Mettifogo
a3abaaa709 Refactored main input code.
svn-id: r29532
2007-11-17 09:39:20 +00:00
Paul Gilbert
eaee457431 Added missing destructor and sounds to barrel animation sequence
svn-id: r29531
2007-11-17 08:58:31 +00:00
Paul Gilbert
75382bdadc Added saving of the current hotspot animation record to savegames
svn-id: r29528
2007-11-17 08:44:38 +00:00
Paul Gilbert
4987cde3a1 Changed default value of _walkFlag in Hotspot constructor
svn-id: r29527
2007-11-17 08:42:23 +00:00
Paul Gilbert
ca10a4db08 Bugfixes to the fighting animations and proper reset of fight data between save sessions
svn-id: r29526
2007-11-17 06:53:13 +00:00
Paul Gilbert
1002a58f01 Cleaned up the logic of the activateHotspot method
svn-id: r29525
2007-11-17 06:52:35 +00:00
Paul Gilbert
d5dc2e075a Bugfixes to restoring or restarting a game from the Restore/Restart dialog
svn-id: r29524
2007-11-17 00:19:45 +00:00
Johannes Schickel
7b43ba576c Added const to static data.
svn-id: r29520
2007-11-16 23:08:17 +00:00
Paul Gilbert
85be70f65b Fixed a direct access causing endian problems
svn-id: r29519
2007-11-16 22:59:40 +00:00
Nicola Mettifogo
058009a113 Refactored language selection code.
svn-id: r29518
2007-11-16 22:03:39 +00:00
Max Horn
c8ce5b1865 Changed Audio::makeADPCMStream so that the stream passed to it can automatically be disposed
svn-id: r29517
2007-11-16 10:05:18 +00:00
Paul Gilbert
ca2641b70f Changed conversation guards so that the player talking will only be paused if there's another active conversation that's in the same room
svn-id: r29516
2007-11-16 08:59:18 +00:00
Paul Gilbert
fe690d5688 Bugfix for talk dialog not closing if the same character talks twice in immediate succession
svn-id: r29515
2007-11-16 08:54:38 +00:00
Paul Gilbert
6f23a38c12 Added guard to prevent a character being reset to a default direction frame after a call to SetDirection if they're already facing in that direction - fixes some characters alternating frames
svn-id: r29514
2007-11-16 07:47:43 +00:00
Paul Gilbert
4bfa437887 Bugfix to make player walk over to Goewin when talking to her
svn-id: r29513
2007-11-16 07:32:03 +00:00
Paul Gilbert
ced8d602a7 Bugfix to have NPC stand still during showMessage talk actions
svn-id: r29512
2007-11-16 06:53:18 +00:00
Gregory Montoir
de750efced added support for Adlib tracks
svn-id: r29509
2007-11-15 20:21:33 +00:00
Paul Gilbert
b95a102011 Fixes to parameters of script methods
svn-id: r29508
2007-11-15 11:33:16 +00:00
Paul Gilbert
61e8ad7a32 Bugfix to prevent characters occasionally facing one way whilst walking in another direction
svn-id: r29507
2007-11-15 10:07:46 +00:00
Nicola Mettifogo
0dc9a12db9 Removed an unclear (paranoid?) continue statement from the original engine. We are just doing a screen update more than the original this way. If this is bad, then we can go back, but for now, let the execution flow.
svn-id: r29505
2007-11-14 22:31:53 +00:00
Nicola Mettifogo
10caba3562 * centralized kEngineChangeLocation flag handling
* simplified runGame, moving flags testing into called routines

svn-id: r29504
2007-11-14 22:24:26 +00:00
Max Horn
193e59151c Improved the game desc naming in the drascula detection code
svn-id: r29503
2007-11-14 19:27:08 +00:00
Paul Gilbert
2a24ecaf9b Fixed clipping issues that were still occurring in some rooms
svn-id: r29500
2007-11-14 11:46:55 +00:00
Kostas Nakos
323cb4827f Moving the vitual keyboard show/hide hints during the copy protection screens to the scumm engine.
As the original code is slightly cryptic, there may be something wrong with MI1 (as commented)

svn-id: r29495
2007-11-13 19:41:35 +00:00
Johannes Schickel
be01daccdb - implemented opcodes:
-> o2_setHiddenItemsEntry 147
  -> o2_getHiddenItemsEntry 148
  -> o2t_fadeScenePal 3
- added o2t_playSoundEffect to the temporary opcode list

svn-id: r29494
2007-11-13 15:49:21 +00:00
Paul Gilbert
149e87ecfb Added guard to prevent one character's talk dialog interrupting another one that's already in-progress
svn-id: r29492
2007-11-13 09:49:43 +00:00
Paul Gilbert
3d796f4b53 Tweak to object walk to position calculations - NPCs will no longer get stuck in doors they close
svn-id: r29489
2007-11-13 08:47:25 +00:00
Johannes Schickel
c908a8a73f Implemented all timer handlers. (Cauldron animations work now)
svn-id: r29487
2007-11-12 20:04:44 +00:00
Filippos Karapetis
71d54d1d36 Added a workaround for a problematic object in Gorrister's chapter (Edna's key)
svn-id: r29486
2007-11-12 19:49:42 +00:00
Johannes Schickel
2e46b741a3 - Implemented opcodes:
-> o2_removeHandItem 43
  -> o2_makeBookOrCauldronAppear 42
- Implemented inventory WSA functionality

svn-id: r29485
2007-11-12 17:56:49 +00:00
Johannes Schickel
65c57841bd Fixes regression introduced with r29218.
svn-id: r29484
2007-11-12 16:35:46 +00:00
Paul Gilbert
16a4708adc Set Catriona to her correct rocking speed
svn-id: r29483
2007-11-12 10:30:23 +00:00
Paul Gilbert
7bf1b77f3c removeSounds was being called too early - it was setting the current area to that of the room being left, rather than the one being entered
svn-id: r29482
2007-11-12 10:09:33 +00:00
Paul Gilbert
705cf3cc87 Adjustments to the talk state machine so information dialogs (if any) correctly occur at the end of a conversation (such as giving the bar to Ewan)
svn-id: r29481
2007-11-12 09:53:10 +00:00
Paul Gilbert
6ccbfcf611 Correction to delay when two NPCs are talking together
svn-id: r29480
2007-11-12 09:16:00 +00:00
Max Horn
d2ee52abba Silencing some warnings
svn-id: r29479
2007-11-11 20:17:13 +00:00
Vincent Hamm
43437e6d74 Menu display fix
Linked objects implementation (barman)
The gameplay is now kind of working and it is possible to play at least the first part of the game

svn-id: r29478
2007-11-11 19:33:25 +00:00
Filippos Karapetis
6e6a864c17 Don't draw objects with negative x/y values. Now, "ghost" objects are no longer created in the top left corner of the screen when picked up/used. The creation of such ghost objects is a script bug which exists in the original interpreter of IHNM as well. Also, removed a relevant workaround for the note in the first screen of Gorrister's chapter, as it's no longer needed
svn-id: r29477
2007-11-11 18:12:55 +00:00
Vincent Hamm
1bae92f2e1 Implement dialogues
Detect french 256 colors version

svn-id: r29473
2007-11-11 01:04:40 +00:00
Vincent Hamm
31d04d98dc Fix relocation of objects relations
svn-id: r29472
2007-11-10 23:20:47 +00:00
Paul Gilbert
24303fb953 Expanded talk routines so that characters now properly stand still only when they're meant to
svn-id: r29471
2007-11-10 22:47:11 +00:00
Sven Hesse
5908728d4c Muting the compiler :P
svn-id: r29470
2007-11-10 19:51:06 +00:00
Vincent Hamm
34a696662a Fix boggus object state
svn-id: r29469
2007-11-10 19:47:07 +00:00
Sven Hesse
d624add742 Muting the compiler :P
svn-id: r29468
2007-11-10 18:24:23 +00:00
Vincent Hamm
faf78d582a -Cleanup strings
-Fix load saves from original interpreter
-Add all background merge functions

svn-id: r29467
2007-11-10 17:15:48 +00:00
Johannes Schickel
83eec141c8 - added some code to runLoop (currently commented out)
- little fix in handleInputUnkSub

svn-id: r29466
2007-11-10 14:51:18 +00:00
Filippos Karapetis
e375e983ba Added a workaround for a bug in the original game scripts of IHNM with Edna, when the knife is used with her. Fixes bug #1826871 - "IHNM: Edna's got two hearts but loves to be on the hook"
svn-id: r29461
2007-11-09 17:06:22 +00:00
Johannes Schickel
b29486e3de Implemented idle script handling.
svn-id: r29460
2007-11-09 16:52:39 +00:00
Paul Gilbert
5f6cb432fb Restoring a game now correctly fades out the current room like the original
svn-id: r29459
2007-11-09 08:22:09 +00:00
Paul Gilbert
25d22b2b42 Check to prevent Ratpouch saying 'Excuse me' redundantly
svn-id: r29458
2007-11-09 08:21:15 +00:00
Sven Hesse
870ec35291 Fixing compilation for me by giving that file a closing newline
svn-id: r29457
2007-11-08 23:53:59 +00:00
Filippos Karapetis
398a26c6c4 Some tweaks to actorWalkTo() and actorEndWalk(). Also, moved all the actor pathfinding calculation code to a new file
svn-id: r29455
2007-11-08 23:39:58 +00:00
Filippos Karapetis
422e88aa20 Slight fix for off screen path calculation
svn-id: r29454
2007-11-08 23:35:46 +00:00
Vincent Hamm
783a0bf67d Cleanup load savegame from original interpreter
svn-id: r29453
2007-11-08 22:59:29 +00:00
Paul Gilbert
c2594cb3f2 Reordered construction of game instance so that the sounds played in the introduction can properly check the sound flag status
svn-id: r29452
2007-11-08 11:55:51 +00:00
Paul Gilbert
27a1f38862 Added sound to animation of falling down the chute
svn-id: r29451
2007-11-08 11:06:24 +00:00
Paul Gilbert
cafc46fc8f Bugfix for correct use of article prefixes on character names embedded in talk messages
svn-id: r29450
2007-11-08 10:51:47 +00:00
Paul Gilbert
ea19791de5 Bugfix for approaching Ratpouch, and have him properly stand still until he's received instructions
svn-id: r29449
2007-11-08 10:50:26 +00:00
Eugene Sandulenko
cc4311f10f One more fix from Patch #1773489
svn-id: r29447
2007-11-07 22:29:20 +00:00
Eugene Sandulenko
604be3107e Patches #1773489: "FW: Fixes for German Amiga Version"
svn-id: r29446
2007-11-07 22:28:01 +00:00
Paul Gilbert
9fc974209b Bugfix for NPC conversations so they'll only stand still when they should, and pause correctly during scripted animations
svn-id: r29445
2007-11-07 09:39:48 +00:00
Paul Gilbert
1a82b2630d Removed reference to KyraEngine that shouldn't be there
svn-id: r29444
2007-11-07 09:36:49 +00:00
Nicola Mettifogo
9038ee9115 Fixed regression: loading from the start screens was messing up game flags.
svn-id: r29439
2007-11-06 20:49:50 +00:00
Travis Howell
443dff5285 Add support for original load/save system in HE games.
svn-id: r29434
2007-11-06 12:22:52 +00:00
Eugene Sandulenko
83802f795b Several subtitles-related IHNM fixes. Still not perfect.
svn-id: r29427
2007-11-05 23:40:30 +00:00
Sven Hesse
780cb2f274 Muting the compiler :P
svn-id: r29425
2007-11-05 21:06:10 +00:00
Gregory Montoir
20b3ee2057 made CmdText a virtual class, so that language tweaks can be handled in subclasses.
svn-id: r29424
2007-11-05 20:53:30 +00:00
Vincent Hamm
773d0dc3c6 Fix some 256color version issues
svn-id: r29423
2007-11-05 20:51:23 +00:00
Vincent Hamm
e2260d8afd Implement polygon and sprite masking
svn-id: r29422
2007-11-05 20:24:20 +00:00
Filippos Karapetis
f7c6189c1e Sort the language ID bytes of the JAS Version String alphabetically, like they are in the queen page of the ScummVM wiki
svn-id: r29421
2007-11-05 17:17:35 +00:00
Filippos Karapetis
70aa7d3f74 Don't show a space after the "give" command in the Greek fan translated version of FOTAQ
svn-id: r29420
2007-11-05 17:11:47 +00:00
Filippos Karapetis
bc391e48f0 Updated the check for the language byte of the JAS Version String to be 'g' for the Greek fan translation and 'R' for the Russian fan translation (according to the Queen engine page in the ScummVM wiki)
svn-id: r29419
2007-11-05 17:10:32 +00:00
Filippos Karapetis
ea7429018e Fix warning
svn-id: r29418
2007-11-05 16:33:40 +00:00
Oystein Eftevaag
eb42e8271e Committing '[ 1824376 ] KYRA: more sequence player code' from Florian, with a couple of warnings fixed
svn-id: r29417
2007-11-05 08:23:57 +00:00
Torbjörn Andersson
c1760e2aae Mark the end of the Cine namespace.
svn-id: r29413
2007-11-04 18:03:18 +00:00
Sven Hesse
64f88225e1 Muting the compiler
svn-id: r29410
2007-11-04 13:03:40 +00:00
Sven Hesse
906a423fa7 Some code formating fixes
svn-id: r29409
2007-11-04 13:01:41 +00:00
Vincent Hamm
fa15952f09 Some more script functions
svn-id: r29408
2007-11-04 12:57:57 +00:00
Nicola Mettifogo
684db15b34 * Pushed specific code from base class down to Nippon Safes.
* Some refactoring of the main loop.

svn-id: r29407
2007-11-04 10:45:10 +00:00
Gregory Montoir
7cf5a57827 fix buffer overflow (globalVars is int16 -> index/=2)
svn-id: r29402
2007-11-04 03:16:56 +00:00
Gregory Montoir
9f84af06d6 added saveload code, fixed calls to debugC
svn-id: r29401
2007-11-04 03:07:03 +00:00
Gregory Montoir
74bb325a7e switched igor detection code to AdvancedDetector
svn-id: r29400
2007-11-04 03:04:37 +00:00
Gregory Montoir
52b18c9ae6 simplification, increased game state filenames
svn-id: r29399
2007-11-04 03:02:32 +00:00
Vincent Hamm
6e4037165d Fix a few script issues
svn-id: r29397
2007-11-04 01:11:39 +00:00
Vincent Hamm
dcc71a36eb Click on polygon detection
Object menu fix for doors

svn-id: r29395
2007-11-04 00:31:52 +00:00
Vincent Hamm
3fa3afb1fb More polygon fix (nearly pixel perfect...)
svn-id: r29393
2007-11-03 23:59:54 +00:00
Johannes Schickel
287e79d477 Documenting the sound code a bit.
svn-id: r29392
2007-11-03 23:32:15 +00:00
Vincent Hamm
3620b19b21 Fix build
svn-id: r29391
2007-11-03 22:47:19 +00:00
Vincent Hamm
121fc7d569 More polygon fix
svn-id: r29390
2007-11-03 22:44:27 +00:00
Johannes Schickel
2e6b14539a Cleanup.
svn-id: r29389
2007-11-03 21:25:37 +00:00
Eugene Sandulenko
c640d1c604 Patch #1825276: "DETECTION: advanced detector engine simplification"
svn-id: r29386
2007-11-03 21:06:58 +00:00
Sven Hesse
c069051492 Unleashing the polygon virus! (I.e. fixing a compiler warning and a, what I think is a, logical error. Also changing swaps to use the template SWAP.)
svn-id: r29385
2007-11-03 13:46:45 +00:00
Vincent Hamm
3e3cfca83e Early polygon rewrite
svn-id: r29383
2007-11-03 12:30:02 +00:00
Nicola Mettifogo
610d9a2ce7 Fixed overflow after fadeout in the last game location (bug #1824026).
svn-id: r29374
2007-11-02 08:34:56 +00:00
Nicola Mettifogo
ca1b941d02 Donna now returns to her normal outfit after swimming.
svn-id: r29373
2007-11-01 23:31:28 +00:00
Nicola Mettifogo
1ea0b305a5 Added color-inversion effect in character selection screen. The effect doesn't exactly work like the original yet (Amiga only).
svn-id: r29372
2007-11-01 21:56:14 +00:00
Nicola Mettifogo
10c0f9de86 Refactored some gui code.
svn-id: r29371
2007-11-01 21:24:43 +00:00
Nicola Mettifogo
793553c1b4 Made debug console available when displaying slides (like intermissions and menu).
svn-id: r29370
2007-11-01 21:23:48 +00:00
Filippos Karapetis
ad64b3728a Fixed compilation
svn-id: r29368
2007-11-01 20:11:54 +00:00
Gregory Montoir
36a372ecd1 fix previous commit
svn-id: r29367
2007-11-01 18:42:22 +00:00
Gregory Montoir
bd3767068d dont call trim(), which relies on isspace(), with specific game charset strings
svn-id: r29365
2007-11-01 18:16:52 +00:00
Gregory Montoir
d9d15f9e7e added bootparam handling, minor cleanup
svn-id: r29364
2007-11-01 18:16:02 +00:00
Nicola Mettifogo
93ebcffcac Added new debug command.
svn-id: r29362
2007-11-01 17:40:25 +00:00
Nicola Mettifogo
555336cebe Fix for bug #1822819. Donna now changes her look into Suzy after makeup.
svn-id: r29361
2007-11-01 17:39:58 +00:00
Filippos Karapetis
60c6720441 Some changes to FOTAQ for the work in progress Greek translation in FR #1723255 - "FOTAQ code modifications (mostly for greek translation)":
- Added Greek font to FOTAQ
- When the verb is "Go to" in the Greek version, there won't be a space after the verb and the item (as per the translator's request)
- The strings in the journal are not cut off in the Greek version

svn-id: r29360
2007-11-01 17:06:03 +00:00
Nicola Mettifogo
06f38474a5 Consolidated game data cleanup in a single routine to location switches more reliable, especially on savegames and on game start.
svn-id: r29357
2007-11-01 15:58:33 +00:00
Nicola Mettifogo
c7f315b32c Fix regression introduced in revision 29355. First loadgame performed was destroying the game flags.
svn-id: r29356
2007-11-01 15:15:43 +00:00
Nicola Mettifogo
7c8bf86a45 More refactoring for gui code.
svn-id: r29355
2007-11-01 14:47:33 +00:00
Nicola Mettifogo
288f47e034 * Merged object Menu into Parallaction_ns.
* Some preliminary refactoring of ex-menu code.

svn-id: r29354
2007-11-01 14:08:55 +00:00
Nicola Mettifogo
512e57c690 Added new LocationName class to simplify handling of location switches.
svn-id: r29353
2007-11-01 13:47:18 +00:00
Vincent Hamm
4521634286 Small cleanups
svn-id: r29352
2007-11-01 11:22:11 +00:00
Travis Howell
9aa0a47846 Revert patch #1709219 - DXA Player: double size scaling option.
svn-id: r29351
2007-11-01 06:00:16 +00:00
Travis Howell
5b134184c5 Fix play back of OmniTV videos in The Feeble Files for now.
svn-id: r29350
2007-11-01 02:10:55 +00:00
Filippos Karapetis
87e2f43273 It's now possible to exit the screens with Gorrister's heart in IHNM normally (i.e by walking to the exit, not using it) - like the original
svn-id: r29349
2007-11-01 00:33:12 +00:00
Eugene Sandulenko
3318c4b474 Slighly modified patch #1709219: "DXA Player: double size scaling option"
svn-id: r29347
2007-10-31 21:37:40 +00:00
Filippos Karapetis
39da7deefb Fix for bug #1751483 - "AGI: The -x command-line option appears to be broken"
svn-id: r29346
2007-10-31 21:28:33 +00:00
Filippos Karapetis
5add473048 Fix for bug #1800147 - "ITE: Scummvm exits with Audio warnings"
svn-id: r29345
2007-10-31 20:26:57 +00:00
Gregory Montoir
47a2c28b6e - minor changes to detection code
- reverted gameState.counter type to int16
- cleanup/removed deadcode

svn-id: r29344
2007-10-31 20:02:38 +00:00
Kari Salminen
b4f23c84f5 Added a FIXME-comment and a warning to the unknown test command 19.
svn-id: r29336
2007-10-31 08:56:32 +00:00
Kari Salminen
ff55553c72 Fix for bug #1745950 (GR: Birds stuck in opening screen (Amiga version)).
svn-id: r29335
2007-10-31 03:14:12 +00:00
Gregory Montoir
2a1c68b8a6 - added detection of second demo version
- moved the resource entries tables to an external file (IGOR.TBL)
- added tool to build IGOR.TBL

svn-id: r29332
2007-10-30 22:35:10 +00:00
Filippos Karapetis
bb0bbdef57 The cause for bug #1804403 - "IHNM/ITE: Error loading Game resources (fs-node regression)" was fixed with commits #29327, #29328, #29329. Removed unneeded Amiga-specific code, which should finally fix this bug
svn-id: r29331
2007-10-30 22:20:02 +00:00
Nicola Mettifogo
ecbd31160e Fix for bug #1822680.
svn-id: r29326
2007-10-30 19:41:55 +00:00
Filippos Karapetis
ea644a036b Renamed a variable which is declared twice
svn-id: r29325
2007-10-30 17:21:38 +00:00
Sven Hesse
1f80f1f47e Fixing the scenery/overlay redrawing in Woodruff
svn-id: r29324
2007-10-30 10:47:24 +00:00
Travis Howell
dfa0d4ca64 Fix compile warning.
svn-id: r29321
2007-10-30 00:09:16 +00:00
Travis Howell
7c227055a4 Fix compile warning, looks like this memcpy should be a memset.
svn-id: r29319
2007-10-29 23:55:13 +00:00
Gregory Montoir
6c6e8657b6 added 'igor' engine for the game 'Igor: Objective Uikokahonia'
svn-id: r29318
2007-10-29 23:35:50 +00:00
Vincent Hamm
caa451f5d2 Implement more object input
svn-id: r29317
2007-10-29 22:03:55 +00:00
Sven Hesse
6e4cf615a3 Commenting out the unused variables x and y to mute GCC :P
svn-id: r29314
2007-10-29 21:06:58 +00:00
Vincent Hamm
2e1ffb91f5 Add missing vars
svn-id: r29313
2007-10-29 21:04:41 +00:00
Vincent Hamm
234024f19e Add more object menu controls
svn-id: r29312
2007-10-29 20:56:19 +00:00
Vincent Hamm
0d2d2339fb Early implementation of object menu
svn-id: r29296
2007-10-28 17:40:04 +00:00
Vincent Hamm
fc961908c5 Find object fix
Walk fix

svn-id: r29291
2007-10-28 14:41:37 +00:00
Max Horn
30b11df046 Fix warning & code formatting
svn-id: r29290
2007-10-28 13:57:43 +00:00
Vincent Hamm
4556690cc0 Implement cursor by object
Fix walk cursor

svn-id: r29288
2007-10-28 13:37:06 +00:00
Vincent Hamm
7860b90051 Implement cursors
svn-id: r29286
2007-10-28 13:21:01 +00:00
Max Horn
3f958711a2 Refactored ScummEngine*::checkExecVerbs method
svn-id: r29284
2007-10-28 12:57:25 +00:00
Filippos Karapetis
00e9ed51d9 The palette of the boss screen (F9 key) in IHNM is set correctly now
svn-id: r29279
2007-10-28 04:42:22 +00:00
Paul Gilbert
e4125a0368 Current room is now correctly refreshed after showing credits
svn-id: r29278
2007-10-28 04:28:27 +00:00
Paul Gilbert
cb302b244b Room fades now correctly fade out any active talk dialog
svn-id: r29277
2007-10-28 04:27:18 +00:00
Filippos Karapetis
3dd40b390c Fixed typo
svn-id: r29276
2007-10-28 04:23:51 +00:00
Filippos Karapetis
7e4ebb9d8e Cleanup
svn-id: r29275
2007-10-28 04:16:48 +00:00
Filippos Karapetis
fc85685099 Cleanup
svn-id: r29274
2007-10-28 04:14:52 +00:00
Filippos Karapetis
59f2a90a6f Cleanup of the engine detection code. Possibly fixes bug #1804403 - "IHNM/ITE: Error loading Game resources (fs-node regression)"
svn-id: r29273
2007-10-28 04:12:01 +00:00
Paul Gilbert
641ff5e9b7 Sound is now paused when displaying menu dialogs
svn-id: r29272
2007-10-28 03:34:10 +00:00
Paul Gilbert
5f1ef91820 Added storing of playing sounds to savegame (note: only sounds flagged as restorable are restarted after loading a savegame)
svn-id: r29271
2007-10-28 03:32:13 +00:00
Nicola Mettifogo
9d14d74e8d Temporarily force quits when user presses exit key combination. A TODO comment has been added to places where behavior should be changed to allow the engine to exit gracefully.
svn-id: r29270
2007-10-27 21:29:38 +00:00
Sven Hesse
e76bf9c293 Muting GCC warnings
svn-id: r29268
2007-10-27 18:23:13 +00:00
Vincent Hamm
cc9b0844b9 Hooked inputs
Cleanup & fix in input management code

svn-id: r29267
2007-10-27 18:15:38 +00:00
Filippos Karapetis
01e88f1fbf The options panel in IHNM is now shown and functioning correctly when it's opened during a character's speech
svn-id: r29266
2007-10-27 17:55:50 +00:00
Vincent Hamm
102764da6e Add fast forward mode
svn-id: r29265
2007-10-27 16:10:50 +00:00
Filippos Karapetis
b225f01d14 Added a workaround for an incorrect hitzone in IHNM, (Gorrister's chapter). Now, the graffiti to the left in the toilet screen can be examined correctly. Also, performed some clean-up
svn-id: r29264
2007-10-27 11:42:17 +00:00
Nicola Mettifogo
22c4aa0602 Parallaction will now consume all the short-lived jobs in the queue before a location switch. These jobs only live for 1 or 2 engine loops, and can refer to items in the location being dropped. This situation used to lead to segfaults like the one reported in report #1762797 (that should be now fixed).
svn-id: r29263
2007-10-26 20:35:06 +00:00
Paul Gilbert
a48d2d3ff3 Talk dialogs can now only be closed early if it's the player talking, or an NPC is talking directly to the player
svn-id: r29258
2007-10-25 10:40:26 +00:00
Paul Gilbert
864ed910fa Bugfix to make sound toggle work correctly, and added flag state to savegames
svn-id: r29257
2007-10-25 10:39:19 +00:00
Paul Gilbert
c0f285693c Added saving of NPC direction, and bugfix for closing talk dialogs
svn-id: r29256
2007-10-25 10:37:23 +00:00
Paul Gilbert
c9d06136bc Removed unused field
svn-id: r29255
2007-10-24 10:16:19 +00:00
Paul Gilbert
547716a0df Added a talkerId field to hotspots to better handle characters being talked to
svn-id: r29254
2007-10-24 10:09:06 +00:00
Paul Gilbert
a0fce0c5a1 Fixed MinGW compilation warning
svn-id: r29253
2007-10-24 10:07:38 +00:00
Paul Gilbert
9a1b13e965 Changed startSpeakingToNoone to pause the speaking character
svn-id: r29252
2007-10-24 10:04:24 +00:00
Paul Gilbert
5635256f30 Implemented gradual display of text in talk dialogs
svn-id: r29251
2007-10-24 10:03:11 +00:00
Paul Gilbert
6faff895c3 Changed text speed flag, and added saving of it to savegames
svn-id: r29250
2007-10-24 10:01:55 +00:00
Johannes Schickel
380e8fe99b Fixed SFX in intro of FM-Towns/PC98 versions of Kyrandia 1 (Thanks to Florian Kagerer for the patch).
svn-id: r29248
2007-10-22 20:53:10 +00:00
Filippos Karapetis
cc76fbee56 Added a workaround for a script bug in IHNM, which occurs in the original as well. An invisible note will no longer be created in the top left corner of the screen, when the note in the first screen of Gorrister's chapter is read
svn-id: r29247
2007-10-22 20:41:58 +00:00
Filippos Karapetis
a152ded458 When skipping a video from the introduction of IHNM, the screen fades out before skipping, like in the original
svn-id: r29246
2007-10-22 16:03:42 +00:00
Johannes Schickel
80045e9661 Fixes timers in Kyra1. (Initialized them twice oops...)
svn-id: r29245
2007-10-21 21:38:23 +00:00
Max Horn
00f349a52f Patch #1817080: Scumm savegame thumbnail loading patch
svn-id: r29244
2007-10-21 20:28:50 +00:00
Max Horn
ee43757e86 Fix warning
svn-id: r29243
2007-10-21 19:49:01 +00:00
Nicola Mettifogo
14160083e8 Now stopping music when loading a game in Amiga versions of Nippon Safes.
svn-id: r29242
2007-10-21 19:27:15 +00:00
Nicola Mettifogo
aa01449f29 Relaxed freeZones policy for deciding which zones to preserve across location switches. Special zones are now never deleted even if strictly not needed. This will fix some occasional crashes related to inventory management.
svn-id: r29241
2007-10-21 15:41:21 +00:00
Nicola Mettifogo
03d5111a74 Fixed parseLocation, so that it only tries to parse scripts when they aren't already loaded. This fixes bugs like #1816899, caused by the wrong data archive being selected in the Disk object.
svn-id: r29240
2007-10-21 15:26:07 +00:00
Nicola Mettifogo
c68871860a Added new debug level for inventory routines.
svn-id: r29239
2007-10-21 13:10:36 +00:00
Nicola Mettifogo
78bc71e6f5 Cleanup.
svn-id: r29238
2007-10-21 13:09:53 +00:00
Paul Gilbert
f1958a2218 Removed deprecated YNKeyStruct structure
svn-id: r29237
2007-10-21 05:13:44 +00:00
Paul Gilbert
1aab730e6b Finally got the room layering to work correctly
svn-id: r29236
2007-10-20 22:35:23 +00:00
Sven Hesse
dd5be6826a Fixing the Gob3 CD crash on ARM systems/ports
svn-id: r29235
2007-10-19 23:00:43 +00:00
Oystein Eftevaag
41d67964b1 Committing [ 1816080 ] KYRA: Intro Patch for HoF, from Florian, with some cleanup and a minor fix
svn-id: r29233
2007-10-19 22:16:00 +00:00
Nicola Mettifogo
359efa4f28 Fixed formatting of debug command output.
svn-id: r29232
2007-10-19 21:26:35 +00:00
Nicola Mettifogo
e45f4c25af Fixed loadgame bug: old game state wasn't fully wiped out before loading, thus creating bogus game states in memory. As a result, most savefiles should be ditched. A savefile is sure to be safe if it was *never* loaded from in-game, but nothing can be said in the opposite case.
svn-id: r29231
2007-10-19 21:26:05 +00:00
Nicola Mettifogo
ef14311c99 Added new debugger command 'localflags' and changed Table object to provide debug info for it.
svn-id: r29230
2007-10-19 20:27:10 +00:00
Nicola Mettifogo
485b70b2b0 * Changed IFF/8SVX audio to use signed data (int8), and modified Parallaction accordingly.
* Implemented proper beep in Parallaction for Amiga.

svn-id: r29226
2007-10-15 20:20:50 +00:00
Nicola Mettifogo
db19310ad1 Cut down screen updates when palette is not animated: should lead to performance increase on systems with low resources
svn-id: r29225
2007-10-15 19:00:46 +00:00
Nicola Mettifogo
652866117a Fixed bug #1814061. Special effect routine was overflowing palette size.
svn-id: r29224
2007-10-15 18:59:32 +00:00
Nicola Mettifogo
913ef56024 Now correctly disposing of audio data only when it was allocated on the heap, thus fixing bug #1813367.
svn-id: r29223
2007-10-15 09:21:13 +00:00
Nicola Mettifogo
f9b8c8a0d4 Turned the 'unexpected keyword' warning into a debug message and added a nifty line number to aid debugging.
svn-id: r29222
2007-10-14 21:35:02 +00:00
Nicola Mettifogo
963e63d985 Integrated low-level routines into the Script class, turning it into a self-contained parser for location, program and table scripts.
svn-id: r29221
2007-10-14 21:32:43 +00:00
Nicola Mettifogo
652069f1a6 Made location parser more fault-tolerant, in that it prints out a warning message instead of exiting ScummVM when it encounters an unexpected keywords in the scripts.
svn-id: r29220
2007-10-14 20:59:46 +00:00
Oystein Eftevaag
0e693cbbfb Fixed a struct size issue
svn-id: r29219
2007-10-14 18:44:50 +00:00
Oystein Eftevaag
979121ae12 A change got lost while resolving a conflict
svn-id: r29218
2007-10-14 17:00:44 +00:00
Oystein Eftevaag
af3b84c297 TIM file loading/unloading for HoF
svn-id: r29217
2007-10-14 16:58:11 +00:00
Sven Hesse
a84c9504e9 Fixing compilation
svn-id: r29216
2007-10-13 23:51:08 +00:00
Filippos Karapetis
a08b6606a6 Add a debug console in Winnie (patch by clone2727)
svn-id: r29215
2007-10-13 23:48:59 +00:00
Paweł Kołodziejski
86b6429e97 clear ald after release
svn-id: r29214
2007-10-13 21:54:37 +00:00
Nicola Mettifogo
1c52ea0562 Decoupled password request from actual rendering of the dialogue screen, thus making it possible to fix bug #1765300. This bug was present in the original game, causing garbled text to appear when asking for password (only in the English version).
svn-id: r29213
2007-10-13 21:49:38 +00:00
Paweł Kołodziejski
16175cf368 fixed walking bug in execute wrong animation function and fix previous warning cast types
svn-id: r29212
2007-10-13 21:20:24 +00:00
Johannes Schickel
706888358d HoF:
- implemented opcodes
  -> o2_checkForItem 32
  -> o2_countItemInInventory 37
  -> o2_setMousePos 47
  -> o2_countItemInstances 136

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

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

svn-id: r29201
2007-10-13 06:57:47 +00:00
Max Horn
efcc80dffa Fix warning
svn-id: r29197
2007-10-12 21:57:56 +00:00
Filippos Karapetis
9c528b6cb9 Fix typo
svn-id: r29195
2007-10-12 19:57:43 +00:00
Johannes Schickel
d1a3af446a HoF:
- added some _skipFlag and _quitFlag handling
- extended Screen::fadePal to take an functor for update purposes
- changed KyraEngine_v2::fadeScenePal to use Screen::fadePal with a functor

svn-id: r29188
2007-10-12 01:26:27 +00:00
Johannes Schickel
1764f165a7 HoF:
- Subclassed TextDisplayer for use with Kyra2
- Implemented opcodes:
  -> o2_zanthiaChat 169
  -> o2_customChat 152
  -> o2_customChatFinish 153

svn-id: r29187
2007-10-12 00:58:59 +00:00
Paweł Kołodziejski
dd661390ba disable spanish version for now
svn-id: r29185
2007-10-11 18:24:21 +00:00
Paweł Kołodziejski
b44531dae6 fixed braces and changed vez() all references to int
svn-id: r29184
2007-10-11 07:44:22 +00:00
Johannes Schickel
d896894631 - Made some sound functions a bit more generic for use with Kyra1 and Kyra2
HoF:
- Added sound support (sfx sound wrong currently though)
- Implemented opcodes:
  -> o2_loadMusicTrack
  -> o2_playWanderScoreViaMap
  -> o2_playSoundEffect
  -> o2t_playSoundEffect

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

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

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

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

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

svn-id: r29176
2007-10-09 05:40:20 +00:00
Johannes Schickel
cf3fd283bb HoF:
- added support for dropping items into scenes
- added const to some static data
- implemented opcode 0x55 o2_setLayerFlag
- fixed a bug in Screen_v2::drawShape

svn-id: r29175
2007-10-09 04:47:41 +00:00
Paweł Kołodziejski
8db35c8a62 fixes after merges
svn-id: r29174
2007-10-08 09:37:57 +00:00