ScummVM/scummvm
1
0 Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
86,814 Commits 45 Branches 139 Tags
578a6794de9ba7679966fee9aec02c6b2bdbce94
Commit Graph
86814 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Kari Salminen ef3b72d5e4 Converted zoneData and zoneQuery tables from plain array types to Common::Array. Should help catch out of bounds access errors that may cause memory corruption. 
svn-id: r33727
 2008-08-09 22:38:03 +00:00
Kari Salminen 983a4f21e5 Converted animDataTable from a plain array to a Common::Array. Should help to catch out of bounds access errors which may cause memory corruption. 
svn-id: r33726
 2008-08-09 20:55:01 +00:00
Kari Salminen 0911982954 Converted objectTable from a plain array to a Common::Array. Should help to catch out of bounds access errors that may cause memory corruption. 
svn-id: r33725
 2008-08-09 20:50:10 +00:00
Andre Heider c60565e108 Updated the Makefile to the new build system. 
Introduced a Makefile variable to build a gamecube version.

svn-id: r33723
 2008-08-09 20:02:56 +00:00
Kari Salminen 3e5e5f5342 Made type 21 & 22 overlays not be flipped (The oxygen gauge looks actually better when it reaches zero this way although in its fully charged state it still does look a bit off. Disassembly seems to agree with not flipping the overlays so I'm going with this one for now). 
svn-id: r33722
 2008-08-09 19:57:46 +00:00
Kari Salminen 0f07592184 Made drawPlainBox's effective width and height always at least one. 
- Makes oxygen gauge during first arcade sequence visible as it gave drawPlainBox a height of zero.
Made type 21 overlays be drawn as type 22 (Filled rectangle).
- For an example the oxygen gauge during the first arcade sequence is a type 21 overlay.
Flipped type 21 & 22 overlays as it looks correct for the oxygen gauge.
These features are quite WIP, they need testing to see if they're correct.

svn-id: r33721
 2008-08-09 19:47:05 +00:00
Christopher Page ce3d1e1a7d Merged revisions 33632-33633,33635,33637,33639-33640,33642-33645,33648,33654-33655,33664,33667-33670,33673-33674,33678,33682,33686-33691,33693,33696,33698,33700,33703,33708,33710,33712-33714,33716 via svnmerge from 
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33720
 2008-08-09 19:03:29 +00:00
Andre Heider f098b2817f Updates to the recent OSystem API changes 
svn-id: r33719
 2008-08-09 18:37:18 +00:00
Vicent Marti 103a4f6681 Added support for image loading/blitting. 
Added support for loading theme files.
(Make sure to grab the sample theme "scummodern.zip" from the gui/themes/ directory to try it out)
Misc fixes.

svn-id: r33718
 2008-08-09 18:34:16 +00:00
Kostas Nakos 71f4a15e4e hotfix around drascula mem leak problems. see also bug report 
svn-id: r33716
 2008-08-09 18:12:43 +00:00
Kostas Nakos 355f100793 fix MR on ce: allocate large buffer on the heap instead and of the stack, and improve the workaround 
svn-id: r33714
 2008-08-09 18:09:24 +00:00
Kari Salminen e02f94d392 Added preliminary version of drawing type 22 overlays (Such overlays are added with opcode 0xA4 (o2_loadMask22) and removed with opcode 0xA5 (o2_unloadMask22)). Things might be wrong so needs testing! WIP! 
svn-id: r33713
 2008-08-09 16:07:08 +00:00
Kari Salminen 80648431d9 Added updating of global variable var5 to Operation Stealth's renderOverlay function's type 20 overlay case (Previously var5 wasn't updated anywhere!). Also added a lower bound for var5's value into a comparison (Previously only the upper bound was tested for). 
svn-id: r33712
 2008-08-09 15:17:32 +00:00
Vicent Marti ea69217a13 Fixed 1.000.000 Valgrind warnings. 
svn-id: r33711
 2008-08-09 14:15:34 +00:00
Kari Salminen 36e6bb27b5 Removing moving with keys qweasdzxc for now because they messed with savegame name typing. One can move with the cursor keys anyway. 
svn-id: r33710
 2008-08-09 10:52:48 +00:00
Kari Salminen 8e33f1530c Small cleanup: Renamed rol to rolByte and made it handle all cases. 
svn-id: r33708
 2008-08-09 10:44:12 +00:00
Vicent Marti 01b8373d95 Fixed: About dialog in all resolutions. 
svn-id: r33707
 2008-08-08 21:52:16 +00:00
Vicent Marti f546aa9dc8 BUGFIX: XMLParser issuing key-close callbacks on ignored keys. 
svn-id: r33706
 2008-08-08 18:48:12 +00:00
Vicent Marti dab1fa0942 Resolution-dependence in XML files. 
G1X scaler GUI now loads. Added layout for the launcher menu.
MILESTONE: All core GUI dialogs/widgets working on G2x/G3x
MILESTONE: Completely removed old Evaluator/Parser.
Improved layout expanding again.
Improved XML parser.
Several bugfixes.

svn-id: r33704
 2008-08-08 18:30:16 +00:00
Kari Salminen c0701bfcb6 Added detection entry for the Sony published CD version of Future Wars. 
Also added decrypting of the crypted AUTO00.PRC for this particular version.
Now this version should work but no CD audio support for it yet though.

svn-id: r33703
 2008-08-08 18:28:13 +00:00
Vicent Marti 3ca6f76f7b Browser dialog. 
Improved layout expansion in the layout parser.
Fixed serious coordinates initialization bug.

svn-id: r33702
 2008-08-08 15:06:28 +00:00
Kari Salminen 70760a77fd Partially fix Adlib volume setting in Cine (Now uses music volume for Adlib volume, previously always played with full volume. Doesn't differentiate between playing sound effects and music!). 
svn-id: r33700
 2008-08-08 14:46:19 +00:00
Stephen Kennedy 4eacc09024 Keymapper WIP: 
* Got rid of default keymaps as they over-complicated the API
* Remapping dialog WIP

svn-id: r33699
 2008-08-08 14:23:59 +00:00
Kari Salminen 5cb08bd1e5 Added basic moving using keyboard (Only works in Operation Stealth at the moment): 
- Should make it possible to complete the first arcade sequence legitimately
Renamed input variables (Their names were mixed up between Future Wars and Operation Stealth):
- Future Wars's inputVar1 -> egoMovedWithKeyboard
- Future Wars's inputVar2 -> xMoveKeyb
- Future Wars's inputVar3 -> yMoveKeyb
- Operation Stealth's inputVar0 -> xMoveKeyb
- Operation Stealth's inputVar1 -> yMoveKeyb

svn-id: r33698
 2008-08-08 13:30:01 +00:00
Vicent Marti 1ea3301a8a SCUMM save/load dialog. 
Expanded documentation.
Added support for sub-blitting in the vector renderer.

svn-id: r33697
 2008-08-08 10:37:58 +00:00
Travis Howell f68d52ce4d Remove debug leftover. 
svn-id: r33696
 2008-08-08 02:49:51 +00:00
Travis Howell fd65ea311a Hopefully allow quiting at any stage AGOS engines games again. 
svn-id: r33693
 2008-08-08 02:18:17 +00:00
Vicent Marti 39c28e434b SCUMM general and options dialog. 
Misc fixes.

svn-id: r33692
 2008-08-07 23:23:21 +00:00
Gregory Montoir 52650efb6a fix for bug #2040484: TOUCHE: Graphic glitch with long answer options 
svn-id: r33691
 2008-08-07 21:50:12 +00:00
Gregory Montoir 303333352a fix for bug #2040311: TOUCHE: Missing characters in the spanish version 
svn-id: r33690
 2008-08-07 21:49:55 +00:00
Kari Salminen 092d7224b9 Implemented game speed changing by pressing - or + to e.g. ease testing. 
svn-id: r33689
 2008-08-07 21:46:56 +00:00
Kari Salminen da84a54694 Added precautionary tests to background scrolling function in Operation Stealth to avoid possible memory corruptions. 
svn-id: r33688
 2008-08-07 19:46:06 +00:00
Kari Salminen 853f4dbbe0 Made drawPlainBox handle border cases so it won't corrupt memory so easily. This may help with some memory corruption issues when for an example trying to draw the player's command string out of screen. 
svn-id: r33687
 2008-08-07 19:31:12 +00:00
Kari Salminen b8bfd5d04f Fix for popup boxes sometimes blocking animation when they shouldn't in Operation Stealth: 
- Made waitForPlayerClick updating more like in the original.
- Moved removeMessages to after the frame drawing in main loop hoping to be more like the original.
- Added an additional test to Operation Stealth's implementation of overlay type 2 drawing.
- Added an additional parameter incrementing and testing to Operation Stealth's removeMessages.
Hopefully this won't cause any regressions in Future Wars!

svn-id: r33686
 2008-08-07 19:04:19 +00:00
Vicent Marti 8d98d5fa13 Bugfix: MSVC complaining about the length of the embeded theme string. 
svn-id: r33685
 2008-08-07 19:03:00 +00:00
Vicent Marti 7c132d340a Misc text drawing improvements. 
Added carets/text edit widgets.

svn-id: r33684
 2008-08-07 18:42:47 +00:00
Kostas Nakos a30ecc96a0 setup interface for later kyra games 
svn-id: r33682
 2008-08-07 18:36:12 +00:00
Stephen Kennedy 2645ca48ad * Moved VK code into backends/vkeybd 
* Moved Keymapper code into backends/keymapper

svn-id: r33681
 2008-08-07 16:38:39 +00:00
Stephen Kennedy 66e4e3ec1a * Removed Shape base class 
* Reverted Rect to not derive from Shape
* ImageMap now just uses Polygon's

svn-id: r33680
 2008-08-07 15:44:48 +00:00
Stephen Kennedy d6ffc14a7e Keymapper cleanup: 
*Removed need to call initGame / cleanupGame on Keymapper

svn-id: r33679
 2008-08-07 14:16:48 +00:00
Torbjörn Andersson 99ade3d25c Initialise the _sound object. Otherwise, ScummVM crashes for me if I use a native 
MIDI driver instead of Adlib.

svn-id: r33678
 2008-08-07 13:36:02 +00:00
Stephen Kennedy 69d7c1d2ca * Some Valgrind fixes 
* Got rid of svn:mergeinfo properties

svn-id: r33677
 2008-08-07 13:19:00 +00:00
Vicent Marti 21989844a9 Game Options menu parsing. 
Added support for importing layouts inside other layouts.
Misc bugfixes.

svn-id: r33676
 2008-08-07 10:53:33 +00:00
Kostas Nakos 1a99bce201 smartphone-specific code not needed anymore 
svn-id: r33674
 2008-08-07 09:10:42 +00:00
Kari Salminen 92eec1b905 HACK: In Operation Stealth after the first arcade sequence jump player's position to avoid getting stuck. 
The player's position is changed only by *one* pixel but it helps
and makes it possible to carry on with the game (Previously the player was totally stuck).

svn-id: r33673
 2008-08-06 23:12:25 +00:00
Christopher Page f41471d34b Engine::runDialog() returns a value now 
svn-id: r33672
 2008-08-06 21:47:20 +00:00
Christopher Page 78159c34a1 Added RTL feature to Tinsel 
svn-id: r33671
 2008-08-06 21:44:43 +00:00
Kari Salminen f5e9a3e185 Tiny comment update to loadCt-opcodes: Load collision table data. 
svn-id: r33670
 2008-08-06 20:58:02 +00:00
Kari Salminen a10753e2a1 Renamed page3Raw to collisionPage so it's more apparent what it does. 
svn-id: r33669
 2008-08-06 20:54:38 +00:00
Kari Salminen 66fc0d6a25 Add 320x200 screen bounds checking to Operation Stealth's checkCollision function. 
Fixes teleporting bug when getting out of the water after first arcade sequence.
The player previously got teleported to the beach near the hotel. Now it doesn't happen.
The player is still caught motionless and can't move after this fix though...

svn-id: r33668
 2008-08-06 20:47:59 +00:00