Commit Graph

547 Commits

Author SHA1 Message Date
Gregory Montoir
c2be8ed45d constructors cleanup
svn-id: r11589
2003-12-11 22:16:35 +00:00
Gregory Montoir
38c4321f59 cleanup
svn-id: r11588
2003-12-11 21:04:02 +00:00
Gregory Montoir
3174cef127 merged Logic::joeGrab & Logic::joeGrabDirection and removed speed argument as it always equals 0
svn-id: r11582
2003-12-11 13:26:13 +00:00
Gregory Montoir
577ea51c10 cleanup
svn-id: r11579
2003-12-11 10:24:27 +00:00
Gregory Montoir
ae33806802 centralize all State related stuff
svn-id: r11577
2003-12-11 10:03:35 +00:00
Gregory Montoir
0667bd69cd oops
svn-id: r11556
2003-12-10 21:36:56 +00:00
Gregory Montoir
a53d2c99f5 get rid of GameConfig, use ConfigurationManager
svn-id: r11555
2003-12-10 20:13:25 +00:00
Gregory Montoir
191e7ae621 oops
svn-id: r11554
2003-12-10 15:37:57 +00:00
Gregory Montoir
ed2baf283e - moved QueenEngine::roomChanged to Logic and enabled call from Cutaway code (this fixes the 2 irons bars being displayed at the end of c39a.cut)
- moved my 'panel being hidden after the head room display' fix
- fix problem in joeCutFacing / joeFacing in cutaway code

svn-id: r11553
2003-12-10 15:36:44 +00:00
Gregory Montoir
d947a6ea77 cleanup, split Cutaway::specialMove() into several methods ; this should allow us minor changes in order to support different/other special moves (demo, interview)
svn-id: r11552
2003-12-10 14:19:04 +00:00
Gregory Montoir
671b98b0cf (temporary) fix for cutaway_41f / command_0x178 graphical glitches
svn-id: r11526
2003-12-07 15:19:00 +00:00
Gregory Montoir
a17c49d9a7 - handle person bank number hack slighlty differently (fix it when loading, not in personSetData)
- remove some useless checks as there are no invalid bob numbers in actor data
- minor cleanups in Area

svn-id: r11520
2003-12-06 13:15:17 +00:00
Gregory Montoir
31411c9fc2 minor cleanup, reuse some data from intervie.exe
svn-id: r11519
2003-12-06 13:13:13 +00:00
Gregory Montoir
e943ee3785 make Joe say something when trying to speak to a mute object/person
svn-id: r11518
2003-12-06 13:12:52 +00:00
Gregory Montoir
472045d578 - fix Joe scaling issue when switching from room 51 to 47 (temple)
- add remaining fadein() call in cutaway, pinnacle room is ok now
- add 2 macros to 'clarify' some room tests
- some cleanup

svn-id: r11502
2003-12-05 20:16:32 +00:00
Gregory Montoir
e19909d3e3 cleanup, s/abs/ABS/g
svn-id: r11501
2003-12-05 13:56:07 +00:00
Gregory Montoir
98b5f37143 handle 'talking heads' slighlty differently
svn-id: r11495
2003-12-04 13:21:43 +00:00
Gregory Montoir
498260f063 cleanup
svn-id: r11494
2003-12-04 13:21:26 +00:00
Gregory Montoir
5b83ecbf67 special moves 14, 25, 27, 29, 30, 33
svn-id: r11493
2003-12-04 10:54:43 +00:00
Gregory Montoir
8c330b7123 in original DOS version, characters *can* walk in last room
svn-id: r11492
2003-12-04 10:54:26 +00:00
Gregory Montoir
b6c01b8c73 - hard coded cutaway stuff for boat room
- hard coded cutaway and talk oracle stuff
- scale Joe during cutaway when changing rooms
- special moves 20 & 24 (temple room 100)
- special move 15 (valley room 67)
- special move 26 (c69g.CUT)
- (game is now completable up to final fight scene)

