thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
10139 commits 35 branches 0 tags 1.4 GiB
Commit graph

62 commits

Author SHA1 Message Date
Torbjörn Andersson
6cb86c641f Make clearScene() set the _needFullRedraw variable. 
I think the reason I didn't do this from the start was that BS2 used to
call clearScene(), or whatever the function was called back then, between
every frame. Nowadays, it simply assumes that each frame will cover the
previous one.

Anyway, this change prevents the restart/restore dialog from appearing
briefly between the two intro cutscene animations.

svn-id: r13421
 2004-03-29 06:32:54 +00:00
Max Horn
d158280425 the OSystem changes we discussed on the ML (note: renaming of the existing OSystem API is not yet finished); porters will have to fix their ports to get them to compile again 
svn-id: r13036
 2004-02-24 22:39:42 +00:00
Torbjörn Andersson
802a301a16 Removed some of the #includes from sword2.h 
svn-id: r12739
 2004-02-05 14:19:07 +00:00
Torbjörn Andersson
8a66ba33cf Moved the rest of the MoviePlayer class into animation.cpp/.h, plus some 
minor cleanups. (Mostly spacing and indentation).

Unfortunately the Ogg Vorbis playback causes ScummVM to crash for me, so I
can't say for certain that I didn't break anything.

svn-id: r12356
 2004-01-13 10:09:53 +00:00
Max Horn
b04dac03f2 added legal header; fixed incorrect fscanf use; C++ification (the code still is quite Cish, though :-) 
svn-id: r12351
 2004-01-13 01:26:18 +00:00
Torbjörn Andersson
cc67c13711 Don't hog the CPU when playing cutscenes. 
svn-id: r12342
 2004-01-12 16:36:01 +00:00
James Brown
a685422a13 Initial libmpeg2 cutscene support based on patch #874510. 
Pre-converted cutscenes w/ palette files available - ask LeChuck about Cutscenes :)

svn-id: r12338
 2004-01-12 11:11:19 +00:00
Torbjörn Andersson
12cd552cab Allow quitting during cutscenes and credits again. This is getting a bit 
hackish...

svn-id: r12247
 2004-01-08 13:03:50 +00:00
Torbjörn Andersson
6d0dd6aee8 Valgrind fixes. Mostly about memory not being freed when the engine is 
deleted.

svn-id: r12211
 2004-01-07 07:42:00 +00:00
Torbjörn Andersson
065f2bb9eb It's a new year in BS2 land, too! 
svn-id: r12181
 2004-01-06 13:44:17 +00:00
Torbjörn Andersson
8a91ae3257 Adapted LavosSpawn's idea for more efficient screen updating. It still 
renders the entire screen every frame, but it tries to update (i.e. copy to
the backend) only the parts of the screen that actually changed. At least
approximately so.

svn-id: r12142
 2004-01-04 15:11:30 +00:00
Torbjörn Andersson
6ae8218d53 Hopefully the last big renaming. Now the datatypes have names like 
"StandardHeader" instead of "_standardHeader".

svn-id: r11997
 2003-12-28 15:08:12 +00:00
Max Horn
e9269257f3 turned PlayingSoundHandle into an 'opaque' (well not really :-) data type, mainly because people kept (accidentally and sometimes on purpose :-) misusing them 
svn-id: r11881
 2003-12-24 00:25:18 +00:00
Torbjörn Andersson
9a1bbb361b My last commit didn't work on big-endian. Maybe this one does... 
svn-id: r11711
 2003-12-17 11:52:05 +00:00
Torbjörn Andersson
a739f3ae3b The mixer handles little-endian samples now. Take advantage of that. 
svn-id: r11707
 2003-12-17 11:07:40 +00:00
Torbjörn Andersson
ce04dd9f7e Fixed a potential crash bug where an audio buffer would be freed at the end 
of an animated cutscene while the mixer was still using it. Oddly enough, I
didn't encounter this bug when I played through the game recently, but
today it happened every time at the end of the cutscene where Nico finds
the jaguar stone.

svn-id: r11637
 2003-12-14 16:32:21 +00:00
Torbjörn Andersson
a2221c88e9 Sprite surfaces (as opposed to standard sprites) are always display 
aligned, never flipped and never RLE16-compressed. Simplified the code
accordingly. (Displaying the restore dialog when specifying an unused save
slot from the command-line works again now.)

Plus some minor cleanups.

