Commit Graph

126 Commits

Author SHA1 Message Date
Travis Howell
79036c5a1d Handle hiding of verbs/inventory in v1-v2 games correctly.
According to diasm. the verbs areas is only enabled and shown when (_userState & 128) is true and verbs/inventory area is cleared/redrawn on each state change.

svn-id: r9837
2003-08-24 01:47:45 +00:00
Jonathan Gray
abf7f33dc4 loom towns needs this as well you can now learn f
svn-id: r9814
2003-08-22 03:14:29 +00:00
Travis Howell
bbbca4f8fe Fix text display in verb/inventory area in demo mode of V1 maniac mansion
svn-id: r9734
2003-08-17 07:02:33 +00:00
Jonathan Gray
957185a62e this fixme doesn't apply to old bundle games using GID_INDY3 target
svn-id: r9631
2003-08-11 02:31:03 +00:00
Max Horn
3e0cd37cea get rid of GF_INDY3 again, and also remove GID_INDY3_256 and GID_INDY3_TOWNS
svn-id: r9554
2003-08-06 12:04:27 +00:00
Travis Howell
f20c47bb21 Add Indy3 FM Towns support, patch #773434
svn-id: r9062
2003-07-18 05:49:21 +00:00
Max Horn
187b715306 run script 5 in startScene (room transition script, it seems); don't invoke runInputScript(4) - it is not needed (runInputScript will be called by checkExecVerbs), and causes the buggy 'What is' command behavior); fixed V2 sentence line
svn-id: r8955
2003-07-12 21:28:04 +00:00
Max Horn
fb16fb3e24 added some very limited support for Mac Loom (text is now properly centered around x:160 instead of x:0); added (commented out) copyprot bypass (but since I am not sure if there was ever a Mac Loom w/o codes, am not sure if this ever should be enabled); added comment regarding the Mac Loom sound format
svn-id: r8737
2003-07-04 12:34:09 +00:00
Max Horn
870ce2879e added some const qualifiers; moved _bundle & _current_cd_sound from class Scumm to class Sound; some other tweaks
svn-id: r8648
2003-06-25 23:25:52 +00:00
Max Horn
3351f4257b cleanup
svn-id: r8647
2003-06-25 20:16:47 +00:00
Torbjörn Andersson
f339140776 After some consideration, I've reverted to the old Loom bypassing scheme
since I now believe that the variable is used to indicate that the game is
running in "demo" mode. This way, old savegames will still work.

The new bypassing scheme is still in the file, but commented out. If this
works, we can remove it completely later.

svn-id: r8515
2003-06-16 11:37:08 +00:00
Torbjörn Andersson
2d8bb4a6f6 The code to bypass the EGA Loom copy protection (which is necessary since
LucasArts have been selling cracked copies themselves) turned out to be
interfering with the ability to learn the fourth note under certain
conditions.

I've deviced an alternative bypass which should be a great deal safer,
though it won't do anything to salvage older savegames.

Ironically, Endy told me recently that he didn't like the idea of basing
the copy protection bypasses on the value of _currentRoom, but in this case
I really don't have any better idea.

