Commit Graph

135 Commits

Author SHA1 Message Date
Max Horn
13a13ae10a cleanup
svn-id: r17873
2005-04-30 15:04:16 +00:00
Max Horn
ec43585537 Added new handleMouseOver to allow further refactoring of the V2 specific verb code; added a TODO comment regarding the blast code
svn-id: r17848
2005-04-28 01:04:42 +00:00
Max Horn
b56b84b145 Use kVerbVirtScreen were appropriate; removed unused param from initVirtScreen
svn-id: r17828
2005-04-26 15:52:55 +00:00
Max Horn
3cc0d1b142 Removed dead code
svn-id: r17809
2005-04-26 09:21:54 +00:00
Max Horn
7b93b0e079 Moved v2 verb code into class ScummEngine_v2
svn-id: r17725
2005-04-20 23:53:29 +00:00
Max Horn
7963bb4cb9 Renamed _mouseButStat -> _mouseAndKeyboardStat (that's what it really is); moved _audioNames to class IMuseDigital
svn-id: r17723
2005-04-20 23:33:35 +00:00
Max Horn
c46ea8bc40 Replaced the platform specific GF_FOO switches (using _platform instead now)
svn-id: r17716
2005-04-20 18:21:30 +00:00
Travis Howell
ee62127ace Add mouse state VAR for HE 72+ games.
svn-id: r17631
2005-04-16 14:59:15 +00:00
Torbjörn Andersson
75f6aa850b Fixed Indy 3 fighting in the "Passport to Adventure" demo. Apparently it
expects the same keyboard mapping as FOA does.

svn-id: r17578
2005-04-13 06:30:41 +00:00
Max Horn
3d5b5f2ad8 Moved createResource, resourceStats, expireResources to ResourceManager
svn-id: r17420
2005-04-06 17:31:35 +00:00
Eugene Sandulenko
9c68b29a05 Normalize verb/invenotry areas in MM NES. Patch from Quietust
svn-id: r17316
2005-04-01 01:41:20 +00:00
Max Horn
ac247c9b94 Started to move some resource related code into a new class ResourceManager (hypothetic goal for the future: use ResourceManager in ScummEx)
svn-id: r17311
2005-03-31 21:39:31 +00:00
Max Horn
c5a77afb01 Cleaned up the object mode code; removed the friend class ScummEngine from class Gdi; moved dither code to ScummEngine
svn-id: r17277
2005-03-28 20:18:36 +00:00
Max Horn
7ed1c19f6c Cleanup: collect the C64 specific render data into a struct inside class Gdi
svn-id: r17224
2005-03-25 00:56:03 +00:00
Eugene Sandulenko
33952c09cb Correct positioning of inventory and verbs in MM NES.
Started to tackle inventory.

svn-id: r17219
2005-03-24 21:34:35 +00:00
Eugene Sandulenko
df0869f51d Patch from Quietust for MM NES
o objects now update tile colors and mask data
  o mask data is drawn from the correct offset
  o verbs are drawn in the correct color

svn-id: r17199
2005-03-22 21:07:00 +00:00
Travis Howell
097a3a0aac Cleanup
svn-id: r17192
2005-03-22 00:46:48 +00:00
Eugene Sandulenko
0bcb0ac257 Many MM NES fixes/improvements from Quietust:
o Doesn't crash when going upstairs. Now game is playable up to
    the green tentacle
  o Proper subtitles colors
  o Room mask is decoded but doesn't affect sprites yet
  o Inventory draw issues fixed
  o Fix actors position when they're facing right

svn-id: r17191
2005-03-21 23:51:48 +00:00
Travis Howell
a9aed6ec52 Last line of verbs work in NES maniac now.
svn-id: r17166
2005-03-16 04:23:52 +00:00
Eugene Sandulenko
a827bb1c05 Patch from Quietust. Proper drawing of objects and fixes to inventory.
svn-id: r17162
2005-03-16 02:14:35 +00:00
Max Horn
47280d9433 Updated copyright
svn-id: r16398
2005-01-01 16:09:25 +00:00
Max Horn
fb32e12095 Fix for bug #1052660 (FOA: No keyboard shortcuts for dialogs) - moved hack enabling keyboard fights to allow controlling conversations via number keys again
svn-id: r15853
2004-11-21 14:48:17 +00:00
Max Horn
e29133df12 Whitespace
svn-id: r15362
2004-09-30 22:39:13 +00:00
Max Horn
cc7ca9ce4b some more pointless cleanup / moving around of stuff :-)
svn-id: r15284
2004-09-26 07:30:29 +00:00
Max Horn
5d655be798 gdi.drawBitmap already performs clipping, no need to do it here
svn-id: r15256
2004-09-24 21:49:52 +00:00
Travis Howell
84549db76a Oops
svn-id: r14977
2004-09-09 07:32:03 +00:00
Travis Howell
5e9b5a0594 Ooops
svn-id: r14976
2004-09-09 07:29:49 +00:00
Travis Howell
f1fdfeda34 Don't check for verbs, if no verbs exist.
svn-id: r14934
2004-09-06 11:50:32 +00:00
Travis Howell
6bada66d16 Revert verb draw order change.
Fix recent verb regressions.