svn-id: r11550
 2003-12-10 08:01:58 +00:00
Torbjörn Andersson
fa2b8ba8de More cleanup. I've eliminated all the temporary global variables I've added 
over the past few weeks, except for g_sword2. (Of course, this doesn't
necessarily make the code any prettier, but we can work on that later.)

svn-id: r11309
 2003-11-16 14:18:29 +00:00
Torbjörn Andersson
446a01ba09 Moved low-level keyboard and mouse handling to a new Input class, and 
renamed the Display class Graphics for no better reason than me liking the
phrase "sound and graphics" better than "sound and display".

svn-id: r11258
 2003-11-11 07:43:02 +00:00
Paweł Kołodziejski
409108df82 cleanup whitespaces 
svn-id: r11212
 2003-11-08 19:47:20 +00:00
Torbjörn Andersson
9106229bef Removed some now redundant header files. 
svn-id: r11209
 2003-11-08 18:15:35 +00:00
Torbjörn Andersson
688c80b062 Moved more stuff into classes, changed some static allocation to dynamic, 
and removed some of the references to global variables.

At this point I believe everything in the main game engine has been moved
into classes - not necessarily the correct ones, but still... However,
there is some stuff in the driver directory that need to be taken care of
as well.

svn-id: r11207
 2003-11-08 15:47:51 +00:00
Torbjörn Andersson
b3b0118292 The resource and memory managers are now created dynamically. 
Renamed the resource manager's open/close methods openResource() and
closeResource() to avoid confusion. (It was I who originally shortened
their names to open() and close(), but I've changed my mind now.)

Moved more stuff into Sword2Engine.

svn-id: r11088
 2003-11-03 07:47:42 +00:00
Max Horn
2fef2dcb84 bs2 -> sword2 
svn-id: r10997
 2003-10-28 19:51:30 +00:00
Torbjörn Andersson
8b42d65a7e Dumped most of the remaining "driver" code into a new "Display" class. This 
touches a lot of the code, of course, and adds yet another global variable
(temporarily, I hope), but everything still seems to work.

Knock on wood.

svn-id: r10806
 2003-10-15 06:40:31 +00:00
Torbjörn Andersson
02a157e745 Moved the text drawing stuff into a class of its own. (Adding another 
global variable which will hopefully be dealt with later.)

svn-id: r10734
 2003-10-11 12:26:53 +00:00
Torbjörn Andersson
7174a32c8e Made a separate class for the cutscene functions, removed some unused code 
and made some other minor cleanups.

svn-id: r10614
 2003-10-05 15:28:15 +00:00
Torbjörn Andersson
4fad04846a Changed to use #include "bs2/..." and removed the inclusion of standard C 
headers. Most (all?) of the ones we need should probably come from stdafx.h
instead.

svn-id: r10588
 2003-10-04 08:07:03 +00:00
Max Horn
5a074e6137 added namespace Sword2 
svn-id: r10581
 2003-10-04 00:52:27 +00:00
Max Horn
0e645f88ae renamed namespace ScummVM to Common 
svn-id: r10544
 2003-10-02 17:43:02 +00:00
Torbjörn Andersson
c8de7d5089 Cleanups, mostly related to sound effects. 
svn-id: r10532
 2003-10-02 07:01:12 +00:00
Torbjörn Andersson
46d195ee02 Clear cutscene subtitles before changing back the palette, and slow down 
the subtitles slightly.

svn-id: r10503
 2003-09-30 16:07:04 +00:00
Torbjörn Andersson
da1b4f1e36 Moved the memory manager functions into an object of its own (and enabled 
debugging levels). This needs further cleanups, but I believe I have
reached a stable point where I can commit it without too much anxiety.

svn-id: r10502
 2003-09-30 14:37:42 +00:00
Torbjörn Andersson
0ac7630ebb cleanup 
svn-id: r10468
 2003-09-28 16:38:00 +00:00
Torbjörn Andersson
49fa159ed4 More cleanup, plus support for cutscene leadout music. For now, we only 
play that music for cutscenes that have subtitles.

svn-id: r10460
 2003-09-28 14:13:57 +00:00
Torbjörn Andersson
1d831d0cea cleanup 
svn-id: r10432
 2003-09-27 17:41:02 +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
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
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
Oliver Kiehl
5b20c4fb91 disable code because it crashes 
svn-id: r10160
 2003-09-10 16:05:26 +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
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