thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
9419 commits 35 branches 0 tags 1.4 GiB
Commit graph

169 commits

Author SHA1 Message Date
Torbjörn Andersson
e67aaba0c3 Got rid of the Sam & Max inventory hack. This fixes at least one aspect of 
bug #907113. See also bug #493153 for the origins of the hack.

It would be very nice if we could get this fix into 0.6.0 as well, because
bug #907113 crashes ScummVM for reasons which escape me. But someone will
have to verify that the fix is correct first. Pretty please...?

svn-id: r13124
 2004-03-01 16:07:16 +00:00
Travis Howell
929fd0591f Change debugs back to warnings (As requested) 
svn-id: r12931
 2004-02-18 11:46:07 +00:00
Travis Howell
2e7badd6dc Add back fix for bug #738352 and restrict to needed games only (Checked against disasm.) 
svn-id: r12905
 2004-02-15 13:06:09 +00:00
Travis Howell
2e672086da Switch warnings to debug 
svn-id: r12847
 2004-02-13 11:11:16 +00:00
Max Horn
8e89f7d060 moved the sam&max inventory hack into o6_setOwner 
svn-id: r12520
 2004-01-19 20:23:27 +00:00
James Brown
d300c79c1a Revert Fix for bug #738352 (DIG: Cursor image appears in upper left corner) - Fingolfin's commit and revision 1.162. Causes regressions such as Sam and Max bug #877798 (Inventory display glitches). 
Max - Sam and Max has the most complex usage of flObjects of most games, so if you want to test for regressions with these kind of changes it's your best bet :)

svn-id: r12425
 2004-01-16 08:23:46 +00:00
Max Horn
87e8ccd8c1 stupid me shouldn't write fixes, then in the last minute decide to put them into another place, then commit it before recompiling once more <sigh> 
svn-id: r12329
 2004-01-11 21:55:26 +00:00
Max Horn
c67d25cfb9 Fix for bug #738352 (DIG: Cursor image appears in upper left corner): don't draw flObjects in drawRoomObject(); this may cause regressions (I think it would be helpful to compile a list of some/many/all flObjects in all games, that would really help with debugging them :-) 
svn-id: r12328
 2004-01-11 21:52:24 +00:00
Max Horn
c1f34030f9 cleanup 
svn-id: r12327
 2004-01-11 21:48:31 +00:00
Max Horn
7237b6a2ec changed the name of the former removeObjectFromRoom yet again, to markObjectRectAsDirty - that describes its functionality more accurately, I hope :-) 
svn-id: r12326
 2004-01-11 20:42:40 +00:00
Max Horn
0712cb95af renamed removeObjectFromRoom to forceObjectRedraw 
svn-id: r12325
 2004-01-11 20:15:05 +00:00
Max Horn
6222d6e643 more cleanup 
svn-id: r12234
 2004-01-08 03:24:41 +00:00
Max Horn
d852e2855a cleanup (make some more use of class Common::Rect) 
svn-id: r12232
 2004-01-08 03:10:16 +00:00
Max Horn
033ff78ae9 updated copyright notice 
svn-id: r12176
 2004-01-06 12:45:34 +00:00
