libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-16 14:50:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
14,539 Commits 5 Branches 5 Tags 1.8 GiB
c5bdada079
Commit Graph

653 Commits

Author SHA1 Message Date
Gregory Montoir
b1141ae717 bumped Cutaway::_personFace array size, as during intro Cutaway::_personFaceCount max value is 12 
svn-id: r12388
 2004-01-14 15:51:54 +00:00
Gregory Montoir
6c78f2a6b8 - tweaked a bit walking functions to make persons stop walking when a cutaway is canceled 
- removed unpack to bob frame 2 (as it is never used)
- changed some error() calls to assert()
- minor cleanups

svn-id: r12385
 2004-01-14 14:34:05 +00:00
Gregory Montoir
b218cb93fe cleanup 
svn-id: r12378
 2004-01-14 10:40:25 +00:00
Gregory Montoir
2f85714c60 - wrong sentence was spoken when Joe was trying to 'pick up' a person 
- clear command before switching rooms
- clear texts at the end of cutaway (fix minor glitch in interview intro)

svn-id: r12361
 2004-01-13 14:43:13 +00:00
Gregory Montoir
95de2117a2 New save/load code, this *breaks* compatiblity with the previous 
savefile format. Use the 'qsc' tool to convert your old files
(http://0x.7fc1.org/fotaq/qsc.[cpp|exe]).

svn-id: r12339
 2004-01-12 13:40:02 +00:00
Gregory Montoir
bbf32c0076 oops 
svn-id: r12337
 2004-01-12 09:43:06 +00:00
Gregory Montoir
a6d1540d49 turned Logic::useJournal() into a virtual method 
svn-id: r12336
 2004-01-12 09:40:57 +00:00
Joost Peters
14eeb574d3 fixes compilation for our *cough* favourite *cough**cough* compiler: MSVC! 
svn-id: r12331
 2004-01-12 00:34:27 +00:00
Gregory Montoir
df985747e1 minor display code changes 
svn-id: r12323
 2004-01-11 17:20:29 +00:00
Gregory Montoir
6dc8407297 cleanup 
svn-id: r12318
 2004-01-11 14:11:36 +00:00
Gregory Montoir
f2874733b0 tweaked a bit dirty blocks display code, this fixes the minor glitch in interview intro 
svn-id: r12317
 2004-01-11 14:08:07 +00:00
Joost Peters
9cd7d79596 - stop voice when skipping dialogue 
- scroll 4 inventory items when right-clicking

svn-id: r12314
 2004-01-11 01:36:00 +00:00
Gregory Montoir
3be8219bd9 cleanup 
svn-id: r12312
 2004-01-10 22:31:41 +00:00
Gregory Montoir
5616955701 new Talk::splitOption() code (same value for text margins, word width is computed without the ending space char) 
svn-id: r12310
 2004-01-10 21:56:47 +00:00
Gregory Montoir
3e8a551d8b removed old hack to prevent speaking sentence 0 
svn-id: r12308
 2004-01-10 20:33:05 +00:00
Gregory Montoir
40651928dc removed some debug() calls 
svn-id: r12307
 2004-01-10 19:59:11 +00:00
Gregory Montoir
615e0df8da enabled arrows in dialogue (non english versions) 
svn-id: r12306
 2004-01-10 19:55:54 +00:00
Joost Peters
3589c2f776 added stopSfx() method 
svn-id: r12305
 2004-01-10 17:46:26 +00:00
David Eriksson
72d54f173e Never mind. 
svn-id: r12304
 2004-01-10 16:54:00 +00:00
Gregory Montoir
3d1c883970 workaround for final room sound issues 
svn-id: r12302
 2004-01-10 16:23:34 +00:00
David Eriksson
aab4e7a011 Correct previous fix :-) 
svn-id: r12301
 2004-01-10 16:13:21 +00:00
David Eriksson
5d50f01b2f Text position for talking heads. 
svn-id: r12300
 2004-01-10 16:03:41 +00:00
David Eriksson
c27915b46d Correct comment 
svn-id: r12299
 2004-01-10 16:03:08 +00:00
David Eriksson
2f82a5c573 Honor speech and subtitle toggles 
svn-id: r12298
 2004-01-10 15:53:51 +00:00
David Eriksson
102cf0254a - Honor speech and subtitle toggles 
- Make text stay on screen longer

svn-id: r12297
 2004-01-10 15:52:00 +00:00
David Eriksson
c13a04f570 - Must have either subtitles or speech 
- Should not be possible to disable text on non-CD-ROM versions

svn-id: r12296
 2004-01-10 15:48:13 +00:00
David Eriksson
f2e8f65cb0 Add test for CD-ROM version 
svn-id: r12295
 2004-01-10 15:46:02 +00:00
Gregory Montoir
9439e09e45 this should fix : 
- minor sound glitch in room 50 (temple zombies)
- panel undisplayed at the end of cutaway c62c
- wrong dirty blocks in room 76
- Cutaway::_cutAnim is now a 21x30 elements array. This is needed for cutaway c69g, where we setup
  frames for bob num 20 (the original game uses the same value)
- Credits::_list is now a 18 elements array (that's what credits2.crd need)

svn-id: r12294
 2004-01-10 12:56:07 +00:00
Gregory Montoir
657333aaf0 fix mouse pointer glitch occuring when exiting Debugger 
svn-id: r12281
 2004-01-09 15:14:15 +00:00
Gregory Montoir
634df6923d renamed some methods and moved some code to Display 
svn-id: r12276
 2004-01-09 13:36:37 +00:00
Gregory Montoir
c4e9d55acb minor Logic::initPerson() tweak 
svn-id: r12270
 2004-01-08 23:28:29 +00:00
Gregory Montoir
1b1ce1faf7 moved the remaining 'graphics' stuff from Logic to Graphics 
svn-id: r12266
 2004-01-08 22:46:42 +00:00
Gregory Montoir
370589dde5 cleanup, xref update 
svn-id: r12256
 2004-01-08 16:41:03 +00:00
Gregory Montoir
85f8b442f2 - new Grid class to handle all zones / areas stuff 
- adapted Logic/Walk code to use it

svn-id: r12250
 2004-01-08 14:10:32 +00:00
Gregory Montoir
74829245d9 mostly cleanup : 
- moved main update() method to QueenEngine
- merged update() & checkPlayer()
- added a method in Logic class to handle the CUTAWAY_SPECIAL stuff
- Journal remembers last seen page
- no need to call loadPanel() to restore panel palette, use palSetPanel() instead

svn-id: r12240
 2004-01-08 10:25:18 +00:00
Gregory Montoir
c46d2f0530 fix 'panel still displayed during dialogue' bug (this was noticeable when trying to bypass the floda receptionist) 
svn-id: r12219
 2004-01-07 15:46:45 +00:00
Gregory Montoir
272eb21287 - moved some Person/Anim code to Graphics 
- some renaming

svn-id: r12218
 2004-01-07 15:45:24 +00:00
Gregory Montoir
74e588b854 - minor cleanup in Person/Actor stuff 
- minor tweak in Graphics::bobSetText()
from previous commit (message was erroneous) :
- moved config stuff to QueenEngine
- added 3 Logic subclasses to handle the specific parts of each game version (demo, intv...)

svn-id: r12195
 2004-01-06 20:00:46 +00:00
Gregory Montoir
e90f846df9 - enabled debugger in QueenEngine::errorString 
- initialise Cutaway::_personCount* when the Cutaway starts
- minor tweaks in BankManager

svn-id: r12185
 2004-01-06 16:53:35 +00:00
Gregory Montoir
ceda8aec02 moved animation stuff to Graphics class 
svn-id: r12182
 2004-01-06 14:21:50 +00:00
Max Horn
033ff78ae9 updated copyright notice 
svn-id: r12176
 2004-01-06 12:45:34 +00:00
Gregory Montoir
d62d44d29c simplified room switching code a bit 
svn-id: r12165
 2004-01-06 09:29:33 +00:00
Gregory Montoir
5e413ceb5c - enabled debugger in QueenEngine::errorString 
- initialise Cutaway::_personCount* when the Cutaway starts
- minor tweaks in BankManager

svn-id: r12163
 2004-01-05 20:46:37 +00:00
Gregory Montoir
232a709fd4 added a class to manage banks, Queen::Graphics cleanup 
svn-id: r12157
 2004-01-05 13:40:28 +00:00
David Eriksson
c21e5d797c At last - credits! 
svn-id: r12155
 2004-01-05 11:58:20 +00:00
Gregory Montoir
143b5bea80 - added code to only redraw changed blocks in order to avoid full screen refresh 
- minor code cleanup in Graphics/Display

svn-id: r12147
 2004-01-04 20:25:21 +00:00
Max Horn
d1e6c6059e renamed global var _debugLevel to g_debugLevel; let Engine constructor init it (this way all engines get it for free, allows further cleanup); removed some useless/duplicate member vars in SwordEngine 
svn-id: r12134
 2004-01-04 14:00:58 +00:00
Joost Peters
7cc9727916 respond to 'alter'-type overrides 
svn-id: r12126
 2004-01-04 03:37:12 +00:00
Joost Peters
5f85df5ed6 Allow queen to use adlib driver as well (that was surprisingly easy :)) 
svn-id: r12100
 2004-01-03 02:08:04 +00:00
Gregory Montoir
8bd9ce2949 - added missing MOVE_SPEAK code (only CHEF.DOG seems to use that) 
- clear Talk::_dialogueTree[0] to avoid problems when accessing oldLevel / level 0

svn-id: r12093
 2004-01-02 20:05:18 +00:00
Joost Peters
539002e23a spelling mistake 
svn-id: r12090
 2004-01-02 14:26:39 +00:00
Joost Peters
e5ba3b172e Tell adlib people they won't hear music 
svn-id: r12089
 2004-01-02 14:21:14 +00:00
Gregory Montoir
5b97c9308d minor rewrite of some asm funcs 
svn-id: r12088
 2004-01-02 14:17:42 +00:00
Gregory Montoir
5cc0191417 some debugger commands for bobs 
svn-id: r12087
 2004-01-02 14:17:25 +00:00
Gregory Montoir
c7965a7a04 minor rewrite of screenblanker code 
svn-id: r12086
 2004-01-02 14:15:45 +00:00
Gregory Montoir
1194bc9d5e use compressed data file instead of original one if both are available 
svn-id: r12059
 2003-12-31 16:15:46 +00:00
Torbjörn Andersson
edf6386a65 There's that incomprehensible MinGW GCC warning again! 
svn-id: r12050
 2003-12-31 12:53:43 +00:00
Gregory Montoir
49c67f4d20 acessing _numGraphics'th element of GraphicData array is safe 
svn-id: r12046
 2003-12-30 23:32:51 +00:00
Gregory Montoir
80b4510da1 remove hack from original code, this was apparently only needed for SELECT_VERB (from what I understood, bob 16 was supposed to highlight the current selected verb ; but the original doesn't use it at all) 
svn-id: r12041
 2003-12-30 22:01:16 +00:00
Gregory Montoir
42c5524a02 interview mini-game support 
svn-id: r12037
 2003-12-30 21:06:22 +00:00
Gregory Montoir
d91b30c933 minor cleanup & add playSong() calls in Logic::handlePinnacleRoom 
svn-id: r12031
 2003-12-30 10:46:05 +00:00
Gregory Montoir
0ea94e63a7 cleanup 
svn-id: r12024
 2003-12-29 21:51:50 +00:00
Gregory Montoir
bb77917c7f only call Logic::executeSpecialMove if asm > 0 
svn-id: r12023
 2003-12-29 21:31:02 +00:00
Gregory Montoir
0dd61a56b4 invalidate previous dynalum value on re-init (this fixes room <-> journal issues) 
svn-id: r12022
 2003-12-29 21:15:01 +00:00
Joost Peters
5d9b72ad7d mass debuglevel change for less verbosity (0 -> 6) 
importance/relevance has to be decided on an individual basis, if needed, later on

svn-id: r12021
 2003-12-29 21:05:33 +00:00
Gregory Montoir
84c18f4bf1 cleanup & use BobSlot::curPos() when possible 
svn-id: r12020
 2003-12-29 20:51:28 +00:00
Gregory Montoir
bd23a44f49 cleanup & follow code conventions 
svn-id: r12019
 2003-12-29 20:18:31 +00:00
Gregory Montoir
865797cbee - revise the way special moves are handled (demo and interview don't need a table) 
- slighlty modified some asm funcs which could let the game in fast mode
- minor cleanup

svn-id: r12018
 2003-12-29 20:17:43 +00:00
Gregory Montoir
df1ba69e4f more 'preparation' for interview and minor tweaks for demo 
svn-id: r12016
 2003-12-29 16:35:08 +00:00
Gregory Montoir
cf7adca772 fix for 'Klunk sentence repeated 2 times' bug (noticeable in french talkie version) 
svn-id: r12015
 2003-12-29 16:33:03 +00:00
Joost Peters
9e78d9e14e Demo uses different file for music (and disable it for now) 
svn-id: r12011
 2003-12-29 15:50:17 +00:00
Gregory Montoir
14cfaf8852 - hack to read patched .dog files (french & italian versions) from game data path instead of data file 
- cleanup Resource a bit (add an accessor for ResourceEntry in order to avoid multiple calls to resourceIndex)

svn-id: r12006
 2003-12-29 13:18:24 +00:00
Gregory Montoir
2548df9cf8 cleanup 
svn-id: r12003
 2003-12-28 21:18:03 +00:00
Gregory Montoir
67159d4539 cleanup Resource class a bit : 
- re-use some methods to read the resource table (normal / compressed)
- removed _gameVersion member as we can do without it (and is mostly
  useless in case of a compressed data file) ; now, we use the
  'JAS version string' as it is sufficient to detect if the game is
  a floppy version / demo etc.
- const'ness
- tweaked checkJASVersion() for interview mini game

removed (useless) dirty hack in Logic::changeRoom() to setup initial
scene in demos (pclogo.cut doesn't exist at all !)

svn-id: r11998
 2003-12-28 15:29:05 +00:00
Joost Peters
e76c4c9ebe Need to call this as well to properly stop music 
svn-id: r11989
 2003-12-28 03:56:13 +00:00
Joost Peters
dbe01121eb Improved music code a bit. still has 'hanging notes' when stopping music, though. 
svn-id: r11988
 2003-12-28 03:31:05 +00:00
Joost Peters
dd7fc9f8ef Cope with song '0' (old savegames used to use this 'dummy' value) 
svn-id: r11986
 2003-12-28 01:47:37 +00:00
Joost Peters
effc207b69 - added 'song' debugger command 
- restore music after loading game
- fix for bug in Roland Floda Corridor music
- added LE struct reading methods (and renamed the old BE ones) for future compatibility with original DOS savegames

svn-id: r11985
 2003-12-28 01:17:29 +00:00
Gregory Montoir
5bbb3be159 enable alternative introduction 
svn-id: r11959
 2003-12-27 12:58:26 +00:00
Gregory Montoir
749b5d4ca5 cleanup 
svn-id: r11946
 2003-12-26 15:36:28 +00:00
Gregory Montoir
5da05a84cb oops 
svn-id: r11945
 2003-12-26 14:52:07 +00:00
Gregory Montoir
e05e079116 enable original screen blankers 
svn-id: r11944
 2003-12-26 14:49:49 +00:00
Gregory Montoir
ffbfe8922a new debugging code, using Common::Debugger 
svn-id: r11940
 2003-12-26 12:58:27 +00:00
Max Horn
859a9c0129 o Added SoundMixer::isReady() 
o Removed SoundMixer::bindToSystem()
o In scumm, replaced _silentMixer, _silentDigitalImuse and _noDigitalSamples by SoundMixer::isReady()

svn-id: r11893
 2003-12-24 17:42:22 +00:00
Max Horn
e9269257f3 turned PlayingSoundHandle into an 'opaque' (well not really :-) data type, mainly because people kept (accidentally and sometimes on purpose :-) misusing them 
svn-id: r11881
 2003-12-24 00:25:18 +00:00
Marcus Comstedt
72788c1eab stdafx.h first, please. 
svn-id: r11820
 2003-12-21 16:17:27 +00:00
Max Horn
e439eb5129 added convenience SoundMixer::playVorbis variant which calls through to playSfxSound_Vorbis; made scumm/queen engines use it 
svn-id: r11812
 2003-12-21 15:47:52 +00:00
Max Horn
f19f73eb50 Make it possible for game detection functions to detect language/platform (not yet done by any detector, but will come with the MD5 detection code) 
svn-id: r11811
 2003-12-21 15:29:52 +00:00
Max Horn
9a994bf2f2 cleanup 
svn-id: r11795
 2003-12-21 00:07:16 +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
dae474e86d handle mouse wheel in Journal screen 
svn-id: r11758
 2003-12-19 09:21:02 +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
eb090ed5a6 cleanup 
svn-id: r11651
 2003-12-15 12:59:43 +00:00
Gregory Montoir
8b2f43f2bd re-enable keyboard commands 
svn-id: r11641
 2003-12-14 21:39:52 +00:00
Gregory Montoir
e1c21c2d8c don't call Command::changeObjectState() on items 
svn-id: r11639
 2003-12-14 20:24:29 +00:00
Gregory Montoir
cbcca65d06 add check before accessing ObjectData (only for safety) 
svn-id: r11634
 2003-12-14 14:47:00 +00:00
Travis Howell
97f1b78905 Make music_mute take effect. 
svn-id: r11624
 2003-12-14 04:07:22 +00:00
Travis Howell
6f2217dcb2 Fixproblem of fotaq attempting to play sfx as music, when sfx are disabled. 
svn-id: r11623
 2003-12-14 03:36:47 +00:00
Joost Peters
7efafcca53 Get rid of unused variable 
svn-id: r11622
 2003-12-14 01:04:07 +00:00
Joost Peters
1de28a2931 Initial (Roland) Music support; a lot of stuff is still missing and/or incomplete. 
svn-id: r11621
 2003-12-14 00:33:21 +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
Max Horn
35b62c294d removed GameSettings::detectname and GameSettings::midi; renamed GameSettings::gameName to name; added temporary experimental MD5 hack 
svn-id: r11603
 2003-12-13 00:20:01 +00:00
Gregory Montoir
c3c55a457c cleanup 
svn-id: r11600
 2003-12-12 20:26:20 +00:00
Max Horn
8f5c14aebe get rid of queencomp target (rather simply always check for both queen.1 and queen.1c); this allows some code simplification and gets rid of the last access to detector->_game in queen 
svn-id: r11599
 2003-12-12 15:29:58 +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
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