Commit Graph

114 Commits

Author SHA1 Message Date
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
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
Travis Howell
bee21ec3f8 Add extra color table entry for v1 games, for inventory/sentence color.
svn-id: r11653
2003-12-15 14:54:35 +00:00
Paweł Kołodziejski
d5eddef057 changed some shift operators to *, /
svn-id: r11315
2003-11-16 20:52:57 +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
Max Horn
0e645f88ae renamed namespace ScummVM to Common
svn-id: r10544
2003-10-02 17:43:02 +00:00
Travis Howell
d60237eab9 Revert change that caused more problems
svn-id: r10395
2003-09-24 07:40:19 +00:00
Travis Howell
e9dd4dc167 Revert change that caused more problems
svn-id: r10394
2003-09-24 07:38:59 +00:00
Max Horn
d520f2f44c Patch #790433: Fix potential buffer overflow
svn-id: r10049
2003-09-06 20:36:29 +00:00
Travis Howell
ef4fdd03f0 My last commit was wrong, this is correct solution.
svn-id: r9908
2003-08-29 07:07:55 +00:00
Travis Howell
14e3dd96e0 Ooops, inventory still needs to be clear when moving through inventory.
svn-id: r9840
2003-08-24 02:27:52 +00:00
Travis Howell
79036c5a1d Handle hiding of verbs/inventory in v1-v2 games correctly.
According to diasm. the verbs areas is only enabled and shown when (_userState & 128) is true and verbs/inventory area is cleared/redrawn on each state change.

svn-id: r9837
2003-08-24 01:47:45 +00:00
Travis Howell
a34f8895cb Revert color change for v1 maniac, which actually used in pool room.
svn-id: r9778
2003-08-19 04:47:38 +00:00
Travis Howell
d6105a3064 Cleanup v1/v2 color settings for sentance/inventory/verb area.
Add highlight color for v1 maniac

svn-id: r9774
2003-08-19 04:15:14 +00:00
Max Horn
7e54a2f569 fix inventory scrolling V1/V2 games (there were problems with an odd inventory count)
svn-id: r9201
2003-07-27 17:33:28 +00:00
Max Horn
c74e2eb4d7 factored out some duplicate code into a new method translateTextAndPlaySpeech; removed some completely useless code (why compute 'pointer' when we then throw away the result?)
svn-id: r9045
2003-07-15 21:30:53 +00:00
Travis Howell
dc9a153e1b Inventory position is the same in both v1 and v2 games
svn-id: r9008
2003-07-14 09:30:29 +00:00
Travis Howell
e6f3eb9aa5 A few color fixes for v1/v2
svn-id: r8997
2003-07-14 06:14:49 +00:00
Travis Howell
726718a60e For some reason, changing the kSentenceLine color stops highlighting working.
svn-id: r8992
2003-07-13 17:16:05 +00:00
Travis Howell
0642d2df98 Correct v1 games inventory positions
svn-id: r8990
2003-07-13 15:58:48 +00:00