304 Commits

Author SHA1 Message Date
Torbjörn Andersson
8ad28e3a7e More cleanup, and I've replaced most - not quite all - of BS2's debug
message functions with our own.

We still need to go through them and assign sensible debug levels to them.

svn-id: r10422
2003-09-27 11:02:58 +00:00
Torbjörn Andersson
f18b4addb8 cleanup
svn-id: r10415
2003-09-26 14:19:03 +00:00
Torbjörn Andersson
b7a5024daf Ok, I'm stupid.
The initial sample is, indeed, two bytes, just like the rest of them, but
it really, really helps if you read it from the correct position in the
file.

After fixing that, it turned out that my changing of signedness of the
sample was also wrong. Funny how those two bugs almost cancelled each other
out. Almost.

I've made a few other changes as well, but they're just to clean things up
a bit. The credits music works for me, and I've played the game up to
arriving in Quaramonte, with no obvious music-related problems.

svn-id: r10412
2003-09-26 06:26:18 +00:00
Torbjörn Andersson
a4b32b67e8 Reverted part of the previous change. Control panel music should work again
but the credits music is still broken. I'll have to take a closer look at
this later.

svn-id: r10407
2003-09-25 11:35:54 +00:00
Torbjörn Andersson
b9cc1725b7 Some minor fixes. Unfortunately I've noticed that there is some major sound
distortion in the credits music, and I haven't yet figured out what's
causing this.

svn-id: r10406
2003-09-25 10:02:52 +00:00
Torbjörn Andersson
99eee3fb84 Rewrote the music code to use a premix function instead of a timer. I'm
speculating that the timer didn't always fill the buffer quite fast enough
and that this is what caused the occasional popping noises.

Of course, I may have introduced all kinds of regressions - particularly
since I don't have any big-endian computer to test on - but we're all
friends here, right? :-)

svn-id: r10404
2003-09-25 06:11:07 +00:00
Torbjörn Andersson
09a01e4cbe Replaced abs() with ABS and BOOL with bool, plus some minor cleanups.
svn-id: r10391
2003-09-24 06:40:23 +00:00
Torbjörn Andersson
6e59a2df00 Removed unused / replaced source code. This turned out to be most of the
file. :-)

svn-id: r10385
2003-09-23 17:24:45 +00:00
Torbjörn Andersson
4ae1674a44 Removed ancient version history. Much of it doesn't apply to us, and was
cluttering up the files anyway. (Though I do feel a slight twinge of guilt
for removing historical records like this. :-)

svn-id: r10384
2003-09-23 16:53:25 +00:00
Torbjörn Andersson
95a59bd049 Must ... make ... space ... for ... FotAQ ...
svn-id: r10383
2003-09-23 16:38:38 +00:00
Torbjörn Andersson
bef1facdbc Removed the screenshot code. (The SDL backend already has the ability to
make screenshots.)

svn-id: r10382
2003-09-23 16:13:13 +00:00
Torbjörn Andersson
57d99796ea Changed the keyboard handling to store "keyboard events", rather than just
characters. Hopefully this will make things work smoother on the Mac, but I
have no way of testing that.

svn-id: r10376
2003-09-23 15:59:52 +00:00
Torbjörn Andersson
273e1ac1a0 Fixed really brain-dead bug. (I made it myself - I can call it whatever I
want to! :-) Escaping a cutscene while the voice-over is playing should
work now.

svn-id: r10369
2003-09-23 06:34:19 +00:00
Torbjörn Andersson
fa8ccef9a4 Removed unused code
svn-id: r10368
2003-09-23 06:31:13 +00:00
Torbjörn Andersson
c7b8a6c01b cleanup
svn-id: r10367
2003-09-23 06:30:52 +00:00
Torbjörn Andersson
bd6eece093 Initialize the cutscene voice-over sound handle, in case you press Escape
before there is any speech.

svn-id: r10364
2003-09-23 06:22:36 +00:00
Torbjörn Andersson
8e28b0c6b4 Cleaned up the sound code enough to add cutscene voice-overs. I haven't had
the time to do much testing yet, but it seems to work for me.

