Commit Graph

96 Commits

Author SHA1 Message Date
Torbjörn Andersson
0e1c4fccca Hopefully fixed the regression described in bug #2299682 ("FT: Crash in the intro
(regression in r34516)"), after discussing with Fingolfin. We didn't use to check
the size of the STRK chunk before, and he didn't remember why we do now, so I've
removed that test again.

svn-id: r35107
2008-11-17 20:36:10 +00:00
Max Horn
9b160804ab Renamed Engine::quit to Engine::shouldQuit (previously, it was easily confused with Engine::quitGame); also cleaned up engine.h a bit
svn-id: r34700
2008-09-30 12:27:38 +00:00
Torbjörn Andersson
8fc8531f70 Since no one has come up with any better suggestion... this should fix #2123258
("COMI: Crash after video (SAN) play"). The eos() function won't return true
until we've tried to read *past* the end of the stream.

svn-id: r34689
2008-09-29 20:40:58 +00:00
Max Horn
706fb37061 Modified uncompress in common/zlib.h to return a bool, so that we don't have to #include the real zlib.h; fixed PSP backend to not run uncompress inside an assert (which would cause it to not be invoked when turning off asserts)
svn-id: r34576
2008-09-16 11:42:21 +00:00
Max Horn
f8ccd2dede SCUMM: Got rid of class Chunk
svn-id: r34518
2008-09-13 22:41:30 +00:00
Max Horn
15d16b94a7 SCUMM: Merged class Chunk & FileChunk
svn-id: r34517
2008-09-13 20:22:52 +00:00
Max Horn
71a204d63c SCUMM: Merged class BaseChunk & Chunk; got rid of MemoryChunk
svn-id: r34516
2008-09-13 20:04:19 +00:00
Max Horn
655ce26b3f Big patch changing the signature of various Stream methods (some ports may need to be slightly tweaked to fix overloading errors/warnings)
svn-id: r34514
2008-09-13 16:51:46 +00:00
Max Horn
5ceb635420 Merging more of the GSoC 2008 RTL branch: SCUMM
svn-id: r34253
2008-09-01 20:20:20 +00:00
Paweł Kołodziejski
1f04462011 remove broken code, but i'll add better feature into compression tool
svn-id: r34119
2008-08-24 07:54:36 +00:00
Kostas Nakos
b809665671 do away with the smush force redraw hack
svn-id: r33991
2008-08-18 17:24:25 +00:00
Christopher Page
d2e8d4831e Merged revisions 32744-32745,32747,32750-32759,32762-32764,32769,32777,32783,32785-32786,32789-32791,32798-32799,32801-32807,32809-32812,32816-32817,32819-32821,32823-32830,32832-32836,32838-32844,32846-32850,32852-32854,32858-32859,32865-32868,32873-32874,32879,32883,32895,32899,32902-32904,32910-32912,32923-32924,32930-32931,32938,32940,32948-32949,32951,32960-32964,32966-32970,32972-32974,32976,32978,32983,32986-32990,32992,32994,33002-33004,33006-33007,33009-33010,33014,33017,33021-33023,33030,33033 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33051
2008-07-14 00:10:09 +00:00
Christopher Page
e9c6b03fc7 SCUMM works with new GMM implementation
svn-id: r33001
2008-07-11 01:22:37 +00:00
Lars Persson
fafda89d0c Fixed Symbian buildsystem for new defines. Fixed ARM asm syntax for Symbian build.
svn-id: r32803
2008-06-26 16:51:02 +00:00
Johannes Schickel
311e9165ed Proper delete[] formatting (this time all occurences should've been changed...)
svn-id: r31929
2008-05-07 15:09:10 +00:00
Johannes Schickel
600ab40bca Changed all delete [] usages to delete[].
svn-id: r31927
2008-05-07 14:31:45 +00:00
Jordi Vilalta Prat
38a8aa516e Allow static and dynamic plugins to be used at the same time
svn-id: r31888
2008-05-06 03:00:26 +00:00
Robin Watts
1cf9fc944a Make codec47 cope with failed mallocs.
Not the nicest result in the world, but better than crashing and burning...

svn-id: r30934
2008-02-23 18:57:49 +00:00
Jordi Vilalta Prat
d6c34bdc4b Fixed the spaces before tabs.
svn-id: r30667
2008-01-28 00:14:17 +00:00
Torbjörn Andersson
173988960b Initialise _lastTableWidth. (Fixes Valgrind warning.)
svn-id: r30497
2008-01-15 20:06:41 +00:00
Oystein Eftevaag
1c88ab2c47 Enabling the SMUSH/sound ARM optimizations for the iPhone. Converting any numerical expressions in the asm to absolute values (moving the expression to comments) since the iPhone assembler can't handle them, and prepending an underscore to the exported symbols (with some preprocessor magic similar to the hq3x asm for handle ports where it's not needed)
svn-id: r30093
2007-12-31 01:50:18 +00:00
Eugene Sandulenko
ac54f3a26f Patch #1858158: BUILD: Plugin building cleanup
svn-id: r30041
2007-12-28 07:52:56 +00:00
Nicola Mettifogo
258901bab9 Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.
svn-id: r28966
2007-09-19 08:40:12 +00:00
Max Horn
0cccbb29d6 Some cleanup (yay for whomever had the brilliant idea to let SVN work over HTTPS and hence through proxies&firewalls :)
svn-id: r28877
2007-09-08 11:15:27 +00:00
Chris Apers
500481c4ec Cleanup: remove obsolete code (PalmOS 68K version not supported anymore)
svn-id: r28803
2007-09-01 19:13:04 +00:00
Max Horn
86d015c055 Added FIXME comments regarding use of AudioStream::openStreamFile
svn-id: r28112
2007-07-15 19:26:00 +00:00
Max Horn
f4c0b853cc Fixed sound factory messup caused by my previous commit
svn-id: r28111
2007-07-15 19:24:00 +00:00
Paweł Kołodziejski
c88567aa79 added arm assembly from patch #1742112 for codec47. (and really build arm code this time)
svn-id: r27685
2007-06-24 07:02:55 +00:00
Max Horn
218e132e37 Updated legal headers in source files, based on what Pidgin (the IM client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots
svn-id: r27024
2007-05-30 21:56:52 +00:00
Max Horn
00b9bc7b36 Removing lots of superfluous semicola (see mail by David Weinehall on scummvm-devel)
svn-id: r26594
2007-04-25 19:31:23 +00:00
Lars Persson
4c82e3ac23 Special filehandling for Symbian OS not needed in smushplayer anymore.
svn-id: r26106
2007-03-12 19:53:36 +00:00
Max Horn
5e2fe7dc7f cleanup
svn-id: r25910
2007-02-28 15:04:02 +00:00
Max Horn
8c8abca6f8 Changed the AppendableAudioStream code to use a queue of buffers, instead of a fixed size wrap-around memory buffer (this reduces memory usage in some cases by 500-700k, while actually being more flexible)
svn-id: r25909
2007-02-28 14:48:26 +00:00
Torbjörn Andersson
c64be322a1 Added comment about the missing decode1 proc.
svn-id: r25849
2007-02-25 08:37:15 +00:00
Max Horn
497f7683ca Another Ogg > MP3 consistency reordering, this time in the SMUSH code; also changed it to use the new compressed audio stream factories
svn-id: r25843
2007-02-25 00:12:11 +00:00
Torbjörn Andersson
a1a16d1579 Use consistent naming for the preprocessor constants used to guarantee that
header files are only included once. Many of them didn't have a SCUMM prefix
which could have lead to clashes with common header files.

svn-id: r25727
2007-02-19 17:48:19 +00:00
Gregory Montoir
f1f88c43c0 cleanup
svn-id: r25646
2007-02-17 01:33:47 +00:00
Torbjörn Andersson
9ad0fdda96 Clear _pauseTime in seekSan(). Hopefully, this will fix the problem with
pausing during the bike fight scenes in Full Throttle that was reported on the
forum earlier today.

svn-id: r25609
2007-02-15 17:26:08 +00:00
Gregory Montoir
9c7dd91626 removed unneeded/unnecessary variables and made SmushFont table private (to ensure getFont() get called to access them)
svn-id: r25352
2007-02-03 17:55:49 +00:00
Torbjörn Andersson
ea40535678 Applied the revised NUT font renderer patch #1635584, which combines cyx's
patch for correct (not to mention more efficient) rendering of CMI's shadowed
letters, while retaining most of the memory savings of my original patch. This
time, SMUSH and INSANE fonts also benefit from it.

svn-id: r25345
2007-02-03 05:50:35 +00:00
Gregory Montoir
6166c0ca19 reset _IACTpos when _IACTchannel is stopped (fixes memory overwrites in handleIACT during smush playback at the end of CMI demo)
svn-id: r25296
2007-01-31 00:16:21 +00:00
Gregory Montoir
9abaa064a0 got rid of codec37/codec47 init/deinit methods, cleanup
svn-id: r25295
2007-01-30 22:44:14 +00:00
Gregory Montoir
b4bebad6f0 minor simplification
svn-id: r25289
2007-01-30 20:43:39 +00:00
Gregory Montoir
cb258bee24 added deinitialisation of codecs at the end of smush playback. This allows to save a bit of memory (about 1Mb for CMI) during gameplay.
svn-id: r25287
2007-01-30 20:36:03 +00:00
Gregory Montoir
2b61c0d6c1 cleanup (made NutRenderer::loadFont protected, added call during initialisation of the renderer object)
svn-id: r25223
2007-01-27 02:26:37 +00:00
Torbjörn Andersson
aaa2973bac Applied my own patch #1640913 ("Loading NUT fonts on demand"), after discussing
it with Fingolfin.

svn-id: r25221
2007-01-27 01:50:41 +00:00
Torbjörn Andersson
01a5faa6a0 Applied my own patch #1635584 (after discussing with Fingolfin) to reduce the
memory usage and number of allocations made by the NUT font renderer.

svn-id: r25155
2007-01-21 17:14:53 +00:00
Torbjörn Andersson
37f94f7cba Hopefully fixed the SAN seeking (used by Full Throttle's bike fighting) that I
accidentally broke when removing the timer callback from the SMUSH player.

svn-id: r25120
2007-01-18 22:08:02 +00:00
Max Horn
1a2853f7e0 Patch from bug #1584888 (SMUSH: Too dependent on accurate timers). Watch out for regressions in SMUSH movie playback / syncing
svn-id: r24709
2006-11-13 19:46:52 +00:00
Max Horn
e7dc2c0d0c Workaround for bug #1586894
svn-id: r24582
2006-11-01 21:09:25 +00:00