libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-07 02:12:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
11,702 Commits 5 Branches 5 Tags 1.8 GiB
2653a45fd3
Commit Graph

314 Commits

Author SHA1 Message Date
Max Horn
78ef0ea5b5 fix actor redraw problems in COMI (and possibly other AKOS games); might cause regressions, though. See also patch #699980 
svn-id: r8064
 2003-05-28 21:43:34 +00:00
Max Horn
1f70da0155 const as const can! 
svn-id: r8058
 2003-05-28 20:01:47 +00:00
Max Horn
2f9ff35bad moved Actor SaveLoadEntry definition to actor.cpp; made findPathTowards/findPathTowardsOld members of Actor; cleanup 
svn-id: r7988
 2003-05-26 02:26:13 +00:00
Max Horn
4cda099c57 don't use _gameDataPath directly; minor cleanup 
svn-id: r7907
 2003-05-24 22:13:01 +00:00
Jamieson Christian
4c531d373b Fixed VC++ warning 
svn-id: r7861
 2003-05-23 13:45:45 +00:00
Max Horn
28eade1da4 when iterating from 1 to _numActors over all actors, use _actors[] directly instead of derefActor() (unnecessary overhead); added range check to derefActor, and error out if invalid actor is accessed 
svn-id: r7858
 2003-05-23 12:48:50 +00:00
Max Horn
a5be83b352 fixed meteor animation in MM (and probably others in MM and Zak) 
svn-id: r7822
 2003-05-22 10:40:49 +00:00
Max Horn
c78664cbc9 renamed talkFrame1/talkFrame2 to talkStartFrame/talkStopFrame 
svn-id: r7819
 2003-05-22 09:58:33 +00:00
Max Horn
061228688e fix V2 actor initial mouth's (they were missing) 
svn-id: r7818
 2003-05-22 09:52:21 +00:00
Max Horn
f43fb0dab8 freeze scripts & hide mouse during cutscenes; addde Actor::isPlayer method that should work in V2, too; fixed o2_walkActorToObject 
svn-id: r7815
 2003-05-22 00:51:42 +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
34eee8b33b cleanup 
svn-id: r7756
 2003-05-20 23:05:34 +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
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
1f859e592f this is 100% equivalent to the old walkActorOld() code - I just made an equivalence transformation (anybody who doesn't believe that, I can show you step by step how to transform the code :-) 
svn-id: r7749
 2003-05-20 17:50:43 +00:00
Max Horn
684cd9c431 fixed warning output 
svn-id: r7735
 2003-05-20 15:13:18 +00:00
Max Horn
46abb7998f merged common code 
svn-id: r7720
 2003-05-20 12:25:47 +00:00
Max Horn
1f8d481acb fix for various regressions (not quite sure if the check for V2/v3 is right, but seems to work so far) 
svn-id: r7648
 2003-05-18 23:14:21 +00:00
Max Horn
8f7f22aeae implemented proper 'invalid walkbox' handling in older games (in newer games, box 0 is used as invalid box, while in older games this is a legal box and box 255 is the 'invalid' box); removed lots of FIXME's which were needed to cope with ScummVM not implementing the invalid walkbox stuff properly in the past; removed other actor FIXMEs. 
svn-id: r7642
 2003-05-18 19:44:22 +00:00
Max Horn
33abb1f04a V2 actor heads fixed (to their shoulders, ha-ha... errm ... I thought it was funny when I wrote it 8-) 
svn-id: r7611
 2003-05-17 18:07:07 +00:00
Max Horn
58ab6d5039 proper walk animation in Zak (at the expense of Zak's head, for now ;-) 
svn-id: r7589
 2003-05-17 00:33:29 +00:00
Max Horn
30d31f6d03 print some useful info, too 
svn-id: r7569
 2003-05-16 10:00:03 +00:00
Travis Howell
61fdee0b42 Typo 
svn-id: r7568
 2003-05-16 09:51:59 +00:00
Travis Howell
f69df41c71 Add comment to fixme 
svn-id: r7567
 2003-05-16 09:47:52 +00:00
Max Horn
8b419944ee ScummPoint -> ScummVM::Point 
svn-id: r7543
 2003-05-15 21:57:38 +00:00
Max Horn
bc99915aa5 V2 text drawing 
svn-id: r7502
 2003-05-14 13:30:52 +00:00
Max Horn
afe038d6dd Patch #737497 / Bug #737387 
svn-id: r7495
 2003-05-14 09:49:44 +00:00
Max Horn
08f7ec192e NUM_ACTORS -> _numActors (for consistency) 
svn-id: r7489
 2003-05-13 23:42:41 +00:00
Max Horn
796fa74806 cleanup 
svn-id: r7487
 2003-05-13 23:03:18 +00:00
Max Horn
f4be51cd68 modified akos / 'old' costume (charset) masking code to a) match each other; also, the costume.cpp code looks again checks _zbuf != 0 even for non-SMALL_HEADER games, as it used to 1 year ago ;-) (note: this change is kinda experimental; might fix some bugs, might introduce some regressions) 
svn-id: r7473
 2003-05-12 17:50:09 +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
