Commit Graph

259 Commits

Author SHA1 Message Date
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
Max Horn
6b58973536 SCI: Renamed SongIteratorMessage -> SongIterator::Message; cleanup
svn-id: r39289
2009-03-10 02:42:22 +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
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
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
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
Max Horn
efa5493b2d SCI: Changed suffix list to be stored as a Common::List; also fixed spelling: suffices -> suffixes
svn-id: r39214
2009-03-08 08:17:43 +00:00
Max Horn
f9ecd95d69 Whitespace cleanup: Convert space followed by tab to just tab
svn-id: r39203
2009-03-07 19:24:31 +00:00
Max Horn
2dfae035ac SCI: Reduced header interdependencies some more
svn-id: r39202
2009-03-07 19:23:47 +00:00
Filippos Karapetis
5c8ea3ccf4 Updated savegame.cfsml
svn-id: r39198
2009-03-07 18:43:15 +00:00
Filippos Karapetis
1e29983d8e Replaced getInt16, getUInt16 and putInt16
svn-id: r39189
2009-03-07 16:14:20 +00:00
Max Horn
c2f08b10d2 SCI: More cleanup in the song iterator codebase
svn-id: r39177
2009-03-07 06:56:39 +00:00
Max Horn
54e1256b0e SCI: Reduce SFX header dependencies
svn-id: r39159
2009-03-06 18:11:12 +00:00
Max Horn
763275f269 SCI: Continued C++ification of SongIterator code
svn-id: r39158
2009-03-06 17:53:11 +00:00
Max Horn
0f3d67c1ac SCI: C++ifyed SongIterator and its subclasses
svn-id: r39152
2009-03-06 07:25:48 +00:00
Max Horn
018d19e020 SCI: Some cleanup to the SongIteratorMessage code
svn-id: r39151
2009-03-06 07:25:37 +00:00
Max Horn
24dac898fe SCI: Converted SongIterator::get_pcm_feed into a virtual method
svn-id: r39150
2009-03-06 07:25:25 +00:00
Max Horn
5e2ee01b39 SCI: Renamed lots of classes related to song iterators; allocate song iterators via new/delete instead of malloc/free
svn-id: r39148
2009-03-06 07:25:06 +00:00
Max Horn
e783859d5c SCI: Replaced sfx_iterator_make_feed and associated code by Audio::makeLinearInputStream
svn-id: r39115
2009-03-04 07:31:31 +00:00
Max Horn
66b78a81dd SCI: Moved script.cpp from scicore/ to engine/ (because its header file is there, and it seems its funcs are only called from stuff in engine/)
svn-id: r39108
2009-03-04 05:25:31 +00:00
Max Horn
900fdc514c SCI: Reduce header interdeps
svn-id: r39107
2009-03-04 05:22:29 +00:00
Max Horn
302a99a2c0 SCI: cleanup
svn-id: r39106
2009-03-04 05:19:19 +00:00
Greg Frieger
cbb6f91967 SCI1: Improved color mapping when drawing line/box/text. Text with transparent background now displays correctly.
svn-id: r39089
2009-03-03 14:27:49 +00:00
Willem Jan Palenstijn
0e134d5871 Partial revert of "Fix handling of parentheses in said specs" (20080705)
This fixes, among other things, "get up" followed by "get shirt"
at the start of Iceman.

svn-id: r39060
2009-03-01 22:19:49 +00:00
Max Horn
7ee049ab8f SCI: Forgot to commit a couple files after renaming sfx headers
svn-id: r39010
2009-03-01 06:17:52 +00:00
Max Horn
25e7d3a08d SCI: Renamed some sfx header files
svn-id: r39006
2009-03-01 06:02:17 +00:00
Greg Frieger
ce42d6e538 Fixed windows and text drawing problem in SCI1
svn-id: r39000
2009-03-01 04:07:04 +00:00
Jordi Vilalta Prat
82872a7033 SCI: Start converting MessageState into a class
svn-id: r38989
2009-03-01 00:18:30 +00:00
Jordi Vilalta Prat
7050c7b03f SCI: Use the ResourceType enum instead of integers where it makes sense
svn-id: r38988
2009-02-28 23:46:50 +00:00
Max Horn
d7b06b7d42 SCI: Renamed ResourceManager::sci_version to _sciVersion, to avoid var shadowing warnings; some other tweaks
svn-id: r38984
2009-02-28 22:19:22 +00:00
Willem Jan Palenstijn
e159979869 strip trailing newline in SCI debugger
svn-id: r38983
2009-02-28 22:10:07 +00:00
Greg Frieger
61ab59138a resource_t struct replaced with stub Resource class for future objectifying. Also the crash when exiting SCI1 games was fixed
svn-id: r38982
2009-02-28 21:59:49 +00:00
Greg Frieger
4dd1b7dad5 Turned ResourceManager into a class, along with all related functions
svn-id: r38978
2009-02-28 20:45:36 +00:00
Andre Heider
b2cd5beb9e clean up some warnings
svn-id: r38965
2009-02-28 13:41:43 +00:00
Jordi Vilalta Prat
501e4bb91a SCI: Renamed some kernel types and general cleanup
svn-id: r38961
2009-02-28 11:12:59 +00:00
Willem Jan Palenstijn
3bfc345350 Add support for saving Common::String objects.
Use it to simplify SavegameMetadata handling.

svn-id: r38959
2009-02-28 11:07:36 +00:00
Willem Jan Palenstijn
4febcde170 Make CFSML writers take const arguments
svn-id: r38952
2009-02-28 10:05:07 +00:00
Willem Jan Palenstijn
fb8fafaf56 Fix reading corrupted saves.
svn-id: r38934
2009-02-27 19:50:22 +00:00
Willem Jan Palenstijn
fb552121d2 fix warnings and memleaks in savegame.cfsml
svn-id: r38933
2009-02-27 19:38:20 +00:00
Willem Jan Palenstijn
ede680738b sync savegame.cfsml with include/ dir changes
svn-id: r38932
2009-02-27 19:37:29 +00:00
Eugene Sandulenko
d53c75fc8f Fix code formatting
svn-id: r38930
2009-02-27 12:59:02 +00:00
Max Horn
c053ef8c87 SCI: Remove empty include/ dir
svn-id: r38922
2009-02-27 02:24:29 +00:00
Max Horn
479751104f SCI: Renamed include/engine.h to engine/state.h; added a corresponding .cpp file with the EngineState constructor
svn-id: r38921
2009-02-27 02:23:40 +00:00