317 Commits

Author SHA1 Message Date
Gregory Montoir
2592184788 - some Command code refactoring (removed unused code, splitted some methods)
- game is now playable up to floda basement (at least)

svn-id: r11477
2003-12-02 16:49:56 +00:00
Gregory Montoir
1706fefb6e cleanup
svn-id: r11453
2003-12-01 22:36:39 +00:00
Gregory Montoir
03e70632b2 fix bug in command code, letting a failed command being executed
svn-id: r11452
2003-12-01 22:16:31 +00:00
Gregory Montoir
3befded402 cleanup header includes
svn-id: r11449
2003-12-01 20:48:41 +00:00
Max Horn
72eb8ccb89 Patch #847464: Remove spurious semicolons
svn-id: r11445
2003-12-01 09:58:55 +00:00
Gregory Montoir
577aad5edd cleanup
svn-id: r11438
2003-11-30 20:41:02 +00:00
Gregory Montoir
9c6e5ce50a - speak correct sentence when object is not usable
- some hardcoded stuff for rooms 69 & 108
- handle CUTJOEF

svn-id: r11383
2003-11-27 13:49:00 +00:00
Gregory Montoir
e72a17c678 oops
svn-id: r11381
2003-11-26 23:06:34 +00:00
Gregory Montoir
2f444d2a07 fix some animation issues
svn-id: r11380
2003-11-26 23:03:21 +00:00
Gregory Montoir
28ac3d653d add a wrapper for Talk::speak in Logic that clears current command
svn-id: r11379
2003-11-26 21:46:29 +00:00
Marcus Comstedt
584760fc70 Use standard functions (itoa => sprintf).
svn-id: r11378
2003-11-26 21:44:58 +00:00
Gregory Montoir
a297899508 clear current command *in* Command class (not logic)
svn-id: r11376
2003-11-26 21:08:36 +00:00
Gregory Montoir
ddc2e736fb use enum instead of define (purely cosmetic)
svn-id: r11374
2003-11-26 20:41:54 +00:00
Gregory Montoir
871c4f8342 rename some methods (purely cosmetic) and fix some walking problems when closing Journal screen
svn-id: r11373
2003-11-26 20:40:43 +00:00
Gregory Montoir
7cbb485907 preliminary journal implementation ; this should allow to save/load game state and somewhat configure sound/speech stuff
svn-id: r11370
2003-11-26 13:53:17 +00:00
Gregory Montoir
07a9638d77 fix 'anderson replying twice the same sentence before taking off' issue
svn-id: r11362
2003-11-24 19:22:52 +00:00
Gregory Montoir
dad1131be1 cleanup/update + make Display::palCustomScroll matching exactly the original source
svn-id: r11361
2003-11-24 14:18:49 +00:00
Gregory Montoir
484edca7a5 use constants instead of plain integers for room numbers
svn-id: r11353
2003-11-20 09:39:29 +00:00
Gregory Montoir
5c04293c93 fix 'gorilla becoming invisible' issue (this was due to the missing CLEAR_COMMAND call in SPEAK/TALK ; for now, added a Command::clear before each 'sensible' Talk::* call)
svn-id: r11352
2003-11-20 09:38:54 +00:00
Gregory Montoir
1b77e5c41f fix some demo-related bugs :
- lola disappearing under the shower
- wrong frame used when Joe uses the sheet rope (changed some conditions to match the ones in the original source)

the english demo versions (PCGames & normal) seem now to be completable without any graphical glitches ; only the sound/music and 'end message' are missing

svn-id: r11325
2003-11-17 19:55:17 +00:00
Gregory Montoir
eed9a5d9ce restart person animations at the end of a cutaway (this enables Sparky to animate again after giving Joe his file)
svn-id: r11322
2003-11-17 13:31:00 +00:00
Gregory Montoir
f0f0b0143b fix 'chasing car disappearing for a frame' issue
svn-id: r11320
2003-11-17 09:19:36 +00:00
Gregory Montoir
a169876a2f Apparently, my previous fix (joe position when switching room) causes trouble when returning from a cutaway with initialRoom != currentRoom. I added a condition, but that's not exactly like the original. Maybe one effect of the missing SETUP_ROOM call in cutaway code.
svn-id: r11314
2003-11-16 20:31:14 +00:00
Gregory Montoir
ba50b42c36 fix 'wrong Joe position when switching from hotel basement to lobby' issue
svn-id: r11313
2003-11-16 19:55:04 +00:00
Paweł Kołodziejski
bef4496b7e fixed warning
svn-id: r11311
2003-11-16 17:49:27 +00:00
Torbjörn Andersson
ab066c41e0 Fixed warning
svn-id: r11308
2003-11-16 14:12:53 +00:00
Gregory Montoir
587f2d7177 fix song playafter/playbefore type issue
svn-id: r11307
2003-11-16 11:17:35 +00:00
Gregory Montoir
74d8b6ef28 fix some bugs :
- Joe being unable to grab oil during carbam scene (walking bug, when dest_pt == orig_pt)
- wrong Joe facing direction when opening plane door