svn-id: r11491
2003-12-03 20:53:59 +00:00
Gregory Montoir
77770ea7fe be consistent with animateJoe
svn-id: r11490
2003-12-03 15:14:30 +00:00
Gregory Montoir
62e1d88fef whitespaces/tab
svn-id: r11489
2003-12-03 14:52:05 +00:00
Gregory Montoir
d8d369a086 fix walking person issue (noticeable when Azura is escaping from Floda)
svn-id: r11488
2003-12-03 14:51:16 +00:00
Gregory Montoir
5bfbb9e954 remaining stuff for Azura/Floda
svn-id: r11487
2003-12-03 14:09:37 +00:00
Gregory Montoir
894360920b fix klunk scene glitches
svn-id: r11486
2003-12-03 13:00:56 +00:00
Gregory Montoir
07ba3cfabc fix problem in opening/closing doors
svn-id: r11485
2003-12-03 10:33:14 +00:00
Gregory Montoir
402b700a13 removed unused stuff
svn-id: r11484
2003-12-03 10:33:01 +00:00
Gregory Montoir
3ccce8da35 new room/gamestate constants
svn-id: r11483
2003-12-03 10:32:12 +00:00
Gregory Montoir
a15fa0302a fix a potiental journal issue
svn-id: r11478
2003-12-02 19:58:31 +00:00
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
Gregory Montoir
9d89fe2b49 fix the skipped initial talk to floda receptionist
svn-id: r11270
2003-11-12 21:22:14 +00:00
Gregory Montoir
d5a28b43de fix some bugs :
- panel not grayed when playing a cutaway
- command text still displayed when playing a cutaway
- panel drawing glitch on pinnacle room exit
- text color on the dialogue choices not updated

svn-id: r11267
2003-11-12 10:50:05 +00:00
Gregory Montoir
98d4b4cb31 hack for special french character
svn-id: r11250
2003-11-10 15:45:53 +00:00
Gregory Montoir
72d9199022 fix some bugs :
- bettle not disappearing when caught
- wrong Joe position when switching rooms
- bellboy dispappearing after spoken to him (partially fixed)

svn-id: r11249
2003-11-10 14:06:55 +00:00
David Eriksson
ff07a453e3 Make the fix like the original game instead.
svn-id: r11248
2003-11-10 12:32:46 +00:00
David Eriksson
cd4eb7deff Return mouse cursor and panel after cutaway.
svn-id: r11247
2003-11-10 12:21:10 +00:00
Joost Peters
6fec54b411 Forgot to commit this
svn-id: r11246
2003-11-10 10:37:46 +00:00
Torbjörn Andersson
439bc8364d Fix warning
svn-id: r11240
2003-11-10 07:41:21 +00:00
Max Horn
e34f2b8b33 cut down on unnecessary GameDetector references
svn-id: r11239
2003-11-10 01:04:12 +00:00
Joost Peters
b264f836fb Enable intro again
svn-id: r11234
2003-11-09 23:49:39 +00:00
Joost Peters
69c4fd3595 update
svn-id: r11233
2003-11-09 22:22:56 +00:00
Joost Peters
357cfb8aea fix small leak
svn-id: r11231
2003-11-09 21:55:19 +00:00
Joost Peters
b64c6fcbfc Added (quick-)Saving/Loading
svn-id: r11230
2003-11-09 21:31:18 +00:00
Gregory Montoir
1b6e9a9b00 forgot to update comment
svn-id: r11229
2003-11-09 21:24:23 +00:00
Gregory Montoir
a7aac36341 fix flipped faye issue in c3a.cut
svn-id: r11228
2003-11-09 21:10:42 +00:00
Gregory Montoir
c9feb712bc enable (some of) the original debug passwords
svn-id: r11227
2003-11-09 20:50:03 +00:00
David Eriksson
79f84425dd Moved _talkSelected to Logic.
svn-id: r11226
2003-11-09 14:16:46 +00:00
David Eriksson
1d3d581879 - Fix cutaway bug that made Joe end up in the wrong location when the
cutaway was cancelled.
- Fix cutaway bugs that made it very bad to cancel the cutaway where Joe
  looks out from the hotel window.