Max Horn
86e28c807e oops that was an accidental change 
svn-id: r7390
 2003-05-08 10:48:29 +00:00
Jonathan Gray
1ba420a9e2 remove uneeded fixme 
svn-id: r7362
 2003-05-06 01:03:33 +00:00
Max Horn
15ba8da46b renamed XYFactor/YXFactor to XYFactor, YXFactor/deltaYFactor (they denote how much to move each step in the x/y direction); added several FIXME comments (after 0.4.0 we really shold revise this code) 
svn-id: r7344
 2003-05-05 12:09:22 +00:00
Max Horn
9466a5dcef Patch #730800: EGA LOOM: Hack to fix palette problem (also helps MonkeyEGA) 
svn-id: r7290
 2003-05-03 20:49:53 +00:00
Max Horn
fb4a6095a6 Patch #731760: LOOM: "Bobbin walks backwards" hack 
svn-id: r7285
 2003-05-03 16:20:18 +00:00
Max Horn
0b7c86ff13 cleanup; small fix for GF_OLD256 games; also the head hack for indy3 is not needed anymore 
svn-id: r7075
 2003-04-22 18:57:10 +00:00
James Brown
fe0fc72e57 Pedantic stats-boosting typo fix :) 
svn-id: r7039
 2003-04-20 17:11:13 +00:00
Paweł Kołodziejski
dc64134a74 fixed actor palette for nonblocked games 
svn-id: r7014
 2003-04-16 07:11:04 +00:00
Paweł Kołodziejski
7189347adb changed range from GF_OLD256 to GF_AFTER_V3 
svn-id: r6940
 2003-04-08 19:05:41 +00:00
Max Horn
af2e2fff7a cleanup 
svn-id: r6877
 2003-03-28 23:08:36 +00:00
Max Horn
c98130a0a6 cleanup 
svn-id: r6855
 2003-03-24 21:56:29 +00:00
Max Horn
d24df8ff7a fix actor gliding caused by my walk_script hack 
svn-id: r6773
 2003-03-08 14:12:58 +00:00
Max Horn
38371389ea enabled walk scripts 
svn-id: r6772
 2003-03-08 13:29:41 +00:00
Max Horn
e4a8edfc67 cleanup (should cause no behavior change) 
svn-id: r6766
 2003-03-08 04:11:02 +00:00
Max Horn
5944944f78 properly init Actor objects instead of one big evil hackish memset... 
svn-id: r6733
 2003-03-07 02:43:21 +00:00
Paweł Kołodziejski
aa3766018f updated copyrights headers 
svn-id: r6726
 2003-03-06 21:46:56 +00:00
Paweł Kołodziejski
093428ae9a and more cleanup 
svn-id: r6718
 2003-03-06 17:58:13 +00:00
Max Horn
f6bac973f8 patch #696030: CMI: More actor direction fixes 
svn-id: r6662
 2003-03-02 15:51:56 +00:00
Jonathan Gray
af19cac738 patch #689164 comi verb coin hack by erik, fixes the verb coin drawing behind the inventory 
svn-id: r6642
 2003-02-27 10:17:29 +00:00
Jonathan Gray
516f970e64 not sure if all of these AFTER_V7 for NEW_COSTUMES changes are needed but it won't hurt in any event 
svn-id: r6617
 2003-02-17 21:40:13 +00:00
James Brown
8d9b84b98e Patch 671701: SO_TALK_FREQUENCY 
svn-id: r6547
 2003-01-26 10:54:34 +00:00
Max Horn
2eff7e2242 fix off by one bug in gfxUsageBits code; fixed small glitch the actor iteration cleanup 
svn-id: r6485
 2003-01-16 18:07:52 +00:00
James Brown
4e07c1bb91 Patch 668634: Actor iteration fix 
svn-id: r6484
 2003-01-16 17:37:34 +00:00
James Brown
5bf741f960 Patch 667613: Extend gfxUsageBits[] 
svn-id: r6453
 2003-01-14 10:06:56 +00:00
Max Horn
020a1c3e2d fixed COMI actor scaling, again 
svn-id: r6443
 2003-01-13 14:04:41 +00:00
Max Horn
eb9726c497 added V8 scaling code 
svn-id: r6440
 2003-01-13 01:29:45 +00:00
Max Horn
2d97c1f40c fixed regression caused by changes to akos code 
svn-id: r6353
 2003-01-07 20:21:39 +00:00
Max Horn
eaf2e1a313 more akos/costume merging 
svn-id: r6352
 2003-01-07 17:35:20 +00:00
