Commit Graph

608 Commits

Author SHA1 Message Date
Max Horn
ca4bdb8572 SCI: Removed some dead code
svn-id: r39349
2009-03-12 02:40:04 +00:00
Filippos Karapetis
26135a175c Changed a case inside inline_lookup_node() to non-fatal, for now, to make it possible to walk around in SQ4 (check the FIXME comment)
svn-id: r39348
2009-03-11 23:47:00 +00:00
Filippos Karapetis
966972def6 Fixed another crash right at the beginning of SQ4
svn-id: r39347
2009-03-11 23:44:22 +00:00
Greg Frieger
35d0744f31 ResourceManager:
- RESOURCE.MSG and MESSAGE.MAP added to source List
- Small changes in patch processing code to avoid loading wrong files

svn-id: r39345
2009-03-11 22:52:54 +00:00
Filippos Karapetis
88b44cef24 Fix heap corruption when assigning the save game directory
svn-id: r39343
2009-03-11 22:50:06 +00:00
Greg Frieger
eca41c0d11 ResourceManager:
- Keep a list of opened volumes to avoid redundant file opens
- Internal functions moved from public to protected

svn-id: r39334
2009-03-11 20:15:42 +00:00
Filippos Karapetis
3e7fe64a22 Untangled the parameters in gfxr_interpreter_get_view() as well. Updated comments
svn-id: r39332
2009-03-11 17:09:30 +00:00
Filippos Karapetis
aacb916e5e Got rid of misc_payload and stopped passing the whole graphics state structure in places where it's not necessary
svn-id: r39331
2009-03-11 16:50:12 +00:00
Johannes Schickel
35c4aec93f Formatting.
svn-id: r39330
2009-03-11 16:13:28 +00:00
Greg Frieger
17664dce40 More clean-ups in decompression classes
svn-id: r39329
2009-03-11 04:38:54 +00:00
Max Horn
862c9547c6 SCI: Removed some dead code
svn-id: r39328
2009-03-11 02:32:20 +00:00
Max Horn
b52025ec82 ...
svn-id: r39327
2009-03-11 02:16:21 +00:00
Max Horn
e3b5e5a74c SCI: Restored code to triger debugger console by Ctrl-d (accidentally removed it in rev 39201)
svn-id: r39326
2009-03-11 02:05:49 +00:00
Max Horn
47cf6a0151 SCI: Formatting changes (using astyle)
svn-id: r39325
2009-03-11 01:40:08 +00:00
Max Horn
486900a8e5 SCI: Fix warning
svn-id: r39324
2009-03-11 00:41:31 +00:00
Greg Frieger
738160d17a Some clean-up of DecompressorComp3 class
svn-id: r39323
2009-03-11 00:23:18 +00:00
Johannes Schickel
e7d806188f Yet another few tiny formatting fixes.
svn-id: r39320
2009-03-10 22:30:38 +00:00
Johannes Schickel
91ce0ce123 Formatting.
svn-id: r39319
2009-03-10 22:18:16 +00:00
Johannes Schickel
b4ef8aba75 Made Decompressor's destructor virtual. (fixes compilation and should fix possible leaks)
svn-id: r39318
2009-03-10 22:11:11 +00:00
Filippos Karapetis
54e2aedb46 Added FIXME for heap corruption occurring when exiting SCI games
svn-id: r39315
2009-03-10 22:04:48 +00:00
Greg Frieger
0a38541cc5 Resource decompression functions moved to scicore\decompressor.cpp and turned into classes.
svn-id: r39311
2009-03-10 21:44:03 +00:00
Max Horn
d5d7bd73d5 SCI: Moved cfsml.pl from tools/ to tools/sci/; also fixed circular dependency
svn-id: r39308
2009-03-10 19:20:32 +00:00
Max Horn
ba0d429694 SCI: EVIL temporary hack to ensure savegame.cpp is rebuilt when any of the headers it uses have been changed (to track mistakes like me forgetting to rename SongIteratorMessage -> SongIterator::Message in the CFSML, too). If anybody knows how one can 'copy' the dependencies of one target and add them to another, please let me know.
svn-id: r39307
2009-03-10 19:17:52 +00:00
Max Horn
1bc84955a3 SCI: Removing unused line from savegame.cfsml, fixing SongIteratorMessage -> SongIterator::Message in it
svn-id: r39306
2009-03-10 19:11:35 +00:00
Max Horn
4da6fbbb76 SCI: Memory 'ref counting' code is only used by song iterators -> move it there, make it private (to be replaced one day by something else, e.g. Common::SharedPtr)
svn-id: r39305
2009-03-10 19:08:07 +00:00
Johannes Schickel
39359479ea - Fix code indentation
- Some (minor other) fromatting fixes