svn-id: r11225
2003-11-09 12:19:47 +00:00
Paweł Kołodziejski
8f130401a1 cleanup whitespaces
svn-id: r11224
2003-11-08 23:45:45 +00:00
Gregory Montoir
e01e3ae463 fix bad animation string at amazon entrance room
svn-id: r11222
2003-11-08 23:20:23 +00:00
David Eriksson
9e7402e14b Enable pinnacle room
svn-id: r11216
2003-11-08 21:02:25 +00:00
David Eriksson
0908b794ec Show mouse cursor in dialogue.
svn-id: r11215
2003-11-08 21:00:11 +00:00
Gregory Montoir
31b5146528 fix dufflebag problem
svn-id: r11208
2003-11-08 16:36:54 +00:00
Gregory Montoir
b04ddef750 missing stuff for carbam scene
svn-id: r11206
2003-11-08 13:57:52 +00:00
David Eriksson
f243b50215 Start/stop scenes - fixes missing panel.
svn-id: r11205
2003-11-08 11:32:32 +00:00
Joost Peters
aa655b95e4 Apparantly, this cast is not needed for it to work properly
svn-id: r11202
2003-11-08 11:00:36 +00:00
Gregory Montoir
cec821630b fix palette glitches occuring when Joe switches from his clothes to the dress
svn-id: r11200
2003-11-07 17:56:23 +00:00
Gregory Montoir
e042901695 oops
svn-id: r11198
2003-11-07 16:47:07 +00:00
Gregory Montoir
f4dc977839 add bob parallax stuff for room 74 (carbam)
svn-id: r11197
2003-11-07 16:44:13 +00:00
David Eriksson
c0fe2a5da3 Implement some special actions
svn-id: r11194
2003-11-07 15:34:51 +00:00
David Eriksson
e9eb92e201 Small fixes.
svn-id: r11189
2003-11-07 14:05:45 +00:00
David Eriksson
2a71ac0dc8 Minor fixes.
svn-id: r11185
2003-11-07 10:57:21 +00:00
Torbjörn Andersson
e01ab4599d Fixed warning. (I've only seen these warnings when compiling under MinGW,
and to be honest I never understood why the compiler wars for it.)

svn-id: r11184
2003-11-07 10:38:45 +00:00
Joost Peters
e9581dda6e Added partial playSong() implementation
svn-id: r11179
2003-11-07 02:33:20 +00:00
Joost Peters
709c326276 Don't try to speak NULL strings, this fixes atleast 1 crash. (looking out the hotel window)
svn-id: r11173
2003-11-07 00:54:41 +00:00
David Eriksson
9282408794 Bug fix for non-quittable cutaways.
svn-id: r11166
2003-11-06 21:15:35 +00:00
David Eriksson
3769398474 - Improved talking
- Lots of small fixes

svn-id: r11165
2003-11-06 21:06:01 +00:00
David Eriksson
bd23b7dce0 Do not allow invalid room numbers.
svn-id: r11164
2003-11-06 17:54:59 +00:00
Joost Peters
d03ff2a119 more enum stuff
svn-id: r11163
2003-11-06 15:47:37 +00:00
David Eriksson
d3936b616c Validate room number
svn-id: r11162
2003-11-06 15:26:44 +00:00
David Eriksson
0f98be649b Clean-up
svn-id: r11161
2003-11-06 08:53:09 +00:00
David Eriksson
c524a58197 The more I implement, the more I need to implement.
- More cutaway code
- More dialogue code
Hint: Let the last intro cutaway finish if you don't want Joe to get stuck.

