Commit Graph

4966 Commits

Author SHA1 Message Date
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
Paweł Kołodziejski
521f0a2987 fixes after merges, more will come
svn-id: r29173
2007-10-07 22:00:43 +00:00
Nicola Mettifogo
8a73ce38bb Added beep sound to Nippon Safes for Amiga.
svn-id: r29171
2007-10-07 19:18:41 +00:00
Max Horn
205b65ba11 cleanup
svn-id: r29170
2007-10-07 12:35:30 +00:00
Paul Gilbert
8ec0e447c2 Added support for setting animations by their index rather than their offset, allowing for easier multi-language support. Also fixed translation of inventory window
svn-id: r29169
2007-10-07 11:12:46 +00:00
Paul Gilbert
d817f530e8 Changed string constant name to avoid clashing with inventory display constants
svn-id: r29168
2007-10-07 11:11:06 +00:00
Paul Gilbert
09d706481b Added loading of new give talk Id list
svn-id: r29167
2007-10-07 11:09:20 +00:00
Paul Gilbert
8ff665c58f Replaced incorrect key constants being used for fight commands
svn-id: r29166
2007-10-07 11:07:45 +00:00
Paul Gilbert
d0d454c5da Added new string Ids used for inventory display
svn-id: r29165
2007-10-07 11:06:48 +00:00
Paul Gilbert
199e60b9a0 Finally tracked down a bug that sometimes caused word wrapping to fail
svn-id: r29164
2007-10-07 11:05:09 +00:00
Nicola Mettifogo
6351ed5379 Fixed bug #1808529. One must use memmove() when copying overlapping blocks of memory (blush).
svn-id: r29161
2007-10-07 07:11:09 +00:00
Johannes Schickel
5ad7870775 - little bit more input handling
- implemented item pickup

svn-id: r29160
2007-10-07 00:35:22 +00:00
Nicola Mettifogo
0fab64817f Fixed bug #1808615. An unexpected (but harmless) 'ENDCOMMANDS' statement was spotted in the game scripts by the new stricter parser.
svn-id: r29158
2007-10-06 21:15:53 +00:00
Nicola Mettifogo
9280c25a36 Fixed bug #1808620. The original Inventory::addItem routine relied on a trick that went undetected until r29060 actually broke it. Not all regression is bad, after all.
svn-id: r29157
2007-10-06 20:56:17 +00:00
Filippos Karapetis
abed92e2fa Removed the MD5 check of sfx.res for the English version of IHNM, since there are two English versions of the game with a different sfx.res file. Closes bug #1800226 - "IHNM: unsupported version"
svn-id: r29156
2007-10-06 18:53:47 +00:00
Nicola Mettifogo
439c6e1d53 Fixed bug #1803287. The inner block was changing the test condition causing unwanted behavior.
svn-id: r29155
2007-10-04 16:19:42 +00:00
Filippos Karapetis
8ced5d58df Show the cursor when opening the options screen. Also, fixed a regression with some strings in the game interface
svn-id: r29151
2007-09-30 14:46:49 +00:00
Torbjörn Andersson
6cd700f776 Of course, that also means that 'slot' should be 3 characters, not 2.
svn-id: r29150
2007-09-30 14:32:21 +00:00
Torbjörn Andersson
44216e2837 Terminate the string used to hold the save slot number, or strange things may
happen. (In my case, it was looking for slot 10, 20, 30, ... instead of the
correct 1, 2, 3...)

svn-id: r29149
2007-09-30 14:31:47 +00:00
Filippos Karapetis
1717ab8ccd Some updates to the hard coded strings of the Spanish version of IHNM (thanks jvprat)
svn-id: r29148
2007-09-30 14:24:06 +00:00
Filippos Karapetis
0175cf13b2 Fixed the placement of the save game reminder icon in IHNM
svn-id: r29147
2007-09-30 13:47:09 +00:00
Filippos Karapetis
93a31a7b6b Removed all the unneeded hard coded strings from the Italian fan translation of IHNM, added the hard coded strings of the Spanish version of IHNM
svn-id: r29146
2007-09-30 13:37:05 +00:00
Filippos Karapetis
f002fcf98a IHNM does not have excuse texts
svn-id: r29145
2007-09-30 13:19:31 +00:00
Paul Gilbert
cb2f6ce092 Fixed action lists to sort correctly for non-English languages
svn-id: r29144
2007-09-30 12:35:37 +00:00
Gregory Montoir
b767eb771b fix incomplete savestate prefix
svn-id: r29138
2007-09-30 11:16:01 +00:00
Paul Gilbert
106b7eb839 Fix load offset for straw fire, and added proper cross-language handling of initial talks to strangers
svn-id: r29137
2007-09-30 10:53:40 +00:00
Paul Gilbert
b7c7623930 Added cross-language handling for the top menu
svn-id: r29136
2007-09-30 10:51:33 +00:00
Filippos Karapetis
939948766b Fixed bug #1804805 - "IHNM: crash/glitch with italian fan patch"
Added the Italian fan translation of IHNM, created a workaround for invalid string data in the Italian fan translation and added some hard coded strings which are changed in the original game executable with the Italian fan translation patch

svn-id: r29134
2007-09-30 01:29:12 +00:00
Gregory Montoir
7ca277d252 don't update the screen directly after a gamestate load ; keychars and room background are now redrawn on the same frame (bug #1751226)
svn-id: r29133
2007-09-29 19:14:38 +00:00
Gregory Montoir
bdffcca128 workaround for original game glitch (bug #1751170)
svn-id: r29132
2007-09-29 19:13:04 +00:00
Torbjörn Andersson
44746d74a4 When skipping the IHNM intro, skip all the way to the character selection
screen.

svn-id: r29129
2007-09-29 06:26:22 +00:00
Torbjörn Andersson
bccf69bfe1 As far as I can tell, there's no point in setting sceneSkipTarget to true here.
There are no other scenes before it.

svn-id: r29128
2007-09-29 06:19:02 +00:00
Torbjörn Andersson
74ce7c620b Allow the user to change scalers, fullscreen mode, etc. without terminating the
IHNM intro. In other words, don't terminate the intro just because the user
presses a modifier key. The original didn't either.

svn-id: r29127
2007-09-29 05:46:57 +00:00