Commit Graph

7643 Commits

Author SHA1 Message Date
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
Paweł Kołodziejski
18c28863a2 update and added mad lib by default
svn-id: r11264
2003-11-11 19:54:24 +00:00
Torbjörn Andersson
c16d20c72f Slight refinement to the last patch. There are four different possibilities
for which CD to look for: 0 (both CDs - not used?), 1, 2 and 3 (not used?)

svn-id: r11263
2003-11-11 15:16:41 +00:00
Torbjörn Andersson
ce619b254e Extended the "res" debugger command to print information about where the
game expects to find the various cluster files. I plan to look into making
the game playable from CD, and this should help during the testing.

svn-id: r11262
2003-11-11 15:07:35 +00:00
Max Horn
5d863586dc Disambiguate o6_jump execution (is _scriptPointer read before or after fetchScriptWordSigned() (which modifies _scriptPointer) is being called)
svn-id: r11261
2003-11-11 13:47:53 +00:00
Torbjörn Andersson
1f53624d88 Removed SVM_timeGetTime(). We may as well call get_msecs() directly.
svn-id: r11260
2003-11-11 10:30:25 +00:00
Torbjörn Andersson
70bc5d15ec Removed redundant header files.
svn-id: r11259
2003-11-11 07:47:22 +00:00
Torbjörn Andersson
446a01ba09 Moved low-level keyboard and mouse handling to a new Input class, and
renamed the Display class Graphics for no better reason than me liking the
phrase "sound and graphics" better than "sound and display".

svn-id: r11258
2003-11-11 07:43:02 +00:00
Max Horn
0bcc7ce80e made Scumm::OptionsDialog subclass GUI::OptionsDialog (code reuse); replaced Sound::_sound_volume_master and friends by ConfMan.get() calls; some whitespace cleanup
svn-id: r11257
2003-11-11 00:40:35 +00:00
Max Horn
b38995b288 cleanup (merged the two base set() methods)
svn-id: r11256
2003-11-11 00:26:38 +00:00
Max Horn
22c22d1e81 added namespace GUI
svn-id: r11255
2003-11-10 23:40:48 +00:00
Max Horn
5c2a3da7f2 fix for bug #833537 (Config manager saves "save_slot")
svn-id: r11254
2003-11-10 23:17:11 +00:00
Max Horn
deef1ef32b get-rid-of-queencomp TODO
svn-id: r11253
2003-11-10 21:29:28 +00:00
Max Horn
f71fe1316e don't use tabs in README
svn-id: r11252
2003-11-10 19:24:56 +00:00
Joost Peters
23669de2f3 deprecated adj. Said of a program or feature that is considered
obsolescent and in the process of being phased out, usually in favor of
a specified replacement.

svn-id: r11251
2003-11-10 19:17:52 +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
Paweł Kołodziejski
6727a31884 added subopcode comments
svn-id: r11245
2003-11-10 09:16:41 +00:00
Paweł Kołodziejski
a26f9872ac update
svn-id: r11244
2003-11-10 08:50:25 +00:00
Paweł Kołodziejski
aa848961b3 changed opcode name to actorOps
svn-id: r11243
2003-11-10 08:46:40 +00:00
Paweł Kołodziejski
514a9b5120 renamed back to o6_ifclassofif and extended names for dim opcodes
svn-id: r11242
2003-11-10 08:00:55 +00:00
Torbjörn Andersson
3d012651fd The script engine frequently needs to pass pointers to various structures
etc. to the different opcodes. Until now it has done so by casting the
pointer to an int32 (opcode parameters are represented as arrays of int32)
and then the opcode function casts it back to whatever pointer it needs.

At least in C there is no guarantee that a pointer can be represented as an
integer type (though apparently C99 may define such a type), so this has
struck me as unsafe ever since I first noticed it.

However, since all such pointers appear to point to the memory block owned
by the memory manager, we can easily convert them to integers by treating
them as offsets into the memory block. So that's what I have done. I hope I
caught all the occurences in the opcode functions, or we're going to have
some pretty interesting regressions on our hands...

svn-id: r11241
2003-11-10 07:52:15 +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
Jonathan Gray
63c6944492 mark zak256 as a depreciated target, zakTowns will be used in future to be more consistent with the other target names. Config magic to automatically set a gameid=zak256 in config files not yet implemented.
svn-id: r11238
2003-11-10 00:58:22 +00:00
Max Horn
03f50231d2 cleanup / some warnings (I'd like to know if and where those opcodes are used)
svn-id: r11237
2003-11-10 00:28:09 +00:00
Paweł Kołodziejski
2b509bc0b6 renamed opcode and added sobopcode comments
svn-id: r11236
2003-11-10 00:05:17 +00:00
Jonathan Gray
d330de5f28 comment out all the targets for newer humongous games until they start doing something useful
svn-id: r11235
2003-11-09 23:50:40 +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