svn-id: r11160
2003-11-06 08:44:33 +00:00
Gregory Montoir
086c8a50a4 update
svn-id: r11148
2003-11-05 10:11:37 +00:00
Gregory Montoir
85c409dce9 minor changes
svn-id: r11147
2003-11-05 10:09:54 +00:00
Gregory Montoir
829b4464fd walking fixes (int16/uint16)
svn-id: r11146
2003-11-05 10:08:55 +00:00
Gregory Montoir
6a6644bac8 fix demo crash after introduction
svn-id: r11131
2003-11-04 19:51:31 +00:00
Gregory Montoir
5caf79c8e5 change white palette entry for cursor in order to avoid glitch when palFadeIn is called
svn-id: r11130
2003-11-04 19:50:54 +00:00
Gregory Montoir
f71d4e4df8 display PCGames splash screen for demo version
svn-id: r11127
2003-11-04 14:43:53 +00:00
Gregory Montoir
53fb701324 R_MAP define
svn-id: r11126
2003-11-04 14:29:52 +00:00
Gregory Montoir
b06e50dfa5 preliminary R_MAP implementation
svn-id: r11125
2003-11-04 13:51:36 +00:00
Marcus Comstedt
ef5e193d59 stdafx.h needs to be included first.
svn-id: r11117
2003-11-03 22:28:37 +00:00
Gregory Montoir
d85757987e oops
svn-id: r11111
2003-11-03 20:48:27 +00:00
Gregory Montoir
ca9638e4f6 cleanup
svn-id: r11108
2003-11-03 19:52:14 +00:00
Gregory Montoir
f9b7856afb init Walk::_joeMoveBlock at the right place
svn-id: r11091
2003-11-03 14:48:07 +00:00
Gregory Montoir
ac47dbeee8 cleanup / enable cutaway calls
svn-id: r11090
2003-11-03 14:47:22 +00:00
Gregory Montoir
b6d8e8187b enable room switching
svn-id: r11089
2003-11-03 14:47:05 +00:00
Joost Peters
c4d5445b00 Add partial roomname enum
svn-id: r11085
2003-11-03 03:42:20 +00:00
Joost Peters
95db1c18db Remove old FIXME
svn-id: r11067
2003-11-02 21:44:31 +00:00
Max Horn
6abd397bf4 fix compile error
svn-id: r11066
2003-11-02 21:40:41 +00:00
Joost Peters
17db9a91f3 change inventory browsing to match original
svn-id: r11065
2003-11-02 21:37:20 +00:00
David Eriksson
495bba6751 Match new[] with delete[].
svn-id: r11064
2003-11-02 20:56:33 +00:00
David Eriksson
3ca74e5d4a Enable keys for panel commands.
svn-id: r11063
2003-11-02 20:42:36 +00:00
Gregory Montoir
c4404baa45 cleanup/remaining Walk cutaway calls
svn-id: r11056
2003-11-02 16:47:31 +00:00
Gregory Montoir
082bed6940 update
svn-id: r11055
2003-11-02 16:46:37 +00:00
Gregory Montoir
3ed8601f64 fix locking verb crash
svn-id: r11054
2003-11-02 16:46:12 +00:00
Joost Peters
70a1d43815 add missing inventory functions
svn-id: r11051
2003-11-02 14:49:51 +00:00
Gregory Montoir
561d4c09d8 use input->delay instead of system->delay
svn-id: r11035
2003-11-01 21:20:36 +00:00
Gregory Montoir
e6eb3e234d don't do dynalum if palette scroll is disabled
svn-id: r11032
2003-11-01 20:46:35 +00:00
Gregory Montoir
885fd48a66 rename Queen::GameSettings to Queen::GameConfig
svn-id: r11031
2003-11-01 20:45:45 +00:00
Torbjörn Andersson
4952fb11ac Fix warning
svn-id: r11018
2003-10-31 20:59:55 +00:00
Gregory Montoir
d1ff236f3c use Command class
svn-id: r11017
2003-10-31 13:47:28 +00:00
Gregory Montoir
23188d5188 initial version of Command class
svn-id: r11016
2003-10-31 13:46:45 +00:00
Gregory Montoir
55cb72e5fa add mouse cursor code
svn-id: r11015
2003-10-31 10:11:27 +00:00
Joost Peters
295e9c6ff9 add support for spanish cd version
svn-id: r11013
2003-10-30 23:20:47 +00:00
Gregory Montoir
4c7b847950 really return verb name
svn-id: r11012
2003-10-30 18:19:03 +00:00
Gregory Montoir
4db6235db7 add methods needed by Command
svn-id: r11011
2003-10-30 13:08:38 +00:00
Gregory Montoir
d8ffcaf340 new Verb class
svn-id: r11010
2003-10-30 10:56:38 +00:00
David Eriksson
5813950a83 A commit that has it all:
- Bug fixes
- Refactoring
- New code

