Commit Graph

29811 Commits

Author SHA1 Message Date
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
Fabio Battaglia
cbfd80a5d1 Fix GMM loading disabled after loading savegame from ScummVM menu
svn-id: r39296
2009-03-10 13:48:42 +00:00
Travis Howell
4de1cd89ca Fix compile of SCI engine.
svn-id: r39295
2009-03-10 11:16:07 +00:00
Filippos Karapetis
519e16b9e2 Updated the MSVC project files of the SCI engine and ScummVM
svn-id: r39294
2009-03-10 11:00:50 +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
Scott Thomas
a4ad40235c Fix graphics corruption in 11H FMV streams
svn-id: r39291
2009-03-10 07:35:06 +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
073cc060e9 Fixed warning in list code
svn-id: r39287
2009-03-10 02:41:35 +00:00
Max Horn
30856ddc4d SCUMM: Fix snap scroll dialog messages
svn-id: r39286
2009-03-10 00:44:33 +00:00
Travis Howell
d666af279c Alter/revert last changes to moveCamera(), as VAR_CAMERA_FAST_X is used by a few scripts in Indy3 too.
svn-id: r39285
2009-03-10 00:36:56 +00:00
Florian Kagerer
f2a066e42f LOL: - some opcodes and interface code so that you can at least get out of the shops and Geron's room
svn-id: r39284
2009-03-10 00:32:20 +00:00
Travis Howell
2809c23fc9 Add snap scroll option from original games (SCUMM3-5), and enable for earlier games too.
svn-id: r39283
2009-03-10 00:26:40 +00:00
Jordi Vilalta Prat
940f19dc23 Groovie: Initial support for different opcode sets
svn-id: r39282
2009-03-10 00:19:44 +00:00
Eugene Sandulenko
52b52d3c5e Fix for bug #2671611: T7G: Checksums for unknown english 7th Guest cd version
Now instead of showing partial list of files detector will provide "submit
md5" message only if at least one entry with every file present will be
found.

svn-id: r39281
2009-03-09 23:08:44 +00:00
Johannes Schickel
00c6d2c91c Fix compiler warnings.
svn-id: r39280
2009-03-09 22:39:53 +00:00
Max Horn
5181546c63 Rewrote Common::List iterator code to ensure const correctness is preserved.
We tried to implement the list iterators in a clever way, to reduce code
duplication. But this is essentially impossible to do properly, sadly --
this is one of the places where the ugly drawbacks of C++ really show.
As a consequence, our implementation had a bug which allowed one to
convert any const_iterator to an iterator, thus allowing modifying
elements of const lists.

This rewrite reintroduces code duplication but at least ensures that no
const list is written to accidentally.

Also fix some places which incorrectly used iterator instead of const_iterator
or (in the kyra code) accidentally wrote into a const list.

svn-id: r39279
2009-03-09 22:26:02 +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
Travis Howell
f3e50fba7c Personal Nightmare is part of the AGOS engine.
svn-id: r39277
2009-03-09 21:42:10 +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
Florian Kagerer
cbf2602783 LOL: - fixed inventory bug
- fixed monster speed

svn-id: r39275
2009-03-09 20:34:36 +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
Benjamin Haisch
f525575495 - Applied patch #2668849 by sunmax
svn-id: r39271
2009-03-09 18:19:53 +00:00
Benjamin Haisch
72897a4b09 Added LGOP2 detection entries:
- German, supplied by windlepoons (bug tracker #2675695)
- French and Spanish, supplied by goodoldgeorg (bug tracker #2675759)

svn-id: r39270
2009-03-09 18:03:46 +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
Max Horn
77b40251ca Added some more Audio::Timestamp unit tests
svn-id: r39262
2009-03-09 16:15:25 +00:00
Travis Howell
b771aa5f0d Add more code differences in PN.
svn-id: r39261
2009-03-09 08:38:02 +00:00
Travis Howell
2ff57df1e5 Cleanup.
svn-id: r39260
2009-03-09 04:37:31 +00:00
Travis Howell
93deecccef Minor cleanup.
svn-id: r39259
2009-03-09 04:16:27 +00:00
Travis Howell
269754759f Changed _inputting & _inputReady from uint8 to bool.
svn-id: r39258
2009-03-09 03:58:18 +00:00
Max Horn
7cd40da1be Added some comments to Audio::Timestamp
svn-id: r39257
2009-03-09 03:45:40 +00:00
Max Horn
563d76d342 AGOS: Changed _leftButtonDown & _rightButtonDown from byte to int
svn-id: r39256
2009-03-09 03:45:33 +00:00
Max Horn
e080a59337 Renamed SMKPlayer -> SmackerDecoder and DXAPlayer -> DXADecoder, as well as some other tweaks
svn-id: r39255
2009-03-09 03:45:23 +00:00
Max Horn
93240b003a cleanup ;-)
svn-id: r39254
2009-03-09 02:50:25 +00:00
Travis Howell
2bd2fe43c5 Change Personal Nightmare support to optional, until setjmp/longjmp code is converted.
svn-id: r39253
2009-03-09 02:25:29 +00:00
Travis Howell
b2d49eaeef Add comment to getlong().
svn-id: r39252
2009-03-09 02:07:06 +00:00
Florian Kagerer
76ab92f8ec LOL: added scene animations (like that fountain right at the start)
svn-id: r39251
2009-03-09 01:57:42 +00:00
Florian Kagerer
6d9a047276 LOL: minor fix for text displayer (text pages now advance automatically when the speech has reached the next part)
svn-id: r39250
2009-03-09 00:54:27 +00:00