Max Horn
c39aa04c31
cut down pointless header interdependencies
...
svn-id: r12360
2004-01-13 14:22:29 +00:00
Max Horn
34960cf375
Moved some methods into class AnimationState (where they really belong - nicely shown by the fact that now all member vars of AnimationState are private)
...
svn-id: r12359
2004-01-13 14:16:40 +00:00
Torbjörn Andersson
dca14d9532
Some more formatting cleanups. Made the Ogg file handle part of the
...
animation state so that it can be deleted in doneAnimation().
svn-id: r12358
2004-01-13 13:12:40 +00:00
Torbjörn Andersson
13481b82c4
As an experiment, I've added a delay of 0 milliseconds when drawing
...
interpolation frames. It shouldn't delay anything, but I'm hoping it will
allow the other threads some breathing room, which might help bug #875683 .
Or not. We'll see.
svn-id: r12357
2004-01-13 10:27:13 +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
Travis Howell
9471d58720
Add mpeg2 option to mingw makefile
...
Fix compile on mingw
svn-id: r12350
2004-01-12 23:41:05 +00:00
Oliver Kiehl
d794488645
fixed bug that was causing lots of havoc on BE machines. Thanks eriktorbjorn
...
svn-id: r12348
2004-01-12 20:04:22 +00:00
Paweł Kołodziejski
b8e3dda84c
- whitespaces
...
- fix for compilation at MAX, at include types
- changed to our types
svn-id: r12344
2004-01-12 19:08:04 +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
c75f5efd2f
Sync the credits so that the text scroll and music will last for about the
...
same amount of time. I don't think the original did this, but it turned out
to be pretty easy.
svn-id: r12334
2004-01-12 08:01:25 +00:00
Torbjörn Andersson
7309705db5
cleanup
...
svn-id: r12322
2004-01-11 16:53:33 +00:00
Torbjörn Andersson
a7fe335c82
I forgot this in the previous cleanup.
...
svn-id: r12311
2004-01-10 21:56:59 +00:00
Torbjörn Andersson
1db3b65825
cleanup
...
svn-id: r12309
2004-01-10 21:21:20 +00:00
Torbjörn Andersson
06caf87bdc
Removed redundant comment.
...
svn-id: r12282
2004-01-09 15:58:21 +00:00
Torbjörn Andersson
b9c3b7b008
Removed redundant comments.
...
svn-id: r12279
2004-01-09 14:52:39 +00:00
Torbjörn Andersson
638231cc59
Make it possible to quit while showing in-game dialogs. (Regression fix.)
...
svn-id: r12273
2004-01-09 07:54:16 +00:00
Torbjörn Andersson
58c46a2b92
Fix a harmless clipping bug (block surfaces were drawn even when their
...
width or height was 0), and use consistent naming for clip rect parameters.
svn-id: r12272
2004-01-09 07:53:08 +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
60b59de181
Never call _system->quit() directly. Let ScummVM handle that so that the
...
engine can be properly deleted first. Apart from being the nice thing to
do, this should make it easier to Valgrind for memory leaks.
svn-id: r12184
2004-01-06 16:49:04 +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
eb5c4a1449
Made sure the screen is really cleared when drawing a dialog window, plus
...
some other cleanups. (This was a regression caused by the less stupid
screen updates implemented recently.)
svn-id: r12180
2004-01-06 13:33:28 +00:00
Torbjörn Andersson
6a7cf6d6cf
Marked some more structs as packed. I don't know if it makes any
...
difference, as they contain only 32-bit integers, but I also believe it
does no harm.
svn-id: r12159
2004-01-05 14:46:12 +00:00
Torbjörn Andersson
8dabcaaef1
Changed some memmove()s to memcpy(), since the memory areas were not
...
overlapping.
Enabled some sanity-checking code.
Fixed clearWalkGridList() so that it clears the entire walk grid list. That
was a really stupid bug of mine, and I hope it had at least some bearing on
the rare (for me, at least) walk problems I've seen.
svn-id: r12154
2004-01-05 11:09:33 +00:00
Torbjörn Andersson
55167e392e
Tiny cleanup.
...
svn-id: r12153
2004-01-05 11:02:00 +00:00
Torbjörn Andersson
9ea89568da
Fixed some debugging messages so they refer to the correct function.
...
svn-id: r12152
2004-01-05 11:01:12 +00:00
Torbjörn Andersson
5f9cfba548
Slowed down the credits slightly. With the recent optimizations, the music
...
lasted longer than the text. Now the text lasts longer than the music.
svn-id: r12151
2004-01-05 11:00:12 +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
5607f41e2d
Some cleanup and Valgrind warning fixes.
...
svn-id: r12141
2004-01-04 15:05:54 +00:00
Torbjörn Andersson
14acddb167
Update a comment to reflect that some functions have different names now.
...
svn-id: r12140
2004-01-04 14:59:36 +00:00
Max Horn
d1e6c6059e
renamed global var _debugLevel to g_debugLevel; let Engine constructor init it (this way all engines get it for free, allows further cleanup); removed some useless/duplicate member vars in SwordEngine
...
svn-id: r12134
2004-01-04 14:00:58 +00:00
Max Horn
cf6a5c0a04
cleanup
...
svn-id: r12116
2004-01-03 19:12:23 +00:00
Max Horn
ee3558b748
fix for BE systems
...
svn-id: r12115
2004-01-03 19:02:18 +00:00
Torbjörn Andersson
c1cddedca8
Fixed bug that made ScummVM crash when loading a savegame where the main
...
character was walking. (I had missed a case where pointers were cast to
integers.)
svn-id: r12113
2004-01-03 15:52:05 +00:00
Torbjörn Andersson
fa523f7f7e
It was pointed out to me that we can't use the DEMO variable here, because
...
the missing file may be the one with the resource for the global variables.
svn-id: r12112
2004-01-03 14:49:52 +00:00
Max Horn
bfea71b0c4
renamed AudioInputStream -> AudioStream
...
svn-id: r12110
2004-01-03 14:10:13 +00:00
Torbjörn Andersson
bb8ff0cd90
Made the music code more like the one in BS1, i.e. the fade time is longer
...
and it now fades both up and down.
Plenty of cleanups, simplifications and just moving code around to group it
in what I hope is a more logical fashion.
Fixed a long-standing bug where spot effects would eventually use up all
available sound effect handles. (I may have introduced this when I removed
the expiration of sound effects from FxServer().)
svn-id: r12108
2004-01-03 11:24:39 +00:00
Torbjörn Andersson
033a847e77
Oops, that was the wrong data type. (Not that it should matter, but...)
...
svn-id: r12069
2004-01-01 15:15:47 +00:00
Torbjörn Andersson
0d327b3b79
Some tweaking of the new credits code. It is no longer necessary to have
...
to have the credits.bmp file, though if you don't you won't see the
"Smacker" logo. (Whether or not this is a feature is open to debate.)
Happy New Year!
svn-id: r12062
2003-12-31 23:32:40 +00:00
Torbjörn Andersson
2687402c6b
oops, forgot one case
...
svn-id: r12056
2003-12-31 14:10:42 +00:00
Torbjörn Andersson
c85301b2a9
When saving the music state, remember the name of the music file that was
...
open so that it can be re-opened afterwards. It's not so much that it may
have changed, but it may have been closed.
This should fix a crash when escaping the credits.
svn-id: r12055
2003-12-31 14:05:53 +00:00
Torbjörn Andersson
6899aa23cb
I still don't know how to draw the credits like the original did, but at
...
least the credits text is showing now.
svn-id: r12053
2003-12-31 13:14:07 +00:00
Torbjörn Andersson
28eb8c4b76
Don't allow the credits to be displayed while in conversation mode.
...
svn-id: r12052
2003-12-31 12:58:18 +00:00
Torbjörn Andersson
bfd457d913
Enable the line that increases _gameCycle. There's a debugger command that
...
will display it, and it's so much more interesting this way. :-)
svn-id: r12051
2003-12-31 12:54:41 +00:00
Torbjörn Andersson
40419b1aee
tiny cleanup
...
svn-id: r12017
2003-12-29 17:26:56 +00:00
Torbjörn Andersson
ea39ef6d7d
The game sets its own DEMO variable, so we might as well check that one as
...
checking the GF_DEMO flag. (There's still one "unnecessary" reference to
GF_DEMO in functions.cpp, but I plan on rewriting that function soon so I
don't want to touch it right now.)
svn-id: r12009
2003-12-29 15:30:10 +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
859a9c0129
o Added SoundMixer::isReady()
...
o Removed SoundMixer::bindToSystem()
o In scumm, replaced _silentMixer, _silentDigitalImuse and _noDigitalSamples by SoundMixer::isReady()
svn-id: r11893
2003-12-24 17:42:22 +00:00