svn-id: r39304
2009-03-10 18:42:18 +00:00
Filippos Karapetis
2a4c6bdb71 Added missing SVN keywords
svn-id: r39303
2009-03-10 18:35:13 +00:00
Filippos Karapetis
073a1b3f96 Formatted code to conform to our coding standards. Also, added parentheses to clarify "&" operator precedence
svn-id: r39302
2009-03-10 18:33:36 +00:00
Johannes Schickel
74cea8d75d - Fix warning
- Fix missing return in stringfrag_getchar (someone check out the FIXME there, please)

svn-id: r39301
2009-03-10 18:22:10 +00:00
Lars Skovlund
9b4f52aefd Add missing file.
svn-id: r39300
2009-03-10 18:10:22 +00:00
Lars Skovlund
49393c79e5 Minor fix to deallocate STRING_FRAG segments properly
svn-id: r39299
2009-03-10 17:41:58 +00:00
Filippos Karapetis
d8824d631a Fixed warnings
svn-id: r39298
2009-03-10 16:24:40 +00:00
Lars Skovlund
3cddcb1660 String fragments support
WIP: No regressions in this part, I hope

svn-id: r39297
2009-03-10 14:52:02 +00:00
Travis Howell
4de1cd89ca Fix compile of SCI engine.
svn-id: r39295
2009-03-10 11:16:07 +00:00
Filippos Karapetis
d7b767d90c Reverted some of the changes of commit #39192. The cursor reading code has been placed back in a separate file, and not in the resource manager (but it's now 1 function)
svn-id: r39293
2009-03-10 10:55:36 +00:00
Filippos Karapetis
c908f3c332 - Renamed files inside gfx/resource
- Merged sci_picfill_aux.cpp and sci_picfill.cpp into picfill.cpp (as this is the only place where the auxiliary fill functions are used)

svn-id: r39292
2009-03-10 10:36:43 +00:00
Max Horn
7f1a9b385d SCI: SongIterator::Message only needs to transfer a single argument, so get rid of the second slot
svn-id: r39290
2009-03-10 02:57:30 +00:00
Max Horn
6b58973536 SCI: Renamed SongIteratorMessage -> SongIterator::Message; cleanup
svn-id: r39289
2009-03-10 02:42:22 +00:00
Max Horn
842a42b1bd SCI: More SongIterator refactoring.
* Added SongIterator::clone()
* got rid of songit_clone()
* removed SIMSG_CLONE and related code
* removed SongIterator::flags
* turned songit_new_tee into TeeSongIterator constructor

svn-id: r39288
2009-03-10 02:41:56 +00:00
Max Horn
6c93249715 SCI: result_word_t -> ResultWord; switched to Common::List for storing lists of ResultWords
svn-id: r39278
2009-03-09 22:25:33 +00:00
Willem Jan Palenstijn
1e4c9488f2 Don't adjust data pointer in makeStream.
It is already adjusted in getAudioStream.

svn-id: r39276
2009-03-09 21:11:39 +00:00
Willem Jan Palenstijn
a00559136f Fix uninitialized color meta-values.
This fixes holes in text boxes in Iceman, among other things.

svn-id: r39274
2009-03-09 20:31:43 +00:00
Max Horn
7ec2a98177 SCI: Added BaseSongIterator copy constructor which invokey sci_refcount_incref
svn-id: r39273
2009-03-09 19:55:18 +00:00
Willem Jan Palenstijn
d2514d20b9 Reset child iterators on deletion.
This fixes an illegal access in ~TeeSongIterator.

svn-id: r39272
2009-03-09 19:44:10 +00:00
Max Horn
4e6a7d83d1 SCI: Rewrote handling of song wakeup times & (iterator) delays, to avoid rounding issues between ticks (1/60s) and milliseconds; also fixed a bug (coming from Glutton ;) where delays measured in millisecs were treated as ticks instead. Thanks to Walter for the precursor of this patch
svn-id: r39263
2009-03-09 16:15:35 +00:00
Sven Hesse
6ccb7bea5b Added more missing NULLing
svn-id: r39246
2009-03-08 22:44:47 +00:00
Johannes Schickel
9068ae8424 Formatting.
svn-id: r39245
2009-03-08 21:05:39 +00:00
Johannes Schickel
e123621cf9 Fix warning.
svn-id: r39244
2009-03-08 20:51:30 +00:00
Willem Jan Palenstijn
77d056654f Fix missing return.
svn-id: r39243
2009-03-08 20:43:36 +00:00
Willem Jan Palenstijn
ced40b2266 Use new Palette class to manager pixmap palettes.
There are some remaining regressions with text colour in SCI1 games,
but overall it should fix more than it breaks.

svn-id: r39242
2009-03-08 20:17:01 +00:00