svn-id: r14870
2004-09-03 02:08:32 +00:00
Max Horn
0e203f6ccd Fix for bug #1015941 (COMI: There's only background behind dialogue lines)
svn-id: r14812
2004-08-28 13:30:59 +00:00
Max Horn
152a5e97fe Modified VirtScreen to inherit from Graphics::Surface, and added getPixels()/getBackPixels() accessors (these changes make it a bit easier to implement smooth scrolling); also replaced some uses of rtBuffer by proper access through the corresponding VirtScreen
svn-id: r14612
2004-08-14 19:42:00 +00:00
Travis Howell
acc51d2e29 Fix verbs on computer terminals in FT
svn-id: r14604
2004-08-14 10:38:34 +00:00
Travis Howell
d42e2af68a Correct verb order
svn-id: r14535
2004-08-10 06:13:25 +00:00
Max Horn
835ef5f012 Patch #1003866 (SCUMM: New text rendering code (fixes various bugs))
svn-id: r14521
2004-08-08 22:10:38 +00:00
Travis Howell
e8a10c219e COMI/DIG always redraws verbs too
Remove old var, no longer required

svn-id: r14481
2004-08-06 06:19:14 +00:00
Max Horn
ad1ab2cb62 Fix a small overpainting issue, visible in some of the COMI dialogs
svn-id: r14476
2004-08-05 22:10:42 +00:00
Travis Howell
002b9331a8 Minor cleanup
svn-id: r14236
2004-07-17 10:25:22 +00:00
Travis Howell
32335f0ea1 Ooops
svn-id: r14183
2004-07-10 11:46:15 +00:00
Travis Howell
4b4bb0d726 Full Throttle handles verb differently
svn-id: r14182
2004-07-10 11:42:31 +00:00
Eugene Sandulenko
7b2a81a8a6 o more _heversion usage
o hack to ensure 1x scaler is selected for 640x480 games. Begs for better
  implementation
o 7.0+-specific extendions to
  * resource loading
  * o6_resourceRoutines
  * o6_actorOps
  * o7_pickupObject
  * ScummEngine::setVerbObject

Now puttputt.w32 script execution advances little more.

svn-id: r13938
2004-06-06 02:20:53 +00:00
Max Horn
67c6df86d4 Remove obsolete code fragment (a good sign for a refactoring is if it allows you to remove crufty hacks you didn't even think of :-)
svn-id: r13440
2004-04-02 21:51:56 +00:00
Max Horn
ba5aa37dcc refactor use of _messagePtr -> instead of using it as an implicit parameter for various methods, pass its value explicitly to those methods. Note: this *should* be just a code transformation, with no change to the program logic - unless I messed up once again <sigh>
svn-id: r13298
2004-03-15 03:09:48 +00:00
Travis Howell
bd3f51dfdf Fix verbs regression.
svn-id: r12429
2004-01-16 10:20:43 +00:00
Max Horn
ac8243d229 use Rect in struct VerbSlot
svn-id: r12413
2004-01-15 19:25:17 +00:00
Max Horn
6222d6e643 more cleanup
svn-id: r12234
2004-01-08 03:24:41 +00:00
Max Horn
6c280c96f4 proper fix
svn-id: r12192
2004-01-06 19:17:01 +00:00
Paweł Kołodziejski
2c2ae5f59f fixed warning
svn-id: r12186
2004-01-06 17:23:19 +00:00
Max Horn
033ff78ae9 updated copyright notice
svn-id: r12176
2004-01-06 12:45:34 +00:00
Max Horn
cc67301791 renamed VirtScreen::alloctwobuffers to hasTwoBuffers; added lots of doxygen comments to VirtScreen; cleanup
svn-id: r12168
2004-01-06 11:47:34 +00:00
Max Horn
805f512452 replaced many instances of _screenWidth by VirtScreen::width, where approriate (there are cases, like when dealing with the camera, where _screenWidth is correct; in other places we still use it, because the VirtScreen is not available in that place at this time, will be fixed later). Reason for all this: eventually a clean seperation will allow us to use a main screen which is wider than the real screen width -> useful for V7+ smooth scrolling
svn-id: r12131
2004-01-04 13:09:02 +00:00