svn-id: r8513
2003-06-16 06:18:30 +00:00
Max Horn
f4a31da513 runHook -> runInventoryScript, VAR_HOOK_SCRIPT -> VAR_INVENTORY_SCRIPT
svn-id: r8468
2003-06-14 12:23:30 +00:00
Jamieson Christian
d7b7abd93f Fixed MSVC warning
svn-id: r8449
2003-06-12 17:33:45 +00:00
Jonathan Gray
aabfc254c1 rework loom subtitle option handing
svn-id: r8448
2003-06-12 16:38:43 +00:00
Max Horn
49b9a8fc9d follow our coding conventions
svn-id: r8377
2003-06-07 00:49:36 +00:00
Max Horn
86df3537b9 replaced GF_AFTER with _version
svn-id: r8372
2003-06-07 00:13:26 +00:00
James Brown
9be08a55f9 Clean up debugger Restart function and move to SCUMM restart function
svn-id: r8263
2003-06-02 05:38:45 +00:00
Nicolas Bacca
41e316ad6e Reversing for the time being
svn-id: r8231
2003-06-01 10:28:45 +00:00
Nicolas Bacca
79a98164c0 Bypass Sam & Max floppy copy protection
svn-id: r8230
2003-06-01 10:15:31 +00:00
Max Horn
d5d0440e8c cleanup
svn-id: r8169
2003-05-31 11:57:18 +00:00
Max Horn
09546c2491 fixed V2 script freezing (bug #745421)
svn-id: r8086
2003-05-29 10:14:53 +00:00
Max Horn
1f70da0155 const as const can!
svn-id: r8058
2003-05-28 20:01:47 +00:00
Max Horn
7bc1399e00 this change seems to be 'logical', but could be wrong; would be nice to check the assembly...
svn-id: r7893
2003-05-24 17:07:50 +00:00
Max Horn
0361f5a6c0 bypass for Zak256 copy protection (can't test this right now, though)
svn-id: r7870
2003-05-23 23:24:48 +00:00
Max Horn
871df7fb57 restricted getObjectIndex to only search thru _objs, not _inventory(to avoid future confusion), this might cause regressions, though; fixed o2_getObjPreposition; adapted some code to the changed getObjectIndex
svn-id: r7829
2003-05-22 15:27:44 +00:00
Max Horn
a9788c771a from the MM/Zak scripts, the code etc. it's clear that unk2 is the sentence preposition
svn-id: r7827
2003-05-22 14:10:20 +00:00
Max Horn
b12d741ac1 cleaned up V2 input code
svn-id: r7811
2003-05-21 23:54:39 +00:00
Max Horn
85e92f4fae cutscene override fix for V3 games (bug #731985)
svn-id: r7809
2003-05-21 21:41:27 +00:00
Max Horn
e21604663f added v2 cutscene support (not quite complete; and crashes at some point in maniac because VAR_EGO contains a bogus value); cleanup
svn-id: r7781
2003-05-21 14:00:19 +00:00
Max Horn
49e7f7564a renamed various things for clarity
svn-id: r7754
2003-05-20 20:58:26 +00:00
Max Horn
1a394aa3c7 added enum's for the known actor/object claasses; extended putClass/getClass to translate the X/Y flip classes; made code use the new enum's; some other cleanup
svn-id: r7753
2003-05-20 20:42:28 +00:00
Max Horn
93d29f2f9a cleanup
svn-id: r7738
2003-05-20 15:41:07 +00:00
Max Horn
18a6b5dcc1 renamed ScriptSlot::unk1/unk2 to freezeResistant/recursive
svn-id: r7688
2003-05-19 11:31:35 +00:00
Max Horn
b43bca21cb more cleanup
svn-id: r7653
2003-05-18 23:46:30 +00:00
Max Horn
f6d1e71194 oops
svn-id: r7649
2003-05-18 23:19:43 +00:00
Max Horn
7171c5bcd4 cleanup
svn-id: r7646
2003-05-18 21:03:57 +00:00
Max Horn
6b7484f320 consistently index script slots with index 0 (not 1); this fixes bug #739463; made stopScriptNr match stopObjectScript more closely (we could merge them into one function one day)
svn-id: r7645
2003-05-18 20:57:32 +00:00
Max Horn
3576b8e168 yet another V2 sentence fix (now clicking on objects in Zak causes Zak to talk to it - but he gets stuck after some time)
svn-id: r7613
2003-05-17 18:42:31 +00:00
James Brown
e5d7459d98 Move some hacks around
svn-id: r7600
2003-05-17 06:33:34 +00:00
James Brown
6db28696e4 Fix invalid variable
svn-id: r7599
2003-05-17 06:18:34 +00:00
Max Horn
9e5f46e635 fixed V2 verb scripts
svn-id: r7570
2003-05-16 10:35:15 +00:00
Max Horn
7d08aea4cc SentenceTab unk4/unk3 are the sentence objects (think of: 'Use objectA with objectB' or 'Give objectA to objectB' etc.); added a little more V2 sentence hackery; added a FIXME regarding some strange sentence code (accessing objectB before it is set) in script.cpp
svn-id: r7562
2003-05-16 02:16:59 +00:00
Max Horn
e1652fedea hackish partial doSentence support
svn-id: r7560
2003-05-16 01:56:06 +00:00
Max Horn
9018be6cb3 moved drawBox to gfx.cpp (seems to be the more logical location)
svn-id: r7554
2003-05-15 23:50:16 +00:00
Max Horn
27c093a3a6 fixed / cleaned up drawBox
svn-id: r7553
2003-05-15 23:44:46 +00:00
Max Horn
acb35fc915 renamed _scrWidth/_scrHeight -> _roomWidht/_roomHeight, and _realWidth/_realHeight -> _screenWidth/_screenHeight (inspired by MadMoose, but I'll take the blame - still this seems much more logical & intuitive)
svn-id: r7423
2003-05-10 21:49:59 +00:00
Max Horn
4d7f7a8c80 yet more v2 var fixes
svn-id: r7397
2003-05-08 21:14:21 +00:00
Max Horn
0461222181 fixed various cases of bad var access
svn-id: r7394
2003-05-08 15:58:30 +00:00
Max Horn
98881c3a6a init all VAR_* variables to 0xFF; replaced access to _vars in the form _vars[VAR_*] by VARS(VAR_*) which performs a validity checK; renamed _vars to _scummVars to make sure I updated all places; fixed two places where V6 and newer games would access V5 vars (but there are still some left, it seems); checked VAR access for now only generates a warning
svn-id: r7393
2003-05-08 15:48:50 +00:00