Commit Graph

147 Commits

Author SHA1 Message Date
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
Max Horn
86df3537b9 replaced GF_AFTER with _version
svn-id: r8372
2003-06-07 00:13:26 +00:00
Jonathan Gray
620762b466 v1 object drawing updates from aquadran
svn-id: r8346
2003-06-06 07:35:19 +00:00
Paweł Kołodziejski
00288b07f8 fixed almost object drawing for v1 games, (ugly hack for drawBitmap)
svn-id: r8345
2003-06-06 05:27:45 +00:00
Torbjörn Andersson
7cfe07fdd3 Reverted the recent o5_getClosestObjActor() change and fixed it by
measuring the distance in characters for V2 games instead. Now Edna won't
bring the same strange kid into the cell over and over again.

If necessary, we can still fix o5_getClosestActor() to handle larger
distances. It just takes a few more changes than I first thought.

svn-id: r8243
2003-06-01 16:40:15 +00:00
Max Horn
9cbcde684b cleanup / added comments / code unification
svn-id: r8235
2003-06-01 13:09:30 +00:00
Max Horn
5202a59c63 some setObjectName changes. I'd really like to switch V2-V5 to use rtObjectName resources, too
svn-id: r8171
2003-05-31 12:17:58 +00:00
Max Horn
d5d0440e8c cleanup
svn-id: r8169
2003-05-31 11:57:18 +00:00
Max Horn
eb039ec554 some cheap doxygen docs; cleanup
svn-id: r8154
2003-05-30 20:13:29 +00:00
Max Horn
c6b35e15a0 moved bomp stuff into own files; removed some of our 6 (!) bomp decoders
svn-id: r8151
2003-05-30 19:00:33 +00:00
Max Horn
3d28cfaf82 cleanup
svn-id: r8145
2003-05-30 15:06:29 +00:00
Max Horn
5557ec719e work around nexus crash (only in old savegames?)
svn-id: r8123
2003-05-30 00:40:58 +00:00
Max Horn
1f70da0155 const as const can!
svn-id: r8058
2003-05-28 20:01:47 +00:00
Max Horn
c5dbd8355f cleanup
svn-id: r8007
2003-05-26 14:44:03 +00:00
Max Horn
ac3f871910 some more debug output
svn-id: r7888
2003-05-24 16:02:07 +00:00
Max Horn
c333b6d6ec replaced many unsafe uses of derefActorSafe by derefActor; replaced derefActorSafe/assert pairs by derefActor (gives better error message); replaced various derefActorSafe/if(a!=0) pairs by derefActor (in cases where the deref should never fail, ever, except due to a bug in ScummVM)
svn-id: r7859
2003-05-23 13:24:41 +00:00
Max Horn
10fad2635a not needed anymore since we read the preposition flag directly from the obcd data again
svn-id: r7830
2003-05-22 15:30:27 +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
86d57f3c7a many pedantic warning fixes (and some actual potential buglets fixed, too)
svn-id: r7795
2003-05-21 18:09:49 +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
ffadd452a9 got rid of the evil locked-box hack in adjustXYToBeInBox; instead check for locked boxes in walkActorOld, which seems to work just as well (and hopefully better)
svn-id: r7750
2003-05-20 19:35:40 +00:00
Max Horn
3e3d6f1360 renamed o2_matrixOps -> o2_setBoxFlags; V2 'objY' fixes; cleanup
svn-id: r7739
2003-05-20 16:13:34 +00:00
Max Horn
a2ce5b6383 don't touch untouchable objects in V2 games
svn-id: r7664
2003-05-19 01:27:30 +00:00