svn-id: r11007
2003-10-29 21:04:12 +00:00
Gregory Montoir
24acd21da4 only one RandomSource for the engine
svn-id: r11004
2003-10-29 13:06:10 +00:00
Gregory Montoir
efa51b6013 add accessors for mouse current pos / button + keyVerb
svn-id: r10999
2003-10-28 20:58:46 +00:00
Gregory Montoir
8eea63362e handle (x,y) negative coordinates in dynalum
svn-id: r10998
2003-10-28 19:55:12 +00:00
Max Horn
53db0a8a07 cleanup: removed version/id from GameSettings
svn-id: r10995
2003-10-28 17:07:25 +00:00
Joost Peters
0ba347414d forgot this
svn-id: r10994
2003-10-28 15:33:45 +00:00
Joost Peters
ee276b12b8 add OGG playback to queen
svn-id: r10993
2003-10-28 15:26:05 +00:00
Gregory Montoir
cb2306373d safer dynalum tweak
svn-id: r10992
2003-10-28 15:05:35 +00:00
David Eriksson
1ab811c4ec Safer use of dynalum.
svn-id: r10991
2003-10-28 14:19:11 +00:00
Joost Peters
31a8ef2e7f cleanup
svn-id: r10989
2003-10-28 13:27:37 +00:00
Joost Peters
e02fe63f2e added loadFileMalloc() method
svn-id: r10988
2003-10-28 12:42:35 +00:00
Gregory Montoir
26a873a2e4 more stuff for future Command class
svn-id: r10987
2003-10-27 15:00:25 +00:00
Gregory Montoir
2a139049d6 cleanup, add comments
svn-id: r10977
2003-10-26 13:54:26 +00:00
Gregory Montoir
060300339e add some methods to Logic for future Command class
svn-id: r10965
2003-10-25 20:26:50 +00:00
Gregory Montoir
b24bb81695 cleanup Graphics / populate BobSlot
svn-id: r10961
2003-10-25 09:12:18 +00:00
Gregory Montoir
0b5da13ffe added GameSettings class + FIND_VERB implementation
svn-id: r10960
2003-10-25 09:11:35 +00:00
Joost Peters
6fc0cd7913 whatever
svn-id: r10959
2003-10-25 01:11:14 +00:00
Joost Peters
3ad14b06f5 added extra flag to mixer so we don't use free() on new'd pointers
svn-id: r10958
2003-10-24 23:09:01 +00:00
Torbjörn Andersson
dc2dd831e9 Only free _logic once.
svn-id: r10955
2003-10-24 15:29:52 +00:00
Gregory Montoir
d2dff9dd8d misc fixes/tweaks
svn-id: r10954
2003-10-24 08:55:13 +00:00
David Eriksson
7772adbe1e Make it possible to quit cutaways!
svn-id: r10952
2003-10-23 18:50:47 +00:00
Gregory Montoir
00e2ee13ff move state related methods to specific class + minor changes
svn-id: r10951
2003-10-23 18:46:04 +00:00
Gregory Montoir
58df020717 forgot these
svn-id: r10950
2003-10-23 08:16:31 +00:00
Gregory Montoir
2a42fe77bf minor changes for future Command class
svn-id: r10949
2003-10-23 08:09:49 +00:00
David Eriksson
b54905f269 Stop messing with _fastMode in delay().
svn-id: r10947
2003-10-23 07:21:23 +00:00
David Eriksson
4f186737a7 Include scummsys.h
svn-id: r10946
2003-10-23 07:16:05 +00:00
David Eriksson
ad98347eb0 Initial version of the Input class. Some things still missing.
svn-id: r10944
2003-10-23 06:44:35 +00:00
Gregory Montoir
963d336da5 (better ?) scrolling timing
svn-id: r10937
2003-10-21 17:32:51 +00:00
David Eriksson
3bd08fd482 - Add some missing speech
- Disable debug messages

svn-id: r10936
2003-10-21 13:18:02 +00:00
David Eriksson
3cff930d8f Disable debug message
svn-id: r10935
2003-10-21 13:17:11 +00:00
Joost Peters
8395184a8f forgot to commit this
svn-id: r10934
2003-10-21 12:38:01 +00:00
Joost Peters
5bcf5a901e add Sound class + call it from Talk::speakSegment
svn-id: r10933
2003-10-21 12:29:37 +00:00
David Eriksson
1744ba3441 - Better handling of complex animations
- Special action: scale title