Max Horn
bceb48f5e0 renamed updateDirtyRect to markRectAsDirty (because that's what it really does); used virtual screen id constants in more places 
svn-id: r12122
 2004-01-03 22:45:23 +00:00
Max Horn
e3e6bb3191 got rid of those _maxFOO macros, replaced them by access to the equivalent _numFOO variables 
svn-id: r11953
 2003-12-26 23:11:35 +00:00
Max Horn
b5db74b2ac _inventory was sometimes accessed one-based and sometimes zero-based -> always use zero-base, for consistency 
svn-id: r11925
 2003-12-25 21:56:12 +00:00
Max Horn
8f999c7266 Fix for bug #847805 (FOA: Assertion failed crash at lava pit) 
svn-id: r11808
 2003-12-21 13:44:23 +00:00
Travis Howell
3d6461d30f Add option to enable copy protection in SCUMM games, which ScummVM disable it by default. 
svn-id: r11571
 2003-12-11 06:08:43 +00:00
Max Horn
d483e58a99 regression fix (bug #855313) 
svn-id: r11524
 2003-12-06 15:59:17 +00:00
Max Horn
c9559ef0d5 Fix for bug #853874 (ZAK: Can't Give Club in 5.5 build); this may cause regressions, and/or fix other bugs. However, I believe this is the right thing (TM) to do anyway :-) 
svn-id: r11523
 2003-12-06 14:19:34 +00:00
Paweł Kołodziejski
d5eddef057 changed some shift operators to *, / 
svn-id: r11315
 2003-11-16 20:52:57 +00:00
Paweł Kołodziejski
1f9e408e2f cleanup whitespaces 
svn-id: r11217
 2003-11-08 21:59:32 +00:00
Travis Howell
9ea97c5313 Revert since it still doesn't work right, last change stop messages about needing to go to Seattle. 
Need to good way to bypass zak copy protection, without issues.

svn-id: r11005
 2003-10-29 13:16:12 +00:00
Travis Howell
2a11383523 Hopefully right this time, last change caused a cheat (Free air travel) 
svn-id: r11003
 2003-10-29 10:24:03 +00:00
Max Horn
d7660a2662 introduced namespace Scumm; made #include statements use scumm/ prefix explicitly 
svn-id: r10571
 2003-10-03 18:33:57 +00:00
Max Horn
3f55f2669d renamed class Scumm to ScummEngine (consisten with other engine names; also makes room for a potential 'Scumm' namespace) 
svn-id: r10549
 2003-10-02 22:42:03 +00:00
Torbjörn Andersson
570e60a487 Whitespace changes 
svn-id: r10390
 2003-09-24 06:33:59 +00:00
Max Horn
1a6d75ef39 changed scumm/object.cpp for V1/V2 once again - this time it really should match the original behaviour 
svn-id: r10306
 2003-09-19 01:12:05 +00:00
Max Horn
6512592d0f moved Actor x/y to _pos.x/_pos.y -> this makes it much easier to grep for access of the actor position 
svn-id: r10253
 2003-09-14 18:16:45 +00:00
Max Horn
0161cd4bb8 let getObjActToObjActDist round up when dividing the distance by 8 for V1/V2 games. This helps in fixing bug #774529, but might cause regressions... 
svn-id: r10184
 2003-09-11 23:23:40 +00:00
Max Horn
deb4f6b786 cleanup; fix for bug #795942 (COMI: text display off screen) and #785760 (COMI: Lockup/crash on Skull Island) 
svn-id: r10144
 2003-09-09 20:54:19 +00:00
Max Horn
12d872f754 more sanity checks 
svn-id: r9208
 2003-07-28 01:09:54 +00:00
Max Horn
64e0a16a6d adding an assert (better paranoid than letting a null pointer slip thru) 
svn-id: r9207
 2003-07-28 00:33:05 +00:00
Max Horn
0d209fecb6 fix return values in getObjectOrActorXY; turned unsafe derefActorSafe call into derefActor (return value of derefActorSafe was used w/o checking it for 0) 
svn-id: r9206
 2003-07-28 00:04:20 +00:00
Max Horn
becd70d243 cleanup: encapsulate some more members of class Actor, and rename newDirection -> targetFacing (since it corresponds to the future value of 'facing'; the distinction between 'facing' and 'direction' is extremly fuzzy) 
svn-id: r9175
 2003-07-24 17:44:00 +00:00
Max Horn
a610e14a11 this FIXME is obsoleted by my recent fix for getMaskFromBox 
svn-id: r8678
 2003-06-30 22:22:04 +00:00
Paweł Kołodziejski
9385979376 fixed warning 
svn-id: r8664
 2003-06-27 05:02:01 +00:00
Max Horn
c1e08c27ce paranoia fix for getOBCDFromObject, in casegetResourceAddress returns 0 
svn-id: r8653
 2003-06-26 13:55:01 +00:00
Max Horn
7a79ef8f5f added getOBIMFromObject and getObjectImage methods; changed code to use those 
svn-id: r8651
 2003-06-26 01:46:41 +00:00
Max Horn
3c296b36b7 added ResourceIterator, replacing two of the old findResource/findResourceSmall function - contraty to those, this approach is thread safe 
svn-id: r8650
 2003-06-26 00:47:39 +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
fc8e12444a seems monkeyega & monkeyvga have byte values for the object name offset, too 
svn-id: r8571
 2003-06-20 11:14:18 +00:00
Max Horn
f301d1fa47 fixed Zak256 (and possibly other V3 games); Not quite sure if the behaviour is correct for V4 games, that needs testing 
svn-id: r8568
 2003-06-20 10:53:06 +00:00
Max Horn
a3feb46080 instead of casting to byte, rather allow offsets > 255 
svn-id: r8564
 2003-06-19 18:08:39 +00:00
Jamieson Christian
9e51924166 Fixed MSVC warnings 
svn-id: r8544
 2003-06-18 22:35:03 +00:00
Torbjörn Andersson
4abfb1f73c Bypass the Maniac Mansion copy protection by making the security door stay 
open at all times, like some original versions did. This still leaves the
player the option of blowing the mansion up by entering the wrong code.

I still don't know if it has any unforseen side-effects.

svn-id: r8517
 2003-06-16 14:45:23 +00:00
Max Horn
f7a8cbf7c7 Patch #754151: Removed READ_*_UNALIGNED and always read stuff bytewise; augmented by some more changes of mine 
svn-id: r8482
 2003-06-14 18:52: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
Torbjörn Andersson
54453b64bf Format string/argument mismatch fix. 
svn-id: r8464
 2003-06-14 08:58:56 +00:00