svn-id: r10361
2003-09-22 06:36:38 +00:00
Max Horn
58721a629d No need to do endian conversion if you check for 0, as BE 0 == LE 0
svn-id: r10359
2003-09-21 18:25:34 +00:00
Torbjörn Andersson
df6028b17a cleanup
svn-id: r10352
2003-09-21 16:19:25 +00:00
Torbjörn Andersson
dadad7bafa Removed original ProcessMenu() code.
svn-id: r10351
2003-09-21 16:16:49 +00:00
Torbjörn Andersson
bfa5c61734 Some cleanup - lots more needed!
svn-id: r10348
2003-09-21 14:26:25 +00:00
Torbjörn Andersson
5628ee7417 cleanup
svn-id: r10308
2003-09-19 06:42:22 +00:00
Max Horn
be9d4066e1 moved engine.* to base; this fixes some linking issues when building a barebone ScummVM (or maybe I just want to increase our CVS stats? <g>)
svn-id: r10287
2003-09-18 02:07:18 +00:00
Max Horn
468275bb94 added a static method setDefaultDirectory to class File; used this to simplify some code; added a global g_sound pointer in bs2, this cuts down on uses of g_sword2 (of course both should be removed on the long run); some other minor tweaks/fixes
svn-id: r10278
2003-09-17 21:06:16 +00:00
Max Horn
c0d1061a2d cleanup
svn-id: r10277
2003-09-17 20:34:20 +00:00
Torbjörn Andersson
00c1fdce3a Removed some unnecessary #includes and #defines.
svn-id: r10264
2003-09-16 09:57:57 +00:00
Torbjörn Andersson
48d0761286 Some cleanup. More to follow, I hope.
svn-id: r10263
2003-09-16 07:11:29 +00:00
Oliver Kiehl
7eaf33e014 actually this is the correct fix to "Cutscene - Press ESC to exit" :)
svn-id: r10259
2003-09-14 23:42:07 +00:00
Oliver Kiehl
685d44940f fix "Cutscene - Press ESC to exit" message
svn-id: r10258
2003-09-14 23:39:06 +00:00
Max Horn
42bf2a855c cleanup
svn-id: r10236
2003-09-13 18:06:19 +00:00
Oliver Kiehl
51703e1014 pack _parallax to be on the safe side
svn-id: r10234
2003-09-13 17:36:39 +00:00
Oliver Kiehl
6d94352f2f fix speech on BE
svn-id: r10229
2003-09-13 14:32:40 +00:00
Oliver Kiehl
bd50e9f3d7 some more endian fixes
svn-id: r10224
2003-09-13 13:05:52 +00:00
Oliver Kiehl
20fe2b83fc should have been an int32
svn-id: r10220
2003-09-13 12:15:13 +00:00
Oliver Kiehl
35e5c73127 endian fix
svn-id: r10219
2003-09-13 12:12:11 +00:00
Oliver Kiehl
f6cfd5775e fix LE bug
svn-id: r10215
2003-09-13 11:39:25 +00:00
Max Horn
a00930fbcb YAEB
svn-id: r10205
2003-09-13 01:59:57 +00:00
Max Horn
403ba92327 cleanup
svn-id: r10204
2003-09-13 01:59:11 +00:00
Max Horn
4d9296d4c4 cleanup
svn-id: r10197
2003-09-12 23:22:45 +00:00
Oliver Kiehl
9dc282f1d5 endian fixes
svn-id: r10192
2003-09-12 18:52:53 +00:00
Oliver Kiehl
5b20c4fb91 disable code because it crashes
svn-id: r10160
2003-09-10 16:05:26 +00:00
Max Horn
afe56a4aeb added refCon parameter to timer class
svn-id: r10156
2003-09-10 12:43:54 +00:00
Torbjörn Andersson
d5f4297221 HACK: Display instructions during the cutscenes, so that the user won't
think ScummVM has hung or something.

svn-id: r10138
2003-09-09 15:54:13 +00:00
Torbjörn Andersson
78afd89698 Reworked the last commit a bit, so that PlaySmacker() doesn't need to know
as much about the text handling functions.

svn-id: r10137
2003-09-09 15:17:12 +00:00
Torbjörn Andersson
bc28dac67d In PlaySmacker(), make sure there really is a text sprite to draw.
svn-id: r10136
2003-09-09 15:10:07 +00:00
Torbjörn Andersson
5bf1974a08 Our ServiceWindows() never returns RDERR_APPCLOSED, and we always behave as
if we have the focus, so there's no need to check.

svn-id: r10130
2003-09-09 12:45:33 +00:00
Torbjörn Andersson
bb5f479a8c Added a WaitForFade() function, to replace numerous while-loops scattered
througout the code.

svn-id: r10127
2003-09-09 12:14:08 +00:00
Torbjörn Andersson
fb6e8dd628 Clarified some comments in PlaySmacker(). At this point it should be fairly
trivial to actually play the Smacker voice-overs, but I think the sound
code needs a bit more cleaning up first. (I'm pretty sure it isn't
alignment-safe, and it might not be endian-safe either.)

svn-id: r10123
2003-09-09 07:01:04 +00:00
Torbjörn Andersson
a6661b2070 Cleanup.
svn-id: r10104
2003-09-08 17:44:26 +00:00
Torbjörn Andersson
d0949b7035 Updated comment.
svn-id: r10100
2003-09-08 17:24:00 +00:00