Commit Graph

82 Commits

Author SHA1 Message Date
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
Max Horn
61de12d3a1 Modified version of erik's patch #745986: Experimental V2 mouseover stuff
svn-id: r8142
2003-05-30 14:29:07 +00:00
Max Horn
1f70da0155 const as const can!
svn-id: r8058
2003-05-28 20:01:47 +00:00
James Brown
573678abc0 V2 Inventory scrolling, etc
svn-id: r7817
2003-05-22 05:44:18 +00:00
Max Horn
b12d741ac1 cleaned up V2 input code
svn-id: r7811
2003-05-21 23:54:39 +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
8a82e59065 constness fixes
svn-id: r7787
2003-05-21 16:28:02 +00:00
James Brown
60ac300bf3 Work on V2 inventory hack a little more
svn-id: r7776
2003-05-21 10:13:06 +00:00
James Brown
0c0cb61876 Move stuff around
svn-id: r7775
2003-05-21 09:29:24 +00:00
James Brown
6db28696e4 Fix invalid variable
svn-id: r7599
2003-05-17 06:18:34 +00:00
James Brown
2813d48e92 Cleanup
svn-id: r7598
2003-05-17 06:14:08 +00:00
Max Horn
7baef4ad4e make some more use of ScummVM::Point; cleanup
svn-id: r7549
2003-05-15 22:41:35 +00:00
Max Horn
a8603e5bfc some more ScummVM::Rect
svn-id: r7548
2003-05-15 22:36:43 +00:00
Max Horn
f4c7f37743 Make use of ScummVM::Rect
svn-id: r7546
2003-05-15 22:30:32 +00:00
Max Horn
12f7d71bf2 fix regression in MI1 (and possibly others)
svn-id: r7472
2003-05-12 16:57:04 +00:00
Max Horn
acb35fc915 renamed _scrWidth/_scrHeight -> _roomWidht/_roomHeight, and _realWidth/_realHeight -> _screenWidth/_screenHeight (inspired by MadMoose, but I'll take the blame - still this seems much more logical & intuitive)
svn-id: r7423
2003-05-10 21:49:59 +00:00
Max Horn
114af3159e added a 'width' parameter to drawBitmap (contrary to 'numstrips', it specifies the full width of the image passed in, not how much we shoul draw of it) - this will be used for the new V2 drawBitmap code; renamed drawBitmap parameter 'h' to 'height'
svn-id: r7412
2003-05-10 12:59:32 +00:00
Max Horn
54a9ad3204 super hackish mouse click support for Zak (doesn't do anything useful in MM yet; and in Zak, all clicks are for the scene, i.e. no verb clicks etc.)
svn-id: r7408
2003-05-09 22:26:00 +00:00
Max Horn
e3acde9f9c assert in compile mode expands to ... nnothing!
svn-id: r7236
2003-04-30 22:37:03 +00:00