Commit Graph

100 Commits

Author SHA1 Message Date
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
Travis Howell
ffddfd76d9 Add correct palette for pc versions of v1 games
Add some correct colors for v1 games

svn-id: r8988
2003-07-13 15:13:43 +00:00
Max Horn
187b715306 run script 5 in startScene (room transition script, it seems); don't invoke runInputScript(4) - it is not needed (runInputScript will be called by checkExecVerbs), and causes the buggy 'What is' command behavior); fixed V2 sentence line
svn-id: r8955
2003-07-12 21:28:04 +00:00
Max Horn
f383dc24c4 fix existing ego actor change detection code
svn-id: r8941
2003-07-12 12:16:17 +00:00
James Brown
cc23b25cde Fix fix for 769896
svn-id: r8938
2003-07-12 10:19:18 +00:00
James Brown
dabe8799a1 Fix for bug 769896, update README a little
svn-id: r8935
2003-07-12 09:45:10 +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
7f3118f8d8 more const qualifiers
svn-id: r8649
2003-06-25 23:49:54 +00:00
Torbjörn Andersson
5a2678b72a Make the mouse-over hilight work again on the inventory arrows in V2 games.
svn-id: r8523
2003-06-17 07:11:58 +00:00
James Brown
a5a72ef3f8 V2 inventory arrow tweaks - closes cosmetic bug #751659
svn-id: r8516
2003-06-16 11:52:04 +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
77aa2fe000 fix for bug #752843 (based on patch #748675)
svn-id: r8458
2003-06-13 09:24:00 +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