Travis Howell
71b0add601
Cleanup
...
svn-id: r24282
2006-10-11 15:10:59 +00:00
Travis Howell
6c66570726
Minor cleanup
...
svn-id: r24281
2006-10-11 15:01:35 +00:00
Travis Howell
4311c3a04c
Add AtariST version of Elvira 1 and cleanup
...
svn-id: r24280
2006-10-11 14:59:16 +00:00
Travis Howell
39613c7eec
Avoid possible regressions
...
svn-id: r24278
2006-10-11 14:12:51 +00:00
Travis Howell
2fbafbf749
Add opcode for Elvira 1
...
svn-id: r24277
2006-10-11 14:03:40 +00:00
Travis Howell
2a876e11b5
Add support for clearWindow and cleanup
...
svn-id: r24272
2006-10-11 12:03:47 +00:00
Travis Howell
a8df97ede8
Fix palette display of lower part of screne in Elvira 1
...
svn-id: r24271
2006-10-11 09:21:59 +00:00
Travis Howell
08a2365695
Increase buffer size for Elvira 1
...
svn-id: r24270
2006-10-11 01:51:10 +00:00
Travis Howell
a025cf49b4
Ooops, remove debug left overs
...
svn-id: r24265
2006-10-10 13:08:27 +00:00
Paweł Kołodziejski
e85ab4b10f
now SmushPlayer is class created once same as SmushMixer while scumm engine creation. this allow finish play smush audio track finished to the end instead immediately stopped as it was happen before
...
svn-id: r24263
2006-10-10 12:16:21 +00:00
Travis Howell
89f79acb84
Fix and remove duplicate opcode for Elvira 1
...
svn-id: r24262
2006-10-10 12:13:47 +00:00
Travis Howell
99df945038
Fix guard response in Elvira 1
...
svn-id: r24261
2006-10-10 11:44:58 +00:00
Travis Howell
c5044d67c9
Fix movement in Elvira 1
...
svn-id: r24260
2006-10-10 11:25:45 +00:00
Torbjörn Andersson
651f9f2ad7
Casting 'buffer' to uint32 makes absolutely no sense to me. As far as I can
...
tell, we just want to add an offset to a byte pointer.
svn-id: r24254
2006-10-09 15:42:55 +00:00
Travis Howell
82775ed890
Use correct video window values for each game and minor cleanup
...
svn-id: r24253
2006-10-09 13:00:25 +00:00
Travis Howell
757fc94676
Enable convert code for Amiga CD32 version of Simon1 too
...
svn-id: r24251
2006-10-09 11:06:56 +00:00
Travis Howell
b2d4d36e8b
Add Amiga ECS verison of Simon the Sorcerer 1
...
svn-id: r24250
2006-10-09 10:26:27 +00:00
Travis Howell
5dc2183939
Fix the display of backgrounds in Amiga disk versions of Simon1
...
svn-id: r24247
2006-10-09 06:11:51 +00:00
Travis Howell
20a0bc6700
Fix invalid reads during conversion
...
svn-id: r24246
2006-10-09 02:59:40 +00:00
Travis Howell
aac87e10c2
Minor cleanup
...
svn-id: r24245
2006-10-09 02:12:24 +00:00
Travis Howell
5e827e1e5d
Update comment
...
svn-id: r24244
2006-10-09 02:01:37 +00:00
Travis Howell
5b048de879
Add conversion for planar graphics in Amiga version of Elvira 1/2 and Waxworks
...
svn-id: r24243
2006-10-09 01:58:48 +00:00
Travis Howell
9fbe8481d8
Add conversion for planar graphics in Amiga version of Elvira 1/2 and Waxworks
...
svn-id: r24242
2006-10-09 01:56:51 +00:00
Paweł Kołodziejski
430317dc92
removed not needed anymore time measures in smush code
...
svn-id: r24226
2006-10-08 19:39:46 +00:00
Paweł Kołodziejski
f73861c943
re-add missing break; removed by mistake
...
svn-id: r24225
2006-10-08 19:35:13 +00:00
Paweł Kołodziejski
4e22b8262a
remove handleSkip code, SKIP chunk is only used by INSANE code and exist only in 4 SAN files: minedriv, toranch, tovista1, tovista2
...
svn-id: r24221
2006-10-08 19:23:08 +00:00
Paweł Kołodziejski
ce100c8e93
small unify handleIACT function
...
svn-id: r24214
2006-10-08 18:22:51 +00:00
Kostas Nakos
4524b49872
Initial commit of the wince-gcc re-port
...
svn-id: r24212
2006-10-08 18:15:18 +00:00
Paweł Kołodziejski
0f17713763
fixed potentially uninitialized local variable 'x'
...
svn-id: r24209
2006-10-08 15:46:23 +00:00
Joost Peters
bf6ba21d83
commit "fixed regression in BASS adlib music." from 0-9-0 branch to trunk
...
svn-id: r24204
2006-10-08 12:31:05 +00:00
Travis Howell
9aee6f3ff6
Correct x position, when printing stasticsin Elvira 1
...
svn-id: r24198
2006-10-08 10:43:49 +00:00
Torbjörn Andersson
0317b11460
Fixed regression in non-Elvira games.
...
svn-id: r24197
2006-10-08 09:44:06 +00:00
Torbjörn Andersson
bc4e7d4f82
Whitespace.
...
svn-id: r24196
2006-10-08 09:02:31 +00:00
Travis Howell
4188e40c5d
Add invert box difference in Elvira 2
...
svn-id: r24195
2006-10-08 08:57:26 +00:00
Travis Howell
ed4f078fc8
Add invert box difference in Elvira 1
...
svn-id: r24194
2006-10-08 08:47:33 +00:00
Travis Howell
245a40963a
Add opcode for Elvira 1 and remove errors that don't occur in original games
...
svn-id: r24193
2006-10-08 08:35:25 +00:00
Torbjörn Andersson
de280a5a5c
The extra Elvira 1 colours have to be "re-scaled" to 8 bits. Cleaned up the
...
code a bit to make that more obvious.
svn-id: r24192
2006-10-08 08:18:33 +00:00
Eugene Sandulenko
9142322cb0
More const madness.
...
svn-id: r24191
2006-10-08 07:48:19 +00:00
Travis Howell
07183595e7
Add a few palette differences and fix input in Elvira 1
...
svn-id: r24190
2006-10-08 07:42:34 +00:00
Travis Howell
56153086e5
Add code for displaying stastics in Elvira 1
...
svn-id: r24188
2006-10-08 01:46:38 +00:00
Max Horn
25cfb5feb1
Added a FIXME comment
...
svn-id: r24184
2006-10-08 00:42:31 +00:00
Max Horn
e3797919fc
Replaced evil usage of static globals inside function by proper member variables
...
svn-id: r24183
2006-10-08 00:41:29 +00:00
Max Horn
d280234ae7
Added more const qualifiers
...
svn-id: r24182
2006-10-08 00:21:40 +00:00
Travis Howell
fbbc609610
A few corrections for Elvira 1 game details
...
svn-id: r24180
2006-10-08 00:00:58 +00:00
Torbjörn Andersson
f09123a1b4
Fixed compilation.
...
svn-id: r24177
2006-10-07 19:15:19 +00:00
Max Horn
9cba143699
Removed _lastKeyHit, instead pass the key code as a parameter to processKeyboard()
...
svn-id: r24176
2006-10-07 17:49:05 +00:00
Max Horn
ff6731e00a
Removed 'smushMode' param from processInput and processKeyboard in favor of a new member _smushActive of ScummEngine_v7
...
svn-id: r24175
2006-10-07 17:42:32 +00:00
Max Horn
71bea97de7
Clarified comment
...
svn-id: r24174
2006-10-07 15:46:38 +00:00
Max Horn
e31ae8edc7
Moved calls to addDefaultDirectory, and creation of the master file handle, from the ScummEngine constructor to ScummEngine::init() (this makes it easier to implement more graceful error handling, for example)
...
svn-id: r24173
2006-10-07 15:37:03 +00:00
Max Horn
4973c657b8
Moved all INSANE and SMUSH related code into ScummEngine_v7 (resp. ScummEngine_v6 in a few cases)
...
svn-id: r24169
2006-10-07 13:57:06 +00:00
Torbjörn Andersson
f6407f01f8
Partial fix for Elvira 1 palette problems.
...
svn-id: r24168
2006-10-07 13:33:41 +00:00
Max Horn
5f0874ef63
Some more processKeyboard splitting
...
svn-id: r24167
2006-10-07 13:31:27 +00:00
Max Horn
f3e410a2ac
Further split processKeyboard code, moving stuff specific to some SCUMM version into the resp. subclass of ScummEngine
...
svn-id: r24166
2006-10-07 13:11:51 +00:00
Max Horn
c3fb1fbcd4
Moved SCUMM keyboard handling code from processInput() to the new (sub)method processKeyboard
...
svn-id: r24165
2006-10-07 12:33:22 +00:00
Max Horn
f13e4baaf9
Renemaed ScummEngine::processKbd to processInput (as it also deals with the mouse)
...
svn-id: r24164
2006-10-07 12:19:28 +00:00
Max Horn
ef30cdf78b
some HE related cleanup
...
svn-id: r24163
2006-10-07 11:54:50 +00:00
Torbjörn Andersson
05e7423ed8
Fixed warning.
...
svn-id: r24162
2006-10-07 08:38:31 +00:00
Travis Howell
1a785b85b3
Add more code differences in Elvira 1
...
svn-id: r24161
2006-10-07 08:28:06 +00:00
Travis Howell
22a14014b3
Minor cleanup
...
svn-id: r24159
2006-10-07 03:43:51 +00:00
Travis Howell
f6a6818c5a
Minor cleanup
...
svn-id: r24158
2006-10-07 03:31:17 +00:00
Travis Howell
60f7d97665
Whitespace changes
...
svn-id: r24157
2006-10-07 03:24:40 +00:00
Travis Howell
8afacd96b9
Add code for printing to boxes in Waxworks
...
svn-id: r24156
2006-10-07 03:02:56 +00:00
Travis Howell
e4c9d0a4e3
Add more script opcodes for Elvira 1/2/WW
...
svn-id: r24154
2006-10-07 01:10:32 +00:00
Travis Howell
e75bea0c8f
Add more code for Elvira 2
...
svn-id: r24143
2006-10-06 15:59:59 +00:00
Travis Howell
4b900edfeb
Add more code for Elvira 2
...
svn-id: r24142
2006-10-06 15:16:56 +00:00
Travis Howell
38195077d4
Add more code for Elvira 1
...
svn-id: r24141
2006-10-06 14:44:39 +00:00
Travis Howell
1d310debd9
Fix dectection of hit areas in earlier games
...
svn-id: r24140
2006-10-06 12:58:11 +00:00
Travis Howell
e0b76855d3
Correct typo in game title for Elvira 2
...
svn-id: r24139
2006-10-06 09:21:34 +00:00
Travis Howell
d16c635a12
Alwats report invalid opcodes when debug output is enabled
...
svn-id: r24138
2006-10-06 08:30:07 +00:00
Travis Howell
8637803941
Update ebug opcode table for Elvira1
...
svn-id: r24137
2006-10-06 08:00:41 +00:00
Travis Howell
85c9bb0329
Add initial debug opcode table for Elvira1
...
svn-id: r24136
2006-10-06 07:44:03 +00:00
Travis Howell
f1475e24f5
Add debug video opcodes table for Elvira 1
...
svn-id: r24135
2006-10-06 06:12:57 +00:00
Travis Howell
81cbb8f718
Correct game titles for Elvira 1/2
...
svn-id: r24134
2006-10-06 05:17:54 +00:00
Travis Howell
3183f36422
Add Amiga demo of Elvira, and switch to elvira1 for Elvira
...
svn-id: r24133
2006-10-06 05:13:09 +00:00
Travis Howell
7ac1f00f0b
Ooops, restrict o_loadZone() changes to older games only
...
svn-id: r24132
2006-10-06 04:56:25 +00:00
Travis Howell
7f99566784
Add support for skipping introduction in Elivra 1/2/WW
...
svn-id: r24131
2006-10-06 04:51:22 +00:00
Travis Howell
c22289416f
Add more code for Elvira 1/2
...
svn-id: r24130
2006-10-06 00:36:13 +00:00
Johannes Schickel
ac7651b273
Silenced warning of msvc8.
...
svn-id: r24127
2006-10-05 19:11:09 +00:00
Torbjörn Andersson
9ae7bab9f2
I hope this is the right fix for an "invalid opcode" message right after
...
SET_PATHFIND_ITEM when dumping scripts. If so, perhaps it should be on the 0.9
branch as well. On the other hand, it only happens when debugging...
svn-id: r24125
2006-10-05 16:43:11 +00:00
Travis Howell
dcbad3a1ab
Fix startup of Elvira 1
...
svn-id: r24124
2006-10-05 13:46:48 +00:00
Travis Howell
5af4438cd2
Fix opening credits of Elvira 2
...
svn-id: r24123
2006-10-05 10:10:26 +00:00
Travis Howell
4dd72f0b3b
Fix loading position of initial items in Elvira 1/2
...
svn-id: r24122
2006-10-05 08:54:51 +00:00
Travis Howell
5074da16d3
Add more code and stubs for WW
...
svn-id: r24121
2006-10-05 05:27:10 +00:00
Travis Howell
d7ac158813
Add Amiga versions of Elvira 1/2 and Waxworks
...
svn-id: r24120
2006-10-05 03:43:40 +00:00
Travis Howell
73552266c6
Elvira 1 require more table memory for now
...
svn-id: r24119
2006-10-05 02:08:51 +00:00
Travis Howell
5fe35cbe9a
Reduce memory required by each game, and add safety checks
...
svn-id: r24118
2006-10-05 01:17:59 +00:00
Travis Howell
b18fdb4c0a
Remove sound hacks for DS port, which would cause no speech or subtitles in Simon 1 with speech
...
svn-id: r24117
2006-10-05 00:16:50 +00:00
Max Horn
98f62b9e65
WORKAROUND bug #859513 (ZAK: "Oxygene-bug" on Mars)
...
svn-id: r24116
2006-10-04 20:22:47 +00:00
Max Horn
f7eee205bb
o2_animateActor is essentially identical to o5_animateActor -- removed in favor of the latter
...
svn-id: r24115
2006-10-04 20:22:14 +00:00
Max Horn
54790cc217
typo
...
svn-id: r24114
2006-10-04 20:20:50 +00:00
Travis Howell
a66907e276
Fix dumping of complete video script output
...
svn-id: r24112
2006-10-04 13:29:14 +00:00
Travis Howell
1dd23850ec
Correct frame rate in earlier games
...
svn-id: r24111
2006-10-04 12:29:37 +00:00
Travis Howell
8e4ffa4b7a
Fix palette regression
...
svn-id: r24110
2006-10-04 11:44:59 +00:00
Travis Howell
7cfbf8b3e4
Add French version of Elvira 2
...
svn-id: r24109
2006-10-04 11:17:00 +00:00
Travis Howell
2d016704f8
Correct number of variables in Elvira 1/2
...
svn-id: r24108
2006-10-04 11:12:59 +00:00
Travis Howell
4652cdd1ad
Add video opcode differences in Elvira 2
...
svn-id: r24107
2006-10-04 08:53:48 +00:00
Travis Howell
aab8b9b2a2
Fix initial resource loading in Elvira 2
...
svn-id: r24106
2006-10-04 07:10:22 +00:00
Torbjörn Andersson
863bed3fd0
Change masking condition for codec1_genericDecode(), proc3() and proc3_ami() so
...
that X coordinates outside the designated area are explicitly masked. While the
functions are written to terminate when X moves outside, bug #1508942 ("FOA:
Glitch dring balloon flight") demonstrates that X may *start* outside. That's
the case we want to mask.
Note that proc3_ami() already masked these pixels (in a different way), so
there the change is purely cosmetical.
svn-id: r24104
2006-10-04 05:11:58 +00:00
Travis Howell
baac293911
Add more code for WW
...
svn-id: r24103
2006-10-04 03:29:14 +00:00
Travis Howell
1f5a69ea11
Fix sound effects regression in simon1dos and remove excess game ids
...
svn-id: r24100
2006-10-03 14:18:17 +00:00
Travis Howell
ab573e0c62
Cleanup
...
svn-id: r24099
2006-10-03 14:02:14 +00:00
Travis Howell
1dc5670022
Fix bugs in VGA resource manager and cleanup
...
svn-id: r24097
2006-10-03 13:20:23 +00:00
Travis Howell
09f9cf7b64
Add Dutch versions of freddi4 and freddicove for Macintosh
...
svn-id: r24095
2006-10-03 12:15:01 +00:00
Travis Howell
af5c8eb1c3
Remove blocks/tiles related code for PP, which was only required by unreleased game
...
svn-id: r24092
2006-10-03 10:01:08 +00:00
Travis Howell
9e097f60ab
Add changes and enable music for Elvira1
...
svn-id: r24091
2006-10-03 00:31:24 +00:00
Eugene Sandulenko
107a9f3bef
Moved unrelated fields out of ADGameDescription structure.
...
svn-id: r24090
2006-10-02 23:31:14 +00:00
Torbjörn Andersson
60aee54bfe
Fixed bug #1569594 ("BS2 DXA Movie Exit/Crash"). That's what I get for only
...
testing with subtitles enabled... :-)
svn-id: r24089
2006-10-02 23:07:43 +00:00
Travis Howell
1ee0c4f1ce
The name isn't stored in saved games for PP
...
svn-id: r24088
2006-10-02 23:01:32 +00:00
Travis Howell
af21ec036f
Add basic single slot load/save support for dimp/swampy for now
...
svn-id: r24086
2006-10-02 22:33:38 +00:00
Max Horn
125d599acc
Improved the BASS detector a bit
...
svn-id: r24084
2006-10-02 22:26:57 +00:00
Eugene Sandulenko
988ddf2b36
Unify SAGA/AGOS detection code so other engines could also reuse it
...
without further code duplication.
svn-id: r24083
2006-10-02 22:21:57 +00:00
Travis Howell
574665be4b
Fix mistake in startAnOverlayAnim()
...
svn-id: r24082
2006-10-02 21:47:45 +00:00
Travis Howell
e78e1c6987
Fix crashes in swampy when moving blocks
...
svn-id: r24081
2006-10-02 21:41:18 +00:00
Torbjörn Andersson
bcd4591da4
Workaround for bug #1555938 ("MI2: Inventory object cloning"), as suggested by
...
Fingolfin.
svn-id: r24080
2006-10-02 21:38:39 +00:00
Torbjörn Andersson
9118a731dc
Renamed setupAGOSOpcodes() to setupCommonOpcodes() for consistency.
...
svn-id: r24073
2006-10-02 16:18:48 +00:00
Travis Howell
53cf7d65da
Add video opcodes differences in Elvira1 and cleanup
...
svn-id: r24072
2006-10-02 14:32:28 +00:00
Paul Gilbert
99655b59d4
Added a save/restore game dialog class
...
svn-id: r24071
2006-10-02 12:49:57 +00:00
Paul Gilbert
1a96e26bf6
Added functionality to allow saving/loading the game state
...
svn-id: r24070
2006-10-02 12:48:56 +00:00
Paul Gilbert
e8623fa477
Added methods for push/pop cursors
...
svn-id: r24069
2006-10-02 12:47:29 +00:00
Travis Howell
6201707122
Fix display and input in dimp
...
svn-id: r24068
2006-10-02 11:31:11 +00:00
Travis Howell
62df08578b
Decrease window array size, to maximum required by games
...
svn-id: r24067
2006-10-02 10:54:06 +00:00
Travis Howell
425b243be1
Increase struct sizes, to maximum required by games
...
svn-id: r24066
2006-10-02 10:43:07 +00:00
Travis Howell
f3831078b6
Fix tile positions in swampy
...
svn-id: r24065
2006-10-02 08:35:15 +00:00
Travis Howell
ad9b764531
Fix arrows keys in swampy
...
svn-id: r24064
2006-10-02 07:06:20 +00:00
Travis Howell
6bcd0183c0
Add more changes for swampy
...
svn-id: r24063
2006-10-02 06:22:05 +00:00
Travis Howell
97cf93d275
Fix changing map areas in swampy
...
svn-id: r24062
2006-10-02 06:11:05 +00:00
Travis Howell
2cc1df6fdd
Add last tiles code and corrections for Swampy
...
svn-id: r24061
2006-10-02 05:39:27 +00:00
Torbjörn Andersson
d7b786ea41
Implemented "iconify window" opcode. This, of course, needs support in the
...
backend to work, and so far it's only done in the SDL backend. See the new
kFeatureIconifyWindow flag. (This is patch #1568775.)
svn-id: r24060
2006-10-02 04:46:50 +00:00
Travis Howell
42cb69827e
Add more tiles code for Swampy
...
svn-id: r24059
2006-10-02 01:39:50 +00:00
Travis Howell
3fc8aec422
Add more tiles code for Swampy
...
svn-id: r24058
2006-10-02 01:09:50 +00:00
Travis Howell
6b0cd7c841
Fix cursor regression in FF
...
svn-id: r24057
2006-10-01 11:18:05 +00:00
Johannes Schickel
890a2ef93c
Fixed msvc8 build.
...
svn-id: r24054
2006-10-01 10:56:12 +00:00
Johannes Schickel
06dde0650f
Fixed msvc8 build.
...
svn-id: r24053
2006-10-01 10:54:57 +00:00
Travis Howell
c7a2d1eb6b
Update vga timer code to match original PP
...
svn-id: r24052
2006-10-01 10:48:06 +00:00
Travis Howell
0e2d209cce
Fix error in debug opcode table for PP
...
svn-id: r24051
2006-10-01 10:07:57 +00:00
Travis Howell
53473f0498
Add debug opcode table for PP and other minor changes for PP
...
svn-id: r24050
2006-10-01 10:04:23 +00:00
Torbjörn Andersson
f59bc6f4a1
Some Elvira opcodes/stubs
...
svn-id: r24049
2006-10-01 08:36:31 +00:00
Torbjörn Andersson
2eb61bd1e3
Split the seupOpcodes() function into several functions for - hopefully -
...
better readability, and to make it easier for Elvira to replace the entire
opcode table.
svn-id: r24048
2006-10-01 07:22:01 +00:00
Torbjörn Andersson
ff67752f54
When escaping a cutscene, stop its soundtrack as well. (I can't check if this
...
is a problem in 0.9.0 as well, but surely not...?)
svn-id: r24047
2006-10-01 07:17:34 +00:00
Max Horn
bf6a1cc734
Fix compiler warning
...
svn-id: r24042
2006-09-30 13:34:17 +00:00
Travis Howell
119ee3fb8b
Add support for skipping swampy introduction
...
svn-id: r24041
2006-09-30 13:02:31 +00:00
Torbjörn Andersson
23c1ba8cd6
Another PP opcode stub.
...
svn-id: r24040
2006-09-30 12:39:34 +00:00
Travis Howell
16dec6dce6
Add more small difference in PP code
...
svn-id: r24039
2006-09-30 12:28:52 +00:00
Torbjörn Andersson
30ac033dc0
Added a couple of functions which seem to define the rules for some kind of
...
"blocks" game. This looks like it could be cleaned up quite a bit.
svn-id: r24038
2006-09-30 11:55:50 +00:00
Travis Howell
79e07ad97b
Add debug output, to find triggers for PP functions
...
svn-id: r24037
2006-09-30 11:52:24 +00:00
Torbjörn Andersson
d2a0c6bd52
Another slight PP difference.
...
svn-id: r24036
2006-09-30 11:36:50 +00:00
Travis Howell
c60d3d73f4
Ooops, fix type in vc76_setScaleXOffs()
...
svn-id: r24035
2006-09-30 10:46:53 +00:00
Travis Howell
deaa9e1ca1
Add code to move pieces in jumble of PP
...
svn-id: r24034
2006-09-30 10:45:10 +00:00
Travis Howell
9b36168deb
Ooops, another mistake in isVgaQueueEmpty()
...
svn-id: r24033
2006-09-30 07:29:23 +00:00
Travis Howell
46ed06fc27
Ooops, increase count in isVgaQueueEmpty()
...
svn-id: r24032
2006-09-30 07:26:40 +00:00
