774 Commits

Author SHA1 Message Date
Filippos Karapetis
0da6062bb2 Remove obsolete testing code
svn-id: r27306
2007-06-10 11:51:33 +00:00
Filippos Karapetis
a121e4ce05 Fixed an incorrect check in Script::finishDialog
svn-id: r27274
2007-06-10 03:21:16 +00:00
Filippos Karapetis
3fd5347421 Fixed conversations in IHNM. Now, when a dialog option is selected, the protagonist will say it out properly before we hear the other character's reply. Also, added some more code for sfScriptFade and made it a stub for now, as it still needs work
svn-id: r27264
2007-06-10 00:36:01 +00:00
Andrew Kurushin
86f6aaf206 fix IHNM protagonist state loading routine. now Ellen's animations are showing well
svn-id: r27263
2007-06-09 22:45:03 +00:00
Filippos Karapetis
4ae78ea22d Silence some unneeded warnings, remove some unneeded test code from Actor::getActorFrameRange, as the function is the same in both ITE and IHNM
svn-id: r27226
2007-06-09 01:33:58 +00:00
Andrew Kurushin
78cf024351 fix IHNM pathfinding engine. now TED(Chapter 5) interacts with the books properly
svn-id: r27225
2007-06-08 23:33:35 +00:00
Filippos Karapetis
1255681d0d IHNM never sets scriptModuleNumber to 0 in Script::doVerb(). Now, all items will have the correct script assigned to them (e.g. the fruit at the fruit tree screen in Benny's chapter, the icon in the chapel in Ted's chapter etc)
svn-id: r27203
2007-06-08 14:45:25 +00:00
Filippos Karapetis
a9b81750cf Also include this file for the last commit
svn-id: r27180
2007-06-07 23:39:31 +00:00
Filippos Karapetis
90d840de45 Implement more Actor::calcScreenPosition differences for IHNM
svn-id: r27179
2007-06-07 23:37:32 +00:00
Filippos Karapetis
d52cb6c62b Fixed video display and removed a hack for it
svn-id: r27173
2007-06-07 15:49:12 +00:00
Filippos Karapetis
ed8bd9494a Fixed regression: panel mode should be set to video at the beginning of IHNM
svn-id: r27172
2007-06-07 15:47:47 +00:00
Filippos Karapetis
7e29cf35de Limited frame count hack to apply to videos only
svn-id: r27167
2007-06-07 12:39:38 +00:00
Filippos Karapetis
7bd240ea8f Implemented video playing for IHNM (still needs work). Also, updated a comment regarding the intro
svn-id: r27166
2007-06-07 12:11:33 +00:00
Filippos Karapetis
9b14f5faed Implemented the sfGetMouseClicks and sfResetMouseClicks opcodes and created the skeleton for sfScriptStartVideo, sfScriptReturnFromVideo and sfScriptEndVideo opcodes
svn-id: r27145
2007-06-06 19:46:10 +00:00
Filippos Karapetis
5d46606bb0 Fixed the parameter order in sfScriptFade
svn-id: r27143
2007-06-06 18:09:52 +00:00
Filippos Karapetis
00dac8c10f Implemented the sfScriptFade opcode
svn-id: r27142
2007-06-06 18:04:25 +00:00
Filippos Karapetis
a6c476b292 Added palette fading in playCutaway()
svn-id: r27141
2007-06-06 18:02:33 +00:00
Filippos Karapetis
a265844351 Added sanity checks for hitzones in SAGA, after discussing with h00ligan and sev. Removed a hack for IHNM which is not needed anymore and removed a redundant check for zero object types
svn-id: r27140
2007-06-06 16:37:10 +00:00
Filippos Karapetis
735530bdc8 Implemented differences in Actor::calcScreenPosition for IHNM. Now the stitching on the second floor of the zeppelin and the whiskey in the honky-tonk are shown correctly
svn-id: r27124
2007-06-06 00:56:29 +00:00
Filippos Karapetis
b82e88638b Properly implemented the converse panel in IHNM (though the colors are still wrong)
svn-id: r27123
2007-06-06 00:52:46 +00:00
Filippos Karapetis
55607e9c99 Fix regression caused by commit #27108
svn-id: r27122
2007-06-06 00:51:07 +00:00
Travis Howell
248d527a56 Avoid compiler warnings.
svn-id: r27118
2007-06-05 22:38:43 +00:00
Filippos Karapetis
ab6fb8e9c3 Filtering specific verbs is used in ITE, but not in IHNM. It's now possible to use the jukebox in the honky-tonk in IHNM
svn-id: r27110
2007-06-05 16:31:58 +00:00
Filippos Karapetis
158193fe51 Add the hack for the staircase in the zeppelin in IHNM once more, apparently the cause for it is different than what I thought
svn-id: r27109
2007-06-05 16:29:15 +00:00
Filippos Karapetis
2f033e7a4c Check if a zone type is NULL for both ITE and IHNM, as it's done in the original. This fixes the crash in IHNM when entering the second floor of the zeppelin and the crash in ITE when interacting with the bowl in the tunnel, outside the prison. Removed the two relevant hacks
svn-id: r27108
2007-06-05 15:04:25 +00:00
Filippos Karapetis
95821c97ee Inventory and conversation arrows are working correctly now in IHNM
svn-id: r27107
2007-06-05 13:19:47 +00:00
Filippos Karapetis
2b593f30a1 IHNM: Add a temporary hack for the crash that occurs when climbing the staircase to the second floor of the zeppelin in chapter 1
svn-id: r27094
2007-06-04 23:10:59 +00:00
Filippos Karapetis
abc879f2d8 Fixed incorrect placing of converse information for IHNM. Dialog options should work in IHNM now, although they're still not placed properly
svn-id: r27084
2007-06-04 19:29:28 +00:00
Filippos Karapetis
1fe7b427dd Properly define max text width in IHNM
svn-id: r27082
2007-06-04 18:08:44 +00:00
Filippos Karapetis
f6b8c98c13 SAGA: When trying to access a wrong hitzone, adjust it to a valid one and continue with a warning instead of exiting with an error . We don't normally get invalid hitzones in ITE, but we do in IHNM, so this is used for now to bypass the places where IHNM crashes. It's now possible to climb the steps to the second floor of the zeppelin with Gorrister
svn-id: r27072
2007-06-03 22:00:18 +00:00
Filippos Karapetis
7201437206 The animation frame counter is updated correctly now, so all animations in IHNM where the engine is waiting are displayed fully. Big thanks to sev, once again :)
svn-id: r27070
2007-06-03 19:15:59 +00:00
Filippos Karapetis
66f9032d01 Simplified check for scene height in IHNM
svn-id: r27067
2007-06-03 16:14:57 +00:00
Filippos Karapetis
89b80a3f8b Opcode 11 is sfLockUser. Also updated Scene::getHeight() for this change. Now, the interface is locked when the scripts lock it. This prevents erroneous actor movement when skipping speech by left clicking, and other incorrect behavior. Special thanks to h00ligan for all his help
svn-id: r27064
2007-06-03 15:50:25 +00:00
Filippos Karapetis
3ba184b21f Moved the updating of framecount to a more appropriate place
svn-id: r27060
2007-06-03 02:39:44 +00:00
Filippos Karapetis
f4299e81c1 Implemented the sfWaitFrames script function for IHNM. Many animations should display more correctly now (e.g. actor "zapping" animations, Ben falling off the stairs). They're still not correct, as frameCount is not updated properly
svn-id: r27055
2007-06-02 15:26:05 +00:00
Filippos Karapetis
9896ce253e Moved a sanity check before some relevant asserts
svn-id: r27054
2007-06-02 15:21:42 +00:00
David Corrales
0cab5b7791 Merged the fs branch with trunk. r26949:27031
svn-id: r27032
2007-05-31 23:44:43 +00:00
Max Horn
218e132e37 Updated legal headers in source files, based on what Pidgin (the IM client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots
svn-id: r27024
2007-05-30 21:56:52 +00:00
Filippos Karapetis
c739b43bc7 Color 0 should always be black in IHNM. The panel backgrounds don't erroneously change color now when moving between rooms
svn-id: r27004
2007-05-29 16:21:09 +00:00
Filippos Karapetis
438ba78387 Corrected actor walk speed in IHNM
svn-id: r27003
2007-05-29 12:55:17 +00:00
Eugene Sandulenko
baea10979c Partial fix for walking speed in IHNM.
svn-id: r26999
2007-05-28 16:36:18 +00:00
Filippos Karapetis
572a4b3191 Changed the frameOffset sanity check in Script::sfPlaceActor to throw a warning instead of an error. In IHNM, it's now possible to use the knife with the rats when playing with Garrister
svn-id: r26985
2007-05-28 00:36:11 +00:00
Filippos Karapetis
233971ed31 Made verbs "push" and "swallow" work in IHNM. It's now possible to choose a monitor with Ted
svn-id: r26983
2007-05-27 23:30:21 +00:00
Filippos Karapetis
13541d3e96 Verb actions are working correctly now in IHNM. Some verbs are still non-functional
svn-id: r26970
2007-05-27 11:49:08 +00:00
Filippos Karapetis
ff7d48f582 Changed the check for the status bar in IHNM to match the original, removed a relevant hack
svn-id: r26802
2007-05-11 13:10:13 +00:00
Filippos Karapetis
1880c8739b Disable the status text in IHNM when the main panel is not shown. Fixes a crash when hovering over a character in the character selection screen
svn-id: r26801
2007-05-11 10:35:12 +00:00
Torbjörn Andersson
a6095b93d9 Removed unused variable.
svn-id: r26797
2007-05-10 03:02:00 +00:00
Andrew Kurushin
85082dc8a0 speedup SAGA::Actor::pathLine & SAGA::Actor::scanPathLine calculation
svn-id: r26791
2007-05-09 13:25:14 +00:00
Filippos Karapetis
a8ab2c7cff Moved functions getDoorState, setDoorState, getBGMaskType and validBGMaskPoint to scene.h and disabled some sanity checks to improve the speed of the pathfinding algorithm, after discussing with h00ligan
svn-id: r26789
2007-05-08 17:32:31 +00:00
Andrew Kurushin
21412b821c small pathfind speedup: validate coords only with debug definition
svn-id: r26788
2007-05-08 16:09:47 +00:00