Max Horn
9270a0558b some chore/limb related code 
svn-id: r6348
 2003-01-06 16:04:01 +00:00
Max Horn
37a64f5d12 cleanup; added a hack to avoid crash in the canon scene (at least it works this way for me) 
svn-id: r6347
 2003-01-06 13:41:29 +00:00
Max Horn
f1d1076fd7 oops 
svn-id: r6346
 2003-01-06 02:18:27 +00:00
Max Horn
c80f082490 fix talking in The Dig 
svn-id: r6345
 2003-01-06 02:10:45 +00:00
Max Horn
d9515432e4 started unifying code in akos.cpp and costume.cpp 
svn-id: r6343
 2003-01-05 23:53:16 +00:00
Max Horn
a0d4234e89 fix redraw bug in the Dig (when Cmdr Low stands in front of the sparks in the nexus); changed startAnimActor slightly (not fully sure if this is now right or if the previous code was right <sigh> 
svn-id: r6342
 2003-01-05 22:38:44 +00:00
Max Horn
535ad0a4cf moved Scumm::faceActorToObj to Actor::faceToObject; moved various functions in script.cpp (grouping cutscene/override related stuff) 
svn-id: r6317
 2003-01-01 18:22:41 +00:00
Max Horn
8bbbf4cbaf cleanup; fixed z masking in COMI 
svn-id: r6294
 2002-12-31 16:44:55 +00:00
Max Horn
319facc9c3 cleanup 
svn-id: r6214
 2002-12-28 00:45:44 +00:00
Max Horn
48c66ba210 fixed save/load; more restructuring of the charset rendering code 
svn-id: r6154
 2002-12-26 00:21:19 +00:00
Max Horn
fca9ec09e7 moved CharsetRendere into its own header/source file; changed Scumm::_charset into a pointer, to make it possible to use different implementations of it 
svn-id: r6147
 2002-12-25 21:04:47 +00:00
Max Horn
fef84f3737 renamed Scumm::charset -> Scumm::_charset 
svn-id: r6119
 2002-12-25 12:01:04 +00:00
Max Horn
7cb69f7fa2 allow array dynamically to make VC happy 
svn-id: r6107
 2002-12-25 00:31:39 +00:00
Max Horn
6585425c89 set NUM_ACTORS to 80 for COMI; get rid of MAX_ACTORS (use NUM_ACTORS instead); some updates 
svn-id: r6086
 2002-12-23 23:30:14 +00:00
Max Horn
654ed3ff6c more V8 work 
svn-id: r6074
 2002-12-23 18:30:12 +00:00
Max Horn
f86eaeaff9 more V8 mods; cleanup 
svn-id: r6070
 2002-12-23 15:46:53 +00:00
Max Horn
cc5872924e renamed new_1, new_2, new_3 in class Actor 
svn-id: r6069
 2002-12-23 14:16:43 +00:00
Max Horn
e9cb26cacf fix for bug #655652 
svn-id: r6023
 2002-12-18 23:45:52 +00:00
Max Horn
6f857ba257 disable actor dir intepolation for V7 games - it interfers with walk scripts; ensure the 'frame' variable is set; cleanup 
svn-id: r5982
 2002-12-15 21:54:47 +00:00
James Brown
f02f65e739 649358: DOTT Animation Fix 
svn-id: r5855
 2002-12-06 08:14:22 +00:00
Max Horn
cb2b5ab3b7 fix for bug #643001, may cause regression 
svn-id: r5829
 2002-12-04 13:32:55 +00:00
James Brown
ea46bdabce Apply patch 642171. Fixes some Loom and FOA bugs. Regression testing doesn't reveil any hangs 
introduced, but watch out for minor actor movement regressions.

svn-id: r5689
 2002-11-22 08:14:33 +00:00
James Brown
69c8ddd67c Revert patch 638253, causes Dig regressions 
svn-id: r5594
 2002-11-18 00:35:21 +00:00
James Brown
22c3532f25 Patch 638253: Actor jumping fix for V7 games. Basic regression testing preformed for The Dig. 
svn-id: r5558
 2002-11-15 10:42:25 +00:00
Jonathan Gray
ed4e076b20 append missing heads hack so actor in indy3 intro is always visible 
svn-id: r5516
 2002-11-11 04:52:16 +00:00
Paweł Kołodziejski
2a58faff8f revert costume palette table to 32 and fix actor.cpp compilation 
svn-id: r5507
 2002-11-10 17:35:02 +00:00
Paweł Kołodziejski
2965bd2708 increasing actor palette to 256 
svn-id: r5505
 2002-11-10 17:17:11 +00:00
James Brown
ade86f45df Hack to prevent decapitation :) 
svn-id: r5485
 2002-11-10 12:59:36 +00:00
