ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,301 Commits 45 Branches 139 Tags
ffbfe8922a3cfa2d2750fca3a2cb2d953fd1e4ca
Commit Graph
138 Commits
Author SHA1 Message Date
Gregory Montoir ffbfe8922a new debugging code, using Common::Debugger 
svn-id: r11940
 2003-12-26 12:58:27 +00:00
Gregory Montoir 33ca6ecfa5 some code to play the 'room background sfx' (equivalent to sfxplay(NULLstr)) 
svn-id: r11786
 2003-12-20 16:54:46 +00:00
Gregory Montoir b7a5d97207 put all 'bam' related stuff in a class and allow load/save during a 'bam' scene 
svn-id: r11759
 2003-12-19 09:22:20 +00:00
Gregory Montoir aa2173868b clear command text in pinnacle room when there is no valid place under the cursor 
svn-id: r11652
 2003-12-15 13:00:48 +00:00
Gregory Montoir 32d044d302 some refactoring in Command code (removed/commented unused code, renamed some methods) 
svn-id: r11619
 2003-12-13 20:05:28 +00:00
Gregory Montoir c3c55a457c cleanup 
svn-id: r11600
 2003-12-12 20:26:20 +00:00
Gregory Montoir fef457ed0e get rid of Verb class 
svn-id: r11594
 2003-12-12 10:33:34 +00:00
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 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 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 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 498260f063 cleanup 
svn-id: r11494
 2003-12-04 13:21: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 894360920b fix klunk scene glitches 
svn-id: r11486
 2003-12-03 13:00:56 +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 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
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
Gregory Montoir a297899508 clear current command *in* Command class (not logic) 
svn-id: r11376
 2003-11-26 21:08:36 +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 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 ba50b42c36 fix 'wrong Joe position when switching from hotel basement to lobby' issue 
svn-id: r11313
 2003-11-16 19:55:04 +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
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
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
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
Gregory Montoir 3a51c5b702 fix amazon/shower issue outside temple 
svn-id: r11280
 2003-11-13 10:44: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
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 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 cd4eb7deff Return mouse cursor and panel after cutaway. 
svn-id: r11247
 2003-11-10 12:21:10 +00:00
Joost Peters 357cfb8aea fix small leak 
svn-id: r11231
 2003-11-09 21:55:19 +00:00