updated handlePinnacleRoom() comment

svn-id: r11306
2003-11-16 10:47:31 +00:00
David Eriksson
0a8c06f17e Play correct sound for initial talk second time we talk to someone.
svn-id: r11304
2003-11-15 21:58:44 +00:00
Joost Peters
f979f185af - Enabled missing calls to _sound->playSong, now it should *really* play all SFX
- Moved sound/music related toggle variables to Sound class
- Changed "Couldn't find file.." warning() to debug(7, ..)

svn-id: r11303
2003-11-15 21:33:04 +00:00
David Eriksson
b938b63ddf - Talk clean-up
- Make it possible to quit a dialogue

svn-id: r11302
2003-11-15 21:16:01 +00:00
David Eriksson
4f97603c9c Correctly set hasTalkedTo.
svn-id: r11301
2003-11-15 20:04:59 +00:00
Gregory Montoir
952f11fabc forget to update this
svn-id: r11300
2003-11-15 15:55:43 +00:00
Gregory Montoir
308b5de8a6 fix some bugs :
- right-clicking on inventory item doesn't execute default action
- unapplied room light level when Joe enters a room
- updated comment in roomDisplay on palette fading problem
- during dialogue, invalid mouse-overs (added enum for joeWalk flag too)

preparing Journal stuff :
- add a (almost useless) useJournal method to Logic
- removed useless code in Graphics, as it should (and could) be easily re-written in a more OO way

svn-id: r11299
2003-11-15 15:44:50 +00:00
Gregory Montoir
2312111a3a fix 'wrong background when talking to Faye inside the plane' issue
svn-id: r11297
2003-11-14 16:16:55 +00:00
Gregory Montoir
730fd27a19 rewitten fullscreen/panel switching code
svn-id: r11296
2003-11-14 14:35:52 +00:00
Joost Peters
2d3f4ef831 Play all sfx now, instead of only amiga ones + some music preparation
svn-id: r11288
2003-11-14 00:45:44 +00:00
Gregory Montoir
ef1595b2a9 fix a problem in talk/command interaction (maybe that also fix the floda receptionist crash...)
svn-id: r11287
2003-11-13 16:17:11 +00:00
Gregory Montoir
2f6a249970 fix 'Skip handing over the comic to Joe' issue
svn-id: r11286
2003-11-13 14:10:15 +00:00
David Eriksson
892492022f According to the original source code, the journal has a different ID in
the demos, but when actually running the demos I get a banana instead of
a journal... so let's use the same ID as in the real game.

svn-id: r11285
2003-11-13 12:39:37 +00:00
David Eriksson
df34f99ef9 Fix needed for demos too.
svn-id: r11284
2003-11-13 12:27:48 +00:00
David Eriksson
eae52af559 Fix crashing demos: the demos have no song parameter in cutaway animations.
svn-id: r11283
2003-11-13 12:17:53 +00:00
David Eriksson
428ebd6568 Just debug messages and comment stuff
svn-id: r11282
2003-11-13 11:47:04 +00:00
Gregory Montoir
3a51c5b702 fix amazon/shower issue outside temple
svn-id: r11280
2003-11-13 10:44:31 +00:00
David Eriksson
d655603005 Small talk fixes.
There is some bug with the body action.

svn-id: r11279
2003-11-13 09:51:49 +00:00
Gregory Montoir
f6a9259ab3 update
svn-id: r11278
2003-11-13 09:32:31 +00:00
Gregory Montoir
35cdf26ba6 fix some bugs :
- grayed panel disappearing during cutaway
- canceling joe walk before switching to another room

svn-id: r11277
2003-11-13 09:30:49 +00:00
David Eriksson
ae75f49b46 Use constant for pinnacle room number.
svn-id: r11276
2003-11-13 08:18:52 +00:00
David Eriksson
91f422776b Added another variable.
svn-id: r11275
2003-11-13 08:18:05 +00:00
David Eriksson
6e8d22db35 Clear command text before talking.
svn-id: r11274
2003-11-13 08:17:40 +00:00