James Brown
cc14b87f25 Patch 635873: Loom Masking Hack - update 
svn-id: r5473
 2002-11-09 10:05:43 +00:00
Paweł Kołodziejski
a125d1cc1a changed number strips to dynamic and increased arrays tdirty and bdirty to 80 
svn-id: r5296
 2002-10-24 06:28:54 +00:00
James Brown
f46346c2aa Patch 627294: Fix loom mask regression by making the last change a fixme hack instead of a generic case 
svn-id: r5278
 2002-10-23 08:40:57 +00:00
Max Horn
df2bf812c3 Actor::frame is never set, this should be researched 
svn-id: r5269
 2002-10-23 00:22:55 +00:00
Max Horn
9f33d561a9 akos cleanup, first stage 
svn-id: r5238
 2002-10-22 11:47:45 +00:00
James Brown
13808c2a3b Fix an infinite talking loop in The Dig. Again. :) 
svn-id: r5202
 2002-10-20 16:49:30 +00:00
James Brown
c7ef00571b Patch 625905: Masking regression fix 
svn-id: r5198
 2002-10-20 13:16:12 +00:00
James Brown
80ce915f3d Fix Wait:forActorDraw and the 'infinite mouth movement' problem in The Dig. 
Code assumed that the actor always starts talking in the same room it finishes talking in - this doesn't apply for several cutscene
sequences in The Dig. Also added the usual talkChannel fallback code in for The Dig.

svn-id: r5186
 2002-10-18 11:45:57 +00:00
James Brown
25e46a4434 Patch 624477: Fix for bug 609716 
svn-id: r5171
 2002-10-17 09:21:55 +00:00
Jonathan Gray
baabfdeba6 add hack to allow scummvm to get up to the credits in the dig 
svn-id: r5159
 2002-10-16 02:42:43 +00:00
James Brown
a16276a796 Add a scaling hack for The Dig - we really need to fix the scaling tables for these scrolling rooms =properly=. 
svn-id: r5143
 2002-10-14 05:57:01 +00:00
James Brown
43bb5deec9 Patch 622632: FT fuel-tower scale hack improvement 
svn-id: r5141
 2002-10-13 15:51:06 +00:00
James Brown
aeaad5169e Patch 617937 / Bug 617939 + modifications: Fix FT text masking 
svn-id: r5081
 2002-10-03 07:38:03 +00:00
James Brown
39a5160985 Very very nasty hack to get the FT fuel-tower scene working correctly. 
Someone -please- fix this properly :)

svn-id: r5071
 2002-10-02 09:14:59 +00:00
James Brown
7c6864efe8 Patch 613597: Sam and Max object ordering fixme thingzie. 
svn-id: r5013
 2002-09-24 15:23:57 +00:00
Matt Hargett
8390b0cc53 2002-09-21 Matt Hargett <matt@use.net> 
* scumm.dsp, scummvm.dsp, simon.dsp: Turn on warning as errors. Generate
    PDBs on all builds.

  * gameDetector.cpp, newgui.cpp, widget.cpp, actor.cpp,
    dialogs.cpp, resource.cpp, saveload.cpp, scumm_renderer.cpp:
    Fix warnings where possible. One pragma added to eliminate
    warning of unknown pragmas.

  * string.cpp: If unknown escape sequence, print warning.

svn-id: r4998
 2002-09-22 03:53:53 +00:00
Max Horn
a681eb029e renamec string -> _string and sentence -> _sentence in class Scumm (I originally reworked StringTab, but then noticed the save game format depends on it <sigh>) 
svn-id: r4995
 2002-09-22 01:17:53 +00:00
Max Horn
24533e6e2d partial fix for bug #605970 
svn-id: r4984
 2002-09-21 00:23:45 +00:00
Max Horn
e80d5a866b patch #611449: Workaround for bug #604398 
svn-id: r4969
 2002-09-19 10:42:10 +00:00
James Brown
978e879009 Fix newgui crash, and commit patch 600645: Loom flashlight fix 
svn-id: r4958
 2002-09-17 12:52:53 +00:00
Max Horn
a6c5762817 added some comments, cleanup 
svn-id: r4950
 2002-09-16 10:42:12 +00:00
Max Horn
14b16daf30 this was broken recently 
svn-id: r4929
 2002-09-13 12:28:53 +00:00
Paweł Kołodziejski
daa997fab2 fixes to resolutions 
svn-id: r4893
 2002-09-01 15:01:40 +00:00
Max Horn
41c2d6fba3 sound system cleanup 
svn-id: r4867
 2002-08-29 23:45:15 +00:00
Max Horn
a1d1341331 fix for some Loom oddities, might break other stuff -> in that case please tell me so that I can find a correct solution 
svn-id: r4810
 2002-08-23 22:46:09 +00:00
Max Horn
ce46866403 Initial revision 
svn-id: r4785
 2002-08-21 16:07:07 +00:00