svn-id: r10932
2003-10-21 12:13:56 +00:00
David Eriksson
4e5a40f013 Correct string animation.
svn-id: r10931
2003-10-21 12:07:33 +00:00
Gregory Montoir
4e2ffd8d9e WALK, GRAB_JOE, GRAB_DIR, USE_UNDERWEAR, USE_DRESS and USE_CLOTHES implementations
svn-id: r10924
2003-10-21 09:05:16 +00:00
Gregory Montoir
ff5fde47ea scrolling timing (copy/paste from SkyEngine)
svn-id: r10919
2003-10-20 20:12:59 +00:00
Joost Peters
d3dd9f6216 allow loading of rebuilt/compressed datafile
svn-id: r10917
2003-10-20 19:18:02 +00:00
Gregory Montoir
ee6533365d cross reference update / cleanup
svn-id: r10916
2003-10-20 13:54:46 +00:00
David Eriksson
811b0a1855 - Disable debug messages
- Write text at correct position

svn-id: r10915
2003-10-20 13:08:59 +00:00
Gregory Montoir
78f8733180 fix missing thugs & Hugh during intro + smoother scrolling + flashspecial (sm37)
svn-id: r10914
2003-10-20 12:30:34 +00:00
Gregory Montoir
61a27e1b63 remaining palette stuff
svn-id: r10911
2003-10-20 10:26:56 +00:00
Gregory Montoir
59f5854be2 real Logic::anim cleanup
svn-id: r10910
2003-10-20 08:39:18 +00:00
Gregory Montoir
769f033b00 Logic::anim / BobSlot cleanup
svn-id: r10909
2003-10-20 08:34:48 +00:00
Gregory Montoir
e25bda32ec minor cleanup / comments update
svn-id: r10908
2003-10-19 18:52:28 +00:00
David Eriksson
7897eeac10 Do it right this time.
svn-id: r10906
2003-10-19 11:55:55 +00:00
David Eriksson
e3d236def0 Probably play right voice at the right time now.
svn-id: r10905
2003-10-19 11:51:41 +00:00
David Eriksson
b7f01db3f7 Added scaling of objects in cutaways.
svn-id: r10904
2003-10-19 11:41:24 +00:00
David Eriksson
3e1e888c07 - currentImage stuff
- create correct voice file prefix

svn-id: r10903
2003-10-19 11:01:23 +00:00
Gregory Montoir
26aa6c9087 fix truck intro problem
svn-id: r10901
2003-10-18 19:40:11 +00:00
Gregory Montoir
3fdb2540c0 fix bad access on areas
svn-id: r10900
2003-10-18 17:42:24 +00:00
Gregory Montoir
eadf6356d3 fix bob clipping errors
svn-id: r10899
2003-10-18 17:12:50 +00:00
Gregory Montoir
673b211fda display Joe at current position during intro. Still have to find out why the truck flashes on talkie version...
svn-id: r10898
2003-10-18 17:09:13 +00:00
David Eriksson
2a5c965283 Improved the 'special moves' for intro cutaway (but the thugs must be
hiding behind some crate...)

svn-id: r10897
2003-10-18 16:19:36 +00:00
David Eriksson
201c7f129c Fix normal animation.
svn-id: r10896
2003-10-18 15:33:23 +00:00
David Eriksson
57dc2067c1 Special actions for cdint.cut
svn-id: r10895
2003-10-18 14:01:43 +00:00
David Eriksson
1a8397a475 Fix a little bug.
svn-id: r10893
2003-10-18 12:59:44 +00:00
David Eriksson
d2e65e35e9 Handle cutaway text.
svn-id: r10892
2003-10-18 12:48:05 +00:00
David Eriksson
935a476a29 Moved function from Talk to Graphics because Cutaway need it too.
svn-id: r10891
2003-10-18 12:18:43 +00:00
David Eriksson
de37ee0c3e - Fix some cutaway crashes
- Implement more cutaway animation

svn-id: r10890
2003-10-18 11:46:52 +00:00
David Eriksson
65883950d8 Make the aeroplane fly (and Joe too... I wonder what he smoked.)
svn-id: r10889
2003-10-18 10:58:10 +00:00
Gregory Montoir
c518ee26ec minor changes to joeMove() code
svn-id: r10888
2003-10-18 08:12:56 +00:00
Gregory Montoir
be8bbb143e minor adds + cleanup + fix parallax problem
svn-id: r10887
2003-10-18 08:12:14 +00:00
Gregory Montoir
a581a2be5e update references for Display class
svn-id: r10886
2003-10-18 08:11:59 +00:00
Max Horn
0694eed273 moved game detection code out to the plugins
svn-id: r10882
2003-10-17 23:16:53 +00:00
Max Horn
8ab81c2533 fix warning
svn-id: r10873
2003-10-17 16:50:35 +00:00
Jamieson Christian
e59ce1cd5a Fix MSVC6 warnings
svn-id: r10871
2003-10-17 16:42:49 +00:00
Jamieson Christian
1f941c822c Make enums public. Fixes MSVC erros with enum usage in member structs
svn-id: r10870
2003-10-17 16:42:10 +00:00
Joost Peters
4fe33a1dae also look for TBL file in current directory (useful when running the game from CD)
svn-id: r10861
2003-10-17 14:26:23 +00:00
Gregory Montoir
f4b5626fd7 preliminar parallax scrolling support (Rita/Joe intro scene), not perfect as Bobs coordinates are also modified in cutaway/action_special_move
svn-id: r10860
2003-10-17 14:26:05 +00:00
Gregory Montoir
323c338169 more palette stuff
svn-id: r10859
2003-10-17 13:12:50 +00:00
Torbjörn Andersson
250f2ea52b Fix warning.
svn-id: r10856
2003-10-17 12:00:08 +00:00
David Eriksson
a935fcfe92 - Implement *WT
- Disable some debug output

svn-id: r10855
2003-10-17 11:47:41 +00:00
David Eriksson
d228678a5a Disable some debug output
svn-id: r10854
2003-10-17 11:47:21 +00:00
Joost Peters
e00848384a fixed crash (atleast it crashes for me on OSX) - can someone please verify if this is a proper fix (and doesn't break anything else?)
svn-id: r10851
2003-10-17 10:51:07 +00:00
Gregory Montoir
e2930bf8be partially fixed palette problem when switching room in cutaway intro
svn-id: r10847
2003-10-17 09:45:12 +00:00
Gregory Montoir
6980358f4d fix french characters display (and maybe german and italian too)
svn-id: r10846
2003-10-17 08:41:31 +00:00
Torbjörn Andersson
40b231e6fe Hack for allowing ScummVM to respond to events during while the intro is
playing. I apologize for adding a global variable, but for now that seemed
like the least intrusive change.

svn-id: r10845
2003-10-17 08:40:48 +00:00
David Eriksson
b2aa63a15e Wrote a little TODO
svn-id: r10842
2003-10-17 07:16:36 +00:00
David Eriksson
46618451eb Do what I actually intended to do.
svn-id: r10841
2003-10-17 03:59:55 +00:00
Max Horn
2da3e5138d fix warning
svn-id: r10837
2003-10-16 23:16:00 +00:00
Paweł Kołodziejski
67d3021d13 commented this line... for proper compilation
svn-id: r10835
2003-10-16 22:12:27 +00:00
David Eriksson
0174cf236b Load room before cutaway.
svn-id: r10834
2003-10-16 19:51:19 +00:00
David Eriksson
7f6c294a1e Play all intro cutaways (some better than others... :-)
svn-id: r10833
2003-10-16 19:40:29 +00:00
Gregory Montoir
5e36a5cac8 modified/fixed palette code
svn-id: r10832
2003-10-16 18:57:56 +00:00
David Eriksson
7c55594afc Now we're talking!
svn-id: r10831
2003-10-16 17:02:32 +00:00
David Eriksson
ebcfb7c820 Initialize Joe's scaling.
svn-id: r10830
2003-10-16 16:58:30 +00:00
David Eriksson
5daae67404 Talk stuff
svn-id: r10829
2003-10-16 16:57:30 +00:00
David Eriksson
29fc207062 Make frames array available.
svn-id: r10828
2003-10-16 16:55:13 +00:00
Gregory Montoir
8833f8c490 new Display class, cleanup Graphics
svn-id: r10827
2003-10-16 13:54:48 +00:00
Gregory Montoir
354f1bebf3 fix body/head problem
svn-id: r10822
2003-10-16 09:27:45 +00:00
David Eriksson
f057e794f7 Don't talk too much.
svn-id: r10819
2003-10-16 04:01:40 +00:00
David Eriksson
35c23667c3 Moving heads when talking, but where is the text? :-)
svn-id: r10815
2003-10-15 18:39:30 +00:00
Gregory Montoir
57a2b4c453 preliminary GRAPHIC_ANIM support
svn-id: r10814
2003-10-15 16:31:51 +00:00