libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-21 01:08:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,675 Commits 5 Branches 5 Tags 1.8 GiB
a169876a2f
Commit Graph

7675 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
501c77fc7a replaced constans with names 
svn-id: r11312
 2003-11-16 18:34:33 +00:00
Paweł Kołodziejski
bef4496b7e fixed warning 
svn-id: r11311
 2003-11-16 17:49:27 +00:00
Paweł Kołodziejski
643b61d729 update 
svn-id: r11310
 2003-11-16 17:28:26 +00:00
Torbjörn Andersson
fa2b8ba8de More cleanup. I've eliminated all the temporary global variables I've added 
over the past few weeks, except for g_sword2. (Of course, this doesn't
necessarily make the code any prettier, but we can work on that later.)

svn-id: r11309
 2003-11-16 14:18:29 +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
James Brown
aed2a56e0c Patch #842988 (sev) - fix bugs in sdl-config detection 
svn-id: r11305
 2003-11-16 04:03: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
Torbjörn Andersson
aaa5631a99 Mostly cleanup. Also prevented what would probably have been an infinite 
loop if ScummVM failed to find a file in the demo. (Now it should error out
instead, which is marginally preferable.)

svn-id: r11298
 2003-11-15 09:38:00 +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
Travis Howell
183b822629 Another try at zak copy protection bypass. 
svn-id: r11295
 2003-11-14 11:26:18 +00:00
Torbjörn Andersson
2658021292 Fixed regression introduced in revision 1.206 that broke parameter handling 
in o5_matrixOps(). This fixes bug #841885.

svn-id: r11294
 2003-11-14 10:55:24 +00:00
Travis Howell
0c6eabe4a3 Kanji support only seems to work in scumm5 games 
svn-id: r11293
 2003-11-14 10:19:28 +00:00
Paweł Kołodziejski
f5a1e9e7bb update imuse digital 
svn-id: r11292
 2003-11-14 08:06:58 +00:00
Torbjörn Andersson
e26bc17505 Updated Broken Sword II section 
svn-id: r11291
 2003-11-14 07:41:46 +00:00
Torbjörn Andersson
30670deb2c cleanup 
svn-id: r11290
 2003-11-14 07:41:22 +00:00
Paweł Kołodziejski
7b9575678d update 
svn-id: r11289
 2003-11-14 07:41:04 +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
Travis Howell
313a912af2 *** empty log message *** 
svn-id: r11281
 2003-11-13 10:51:02 +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
Torbjörn Andersson
66d9b4315a Re-enabled the CD swapping code, after rewriting it a bit. 
If a cluster file isn't found the resource manager will first check if it's
one of the files that it expects to find on the hard disk. If so, it's
considered a fatal error.

Otherwise it will present the user with an "Insert CD1" or "Insert CD2"
message, just like the original did. Unlike the original, the user will
have to press a button or click the mouse to indicate when he's done. I
don't know if we even can detect the CD automatically in any portable way.

As far as I can see, we'll need at least two separate path settings for
this to actually work: one for the HD install directory, and one or two for
the CDs. The file that are supposed to be found on the HD are only on one
of the CDs, so the amount of CD swapping would probably be unbearable
otherwise.

As a consequence, I haven't actually tried running the game from CD yet.

By the way, the old caching code has been removed completely now. All it
did was to copy the cluster file to HD for faster access. ScummVM never did
that, but so far no one has complained.

svn-id: r11273
 2003-11-13 07:59:52 +00:00
Jonathan Gray
80d60f2941 zak256 -> zaktowns in docs 
svn-id: r11272
 2003-11-13 01:25:21 +00:00
Max Horn
3a355e0763 fix compilation 
svn-id: r11271
 2003-11-13 00:00:49 +00:00
Gregory Montoir
9d89fe2b49 fix the skipped initial talk to floda receptionist 
svn-id: r11270
 2003-11-12 21:22:14 +00:00
Chris Apers
de1e3baf41 Preliminary support of Simon games on PalmOS 
svn-id: r11269
 2003-11-12 16:00:11 +00:00
Chris Apers
0be0f01226 Use GUI namespace 
svn-id: r11268
 2003-11-12 12:36:36 +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
Torbjörn Andersson
beed02807f cleanup 
svn-id: r11266
 2003-11-12 08:21:18 +00:00
Paweł Kołodziejski
97c78cc376 changed getting position of bundle song to ms 
svn-id: r11265
 2003-11-12 07:05:52 +00:00