Matthew Hoops
a5e6684151
Re-enable kq1 SCI Amiga and Mixed Up Mother Goose SCI Amiga.
...
svn-id: r38789
2009-02-22 18:31:40 +00:00
Matthew Hoops
20eb924bb1
Add Cascade Quest and the SCI Companion Template (fan games)
...
svn-id: r38788
2009-02-22 17:54:38 +00:00
Matthew Hoops
8fb7fd0681
Add detection entries for the SCI Fangames.
...
svn-id: r38785
2009-02-22 14:40:56 +00:00
Sven Hesse
462ef2c78c
Clipping the rendering to the output surface.
...
This should fix the crash in the Italian version of Woodruff (#1981031 - "Crash after dancing at Puh-Let Party!!")
svn-id: r38784
2009-02-22 14:04:07 +00:00
Jordi Vilalta Prat
b5ce8d9320
Whitespace cleanup
...
svn-id: r38783
2009-02-22 13:11:43 +00:00
Jordi Vilalta Prat
ac409a2ab7
SCI: Converted "segment interfaces" into classes
...
svn-id: r38782
2009-02-22 12:18:22 +00:00
Andre Heider
7d21acd18b
replace sci_gettime in gfx/
...
svn-id: r38781
2009-02-22 10:20:45 +00:00
Max Horn
d9a98ddc21
SCI: cleanup
...
svn-id: r38779
2009-02-22 04:22:53 +00:00
Max Horn
a4968c1cf6
SCI: Resolve FIXME in decompression code
...
svn-id: r38778
2009-02-22 04:04:33 +00:00
Max Horn
a44fd9f967
cleanup
...
svn-id: r38777
2009-02-22 04:04:03 +00:00
Travis Howell
edc73529af
Add resource version option to game detection table, for games version(s) with undetected/unexpected resource types.
...
svn-id: r38776
2009-02-22 03:40:51 +00:00
Filippos Karapetis
fcf5e87de6
- Made ResourceManager accessible from _vm
...
- Replaced c_version by its corresponding ScummVM equivalent command
svn-id: r38775
2009-02-22 01:33:16 +00:00
Matthew Hoops
85fe96b72d
Add remapping of Amiga version strings and re-enable detection of kq5 amiga.
...
svn-id: r38774
2009-02-22 01:11:06 +00:00
Filippos Karapetis
a46a2d9c92
Fixed compilation under Windows
...
svn-id: r38770
2009-02-22 00:38:39 +00:00
Paul Gilbert
c0e132a826
Added MD5 for Orion Burger Russian version
...
svn-id: r38769
2009-02-21 23:44:17 +00:00
Jordi Vilalta Prat
817fde6cdd
SCI: Convert the segment manager into a class
...
svn-id: r38767
2009-02-21 23:27:24 +00:00
Florian Kagerer
b5b4cb66a1
LOL: implemented timers (only text fading for now)
...
svn-id: r38766
2009-02-21 23:20:14 +00:00
Willem Jan Palenstijn
b18ccb755a
multiply before dividing to improve timer resolution
...
svn-id: r38765
2009-02-21 23:16:03 +00:00
Max Horn
ebc3de4a82
cleanup
...
svn-id: r38764
2009-02-21 22:59:50 +00:00
Max Horn
7a12a67ce8
SCI: Moved aatree.* files together into engine/
...
svn-id: r38763
2009-02-21 22:54:15 +00:00
Max Horn
6f13850161
SCI: Moved include/menubar.h -> gfx/menubar.h, untangled headers some more
...
svn-id: r38761
2009-02-21 22:50:35 +00:00
Max Horn
d6e397233f
SCI: More cleanup
...
svn-id: r38758
2009-02-21 22:40:58 +00:00
Joost Peters
41b1f19a5d
add entries for my SQ4CD, SQ6CD, LSL6CD and LSL7 versions
...
svn-id: r38757
2009-02-21 22:38:17 +00:00
Willem Jan Palenstijn
145d5c4493
fix hang on 64bit platforms
...
svn-id: r38756
2009-02-21 22:35:35 +00:00
Max Horn
b18c96ca87
SCI: Replaced evil MIDI_WRITER_BODY with C++ subclassing; some compile fixes to currently unused files
...
svn-id: r38755
2009-02-21 22:14:26 +00:00
Joost Peters
a84e6c89ac
re-add PQ3 & PQ4 from the PQ collection
...
svn-id: r38754
2009-02-21 22:13:59 +00:00
Max Horn
8430b662a9
SCI: Changed typedef struct -> struct
...
svn-id: r38752
2009-02-21 22:06:42 +00:00
Joost Peters
da190b30fc
re-add LSL1VGA, LSL2, LSL5 and LSL6 from the LSL collection with the correct SCI version
...
svn-id: r38751
2009-02-21 22:03:58 +00:00
Andre Heider
9ce5092be4
substituted some more sci_gettime
...
svn-id: r38749
2009-02-21 22:00:24 +00:00
Max Horn
dbafa5c456
SCI: Removed c_sleep console command (what was/is the idea behind that one, anyway?)
...
svn-id: r38748
2009-02-21 21:22:50 +00:00
Max Horn
6288e0456f
SCI: Removed setjmp code
...
svn-id: r38747
2009-02-21 21:22:07 +00:00
Max Horn
ff17899d8e
SCI: Got rid of include/scitypes.h
...
svn-id: r38746
2009-02-21 21:16:41 +00:00
Max Horn
2acb44d157
SCI: Changed WRITE_UINT16 -> WRITE_LE_UINT16 and READ_UINT16 -> READ_LE_UINT16 (oops)
...
svn-id: r38745
2009-02-21 21:07:51 +00:00
Willem Jan Palenstijn
7570cfcb57
use LE functions for getInt16/putInt16
...
svn-id: r38744
2009-02-21 21:05:16 +00:00
Max Horn
041869ed36
SCI: Untangling #include dependencies a bit
...
svn-id: r38740
2009-02-21 19:54:15 +00:00
Max Horn
05107eaac1
SCI: Changed getUInt16->READ_UINT16 and putInt16->WRITE_UINT16 in scicore/decompress01.cpp
...
svn-id: r38738
2009-02-21 19:52:40 +00:00
Eugene Sandulenko
c6e27ebfcd
Fix compilation by implicit including of sys/stat.h
...
svn-id: r38736
2009-02-21 19:35:30 +00:00
Max Horn
eb37789f6f
SCI: Renamed include/gfx_*.h to gfx/gfx_*.h and likewise for sfx header files
...
svn-id: r38735
2009-02-21 19:33:01 +00:00
Max Horn
1bbde7be4e
SCI: Changed decompressors to take advantage of Common::ReadStream::readUint16LE; cleanup
...
svn-id: r38733
2009-02-21 19:27:06 +00:00
Andre Heider
c9793552af
replace sci_gettime
...
svn-id: r38730
2009-02-21 19:16:38 +00:00
Max Horn
6f022278e6
SCI: Removed unused header
...
svn-id: r38729
2009-02-21 19:06:34 +00:00
Max Horn
f00f020d08
SCI: Moved sci_dir_t and GTimeVal to tools.h
...
svn-id: r38728
2009-02-21 19:04:27 +00:00
Max Horn
c5e00f3de2
SCI: More cleanup
...
svn-id: r38725
2009-02-21 19:01:32 +00:00
Filippos Karapetis
6bb73e3b68
Fixed startup of my floppy version of SQ4
...
svn-id: r38724
2009-02-21 18:58:32 +00:00
Filippos Karapetis
9260fd38b8
Fixed compilation under MSVC
...
svn-id: r38723
2009-02-21 18:56:17 +00:00
Filippos Karapetis
9036c0fee0
Renamed SCI's console to sciconsole (MSVC has problems with files with the same name under different directories). ScummVM's console can be enabled correctly under MSVC now
...
svn-id: r38722
2009-02-21 18:46:03 +00:00
Max Horn
9f2c0dcc6f
SCI: Tons of cleanup
...
svn-id: r38721
2009-02-21 18:39:53 +00:00
Max Horn
0d41ca8d38
SCI: Moved scicore/tools.cpp to tools.cpp, and include/resource.h to tools.h
...
svn-id: r38720
2009-02-21 18:28:38 +00:00
Max Horn
b6c9b12e64
SCI: Got rid of sci_sched_yield
...
svn-id: r38719
2009-02-21 18:21:00 +00:00
Max Horn
273271767b
When using error, no need to add a trailing newline
...
svn-id: r38718
2009-02-21 18:20:40 +00:00
Filippos Karapetis
6acf734ab8
Oops
...
svn-id: r38717
2009-02-21 18:17:08 +00:00
Filippos Karapetis
426def4f44
Turned back all fprintf/exit(1) bits into error()
...
svn-id: r38716
2009-02-21 18:16:17 +00:00
Max Horn
11b2ddfc54
SCI: Simplified gcd (and fixed crash when a = 0, not that it would be relevant ;)
...
svn-id: r38715
2009-02-21 18:13:03 +00:00
Filippos Karapetis
3cd9706c63
Now that we've placed everything under the Sci namespace, the Sci:: bits can be removed
...
svn-id: r38714
2009-02-21 18:12:02 +00:00
Max Horn
199121a04e
SCI: Replaced sci_sched_yield based 'mutex' in SCI mixer by a regular ScummVM mutex
...
svn-id: r38713
2009-02-21 18:06:00 +00:00
Paweł Kołodziejski
a5cf6bfd85
cleanup
...
svn-id: r38712
2009-02-21 17:29:03 +00:00
Florian Kagerer
8a95f02abf
LOL: some work on inventory/item handling
...
svn-id: r38711
2009-02-21 17:24:50 +00:00
Paweł Kołodziejski
f18d5500b1
formating
...
svn-id: r38709
2009-02-21 17:23:28 +00:00
Willem Jan Palenstijn
a0cc744aab
fix translation of shift-F-keys too
...
svn-id: r38708
2009-02-21 17:15:26 +00:00
Willem Jan Palenstijn
dc446169ba
fix translation of F-keys
...
svn-id: r38707
2009-02-21 17:13:05 +00:00
Paweł Kołodziejski
d23166c2a1
formating
...
svn-id: r38706
2009-02-21 16:20:53 +00:00
Paweł Kołodziejski
1ee65390cd
formating
...
svn-id: r38705
2009-02-21 16:08:04 +00:00
Joost Peters
709d98be7c
GFX_ERROR messages need \n
...
svn-id: r38704
2009-02-21 16:07:51 +00:00
Andre Heider
7c26fb94d9
missed a file in r38701
...
svn-id: r38703
2009-02-21 16:04:16 +00:00
Sven Hesse
e643565c2c
Compensate small lags in Util::waitEndFrame(), so that the CD audio intro sequences in Gob1 and Gob2 CD hopefully won't de-sync so easily
...
svn-id: r38702
2009-02-21 15:58:50 +00:00
Andre Heider
e514d9780a
use OSystem::getMillis() for last_wait_time and get rid of game_start_time
...
svn-id: r38701
2009-02-21 15:40:14 +00:00
Paweł Kołodziejski
03769a6d56
formating
...
svn-id: r38700
2009-02-21 15:30:47 +00:00
Paweł Kołodziejski
98fc4c20c5
formating
...
svn-id: r38699
2009-02-21 15:25:37 +00:00
Paweł Kołodziejski
58fa6822c6
formating
...
svn-id: r38698
2009-02-21 15:20:41 +00:00
Torbjörn Andersson
6e2848ff98
Rewrote the cutscene player to be more like the one in Broken Sword 1. This fixes
...
a subtitle colour regression, but mainly it simplifies the code. The "dummy"
player has been removed. There are almost certainly regressions, but I'm hoping
it's stable enough for testing now.
svn-id: r38697
2009-02-21 15:07:05 +00:00
Willem Jan Palenstijn
34f90ac043
revert large parts of r38621. error() is for fatal errors and does not return. warning() is not for debugging status messages.
...
svn-id: r38696
2009-02-21 14:11:41 +00:00
Travis Howell
7ce7993c30
Remove excess \n.
...
svn-id: r38695
2009-02-21 13:19:44 +00:00
Joost Peters
177c4169d1
error() calls don't need \n, as it is already appended in error() itself
...
svn-id: r38694
2009-02-21 12:58:09 +00:00
Paweł Kołodziejski
d11948a01c
formating
...
svn-id: r38693
2009-02-21 12:43:37 +00:00
Paweł Kołodziejski
c0b2ec8dd2
formating
...
svn-id: r38692
2009-02-21 12:42:06 +00:00
Paweł Kołodziejski
7e2bc28184
formating
...
svn-id: r38691
2009-02-21 12:33:24 +00:00
Andre Heider
1cbe5c327d
replace obsolete creat() with open()
...
svn-id: r38690
2009-02-21 12:26:10 +00:00
Joost Peters
3988062776
replace #ifdef WORDS_BIGENDIAN by SCUMM_BIG_ENDIAN
...
svn-id: r38689
2009-02-21 12:21:15 +00:00
Paweł Kołodziejski
f069c04c60
formating
...
svn-id: r38688
2009-02-21 12:16:35 +00:00
Paweł Kołodziejski
f582debaa9
formating
...
svn-id: r38686
2009-02-21 11:53:27 +00:00
Gregory Montoir
db7073b15a
cleanup
...
svn-id: r38685
2009-02-21 11:29:56 +00:00
Torbjörn Andersson
ab11da0602
Allocate the background sound handle dynamically. Otherwise, it seems to me as if
...
it should be invalid as soon as the makeMoviePlayer() function ends. While that
never caused any noticeable problems for me in Broken Sword 1, it broke things
in amusing ways when I tried to rewrite the Broken Sword 2 cutscene player along
the same lines.
svn-id: r38684
2009-02-21 11:27:04 +00:00
Willem Jan Palenstijn
baa7c7b997
remove some endlines from warning() calls
...
svn-id: r38683
2009-02-21 11:26:54 +00:00
Gregory Montoir
c39b5f5c6f
force inventory redraw after a game state load (inventory should now be ok when exiting GMM, should fix #2603197 )
...
svn-id: r38682
2009-02-21 11:26:50 +00:00
Torbjörn Andersson
c3068549da
Cleanup.
...
svn-id: r38680
2009-02-21 11:22:56 +00:00
Jordi Vilalta Prat
d8d6aaa461
Replaced "typedef struct _seg_manager_t seg_manager_t" with "struct SegManager"
...
svn-id: r38679
2009-02-21 11:04:47 +00:00
Jordi Vilalta Prat
3cc6cdf719
Replaced "typedef struct _state state_t" with "struct EngineState"
...
svn-id: r38678
2009-02-21 10:47:56 +00:00
Oystein Eftevaag
25f7c37171
Wrapped the SCI engine in the Sci namespace.
...
svn-id: r38676
2009-02-21 10:23:36 +00:00
Paweł Kołodziejski
44ea796610
formating
...
svn-id: r38675
2009-02-21 10:05:31 +00:00
Jordi Vilalta Prat
14150200d4
Implemented SciEngine::getDebugger()
...
svn-id: r38674
2009-02-21 09:45:34 +00:00
Paweł Kołodziejski
ea49575689
formating
...
svn-id: r38673
2009-02-21 09:44:53 +00:00
Paweł Kołodziejski
9ad232e5cf
formating
...
svn-id: r38672
2009-02-21 09:39:10 +00:00
Paweł Kołodziejski
0d3f2573c6
formating
...
svn-id: r38671
2009-02-21 09:10:14 +00:00
Paweł Kołodziejski
ecf0cbe94e
formating
...
svn-id: r38670
2009-02-21 08:56:49 +00:00
Paweł Kołodziejski
a584936568
formating
...
svn-id: r38669
2009-02-21 08:47:07 +00:00
Paweł Kołodziejski
328214940b
formating
...
svn-id: r38668
2009-02-21 08:16:04 +00:00
Paweł Kołodziejski
30848dec14
formating
...
svn-id: r38666
2009-02-21 07:42:23 +00:00
Nicola Mettifogo
3874465bdb
Fix for bug #1864270 . Music now goes on after the the credits have been displayed in the Amiga demo version of Nippon Safes.
...
svn-id: r38664
2009-02-21 05:19:35 +00:00
Nicola Mettifogo
e088f680a6
Fix for bug #2619824 . Command list execution is now paused when showing credits. This fixes the Amiga demo of Nippon Safes, which would otherwise quit without displaying the credits.
...
svn-id: r38662
2009-02-21 04:44:20 +00:00
Max Horn
fa75bd23e6
SCI: Yet more cleanup
...
svn-id: r38661
2009-02-21 04:43:49 +00:00
Max Horn
7c87b4901d
SCI: Use GCC_PRINTF hint to the compiler for _SCIkprintf and sciprintf; fixed tons of bad format strings
...
svn-id: r38660
2009-02-21 04:25:56 +00:00
Max Horn
cb6b1fc903
SCI: Regenerated said.cpp from said.y
...
svn-id: r38659
2009-02-21 04:23:43 +00:00
Max Horn
bcb1a71052
SCI: Fixed more warnings
...
svn-id: r38658
2009-02-21 04:10:21 +00:00
Max Horn
ecaab0fe94
SCI: Fixed warnings in engine/savegame.cpp, by improving cfsml.pl; also improved the build rule which is responsible for creating engine/savegame.cpp from engine/savegame.cfsml
...
svn-id: r38657
2009-02-21 03:59:57 +00:00
Max Horn
c8ea2dce5f
SCI: Fixed more warnings
...
svn-id: r38656
2009-02-21 03:32:13 +00:00
Max Horn
031e3e3b90
SCI: Fixed tons of bugs in error/warning format strings
...
svn-id: r38655
2009-02-21 03:25:23 +00:00
Max Horn
e9e2136c1a
SCI: cleanup
...
svn-id: r38654
2009-02-21 03:24:35 +00:00
Max Horn
5ea92c4c67
SCI: Re-enabled detection of my KQ5 version
...
svn-id: r38653
2009-02-21 03:13:21 +00:00
Max Horn
0901c90654
Advanced detector: Slightly more verbose debug output
...
svn-id: r38652
2009-02-21 02:59:45 +00:00
Willem Jan Palenstijn
7bc4b8667e
avoid vsscanf
...
svn-id: r38651
2009-02-21 00:18:02 +00:00
Torbjörn Andersson
9b2029a7a8
Minor consistency change.
...
svn-id: r38650
2009-02-20 23:47:11 +00:00
Willem Jan Palenstijn
abbca80d61
Converted SCI saving to use saveFileMan. Instead of a savegame being
...
a directory with an id and a state file, a savegame now consists of
two consecutive CFSML-serialized structs: SavegameMetadata and state_t.
The former contains the savegame title, and is loaded when scanning saves.
svn-id: r38649
2009-02-20 23:41:15 +00:00
Travis Howell
c5abad4dea
Switch error back to warning, to fix SCI 1.1 regression.
...
svn-id: r38648
2009-02-20 23:31:00 +00:00
Paweł Kołodziejski
6e1250fed1
ups
...
svn-id: r38647
2009-02-20 23:28:25 +00:00
Travis Howell
f6b4c2544b
Switch errors back to warnings, to fix SCI 1.1 regressions.
...
svn-id: r38646
2009-02-20 23:26:30 +00:00
Paweł Kołodziejski
880aba2f43
fixed warning
...
svn-id: r38644
2009-02-20 23:23:58 +00:00
Filippos Karapetis
80868065e6
Downgraded some errors to warnings and printf's
...
svn-id: r38642
2009-02-20 23:19:47 +00:00
Filippos Karapetis
65f7ba86ce
Reverted #38631 and readded gfxr_interpreter_needs_multicolored_pointers - apparently, it's needed for SCI1.1 support
...
svn-id: r38641
2009-02-20 23:17:13 +00:00
Paweł Kołodziejski
fc28525969
formating
...
svn-id: r38640
2009-02-20 23:09:29 +00:00
Matthew Hoops
dc792f2265
Add detection for the SCI christmas cards.
...
svn-id: r38639
2009-02-20 23:00:27 +00:00
Torbjörn Andersson
ab4f1d69ad
Since opening a compressed piece of music should no longer be an expensive
...
operation, we can probably keep the mutex locked throughout the entire
streamCompMusic() function. I'm not convinced that it was ever safe to unlock
and relock it partway through. In fact, that's my prime suspect for bug #2614306
("BS2: noise in music or speech").
svn-id: r38638
2009-02-20 22:47:05 +00:00
Torbjörn Andersson
478257f624
Instead of reading an entire compressed sound into a memory stream, use a
...
slightly extended SeekableSubReadStream to stream the sound from a file instead.
This change is experimental, so it should almost certainly not go into 0.13.
svn-id: r38637
2009-02-20 22:43:13 +00:00
Paweł Kołodziejski
dbb81ab516
formating
...
svn-id: r38636
2009-02-20 22:32:56 +00:00
Paweł Kołodziejski
037f56f719
formating
...
svn-id: r38635
2009-02-20 22:29:49 +00:00
Filippos Karapetis
701279fb40
Changed some SCIkdebug() calls to debugC()
...
svn-id: r38634
2009-02-20 22:21:33 +00:00
Filippos Karapetis
1a9253bc5e
Remove unused code (gfxr_interpreter_needs_multicolored_pointers)
...
svn-id: r38631
2009-02-20 22:19:11 +00:00
Travis Howell
5768eb8c43
Add English version of Humongous Catalog Preview and Russian versions of two HE games.
...
svn-id: r38630
2009-02-20 22:18:41 +00:00
Filippos Karapetis
637fa528f6
Changed some non-fatal messages back to warnings
...
svn-id: r38629
2009-02-20 22:17:14 +00:00
Paweł Kołodziejski
77542e8623
formating
...
svn-id: r38628
2009-02-20 22:12:48 +00:00
Sven Hesse
a69ec56869
Fixing compilation for me
...
svn-id: r38627
2009-02-20 21:47:51 +00:00
Paweł Kołodziejski
3ec65a052a
remove README, it's pointless
...
svn-id: r38626
2009-02-20 21:46:49 +00:00
Paweł Kołodziejski
435844c61e
formating
...
svn-id: r38625
2009-02-20 21:38:38 +00:00
Filippos Karapetis
9582e48574
Some initial code for a debug console (still non-working)
...
svn-id: r38623
2009-02-20 21:26:31 +00:00
Paweł Kołodziejski
8a15a72ec8
formating
...
svn-id: r38622
2009-02-20 20:55:35 +00:00
Filippos Karapetis
2ddce51a56
Changed more messages to warnings/errors
...
svn-id: r38621
2009-02-20 20:39:02 +00:00
Paweł Kołodziejski
1419024bd0
formating
...
svn-id: r38620
2009-02-20 20:33:27 +00:00
Paweł Kołodziejski
75b91c71dd
restored formating
...
svn-id: r38619
2009-02-20 20:31:08 +00:00
Paweł Kołodziejski
61b9086fcf
formating
...
svn-id: r38618
2009-02-20 20:17:57 +00:00
Filippos Karapetis
ac716ad843
Started conversion of debug messages and debug levels to the ScummVM equivalents. Removed the "stubs" and "warnings" debug levels and replaced such kinds of messages with normal warnings
...
svn-id: r38617
2009-02-20 20:11:12 +00:00
Paweł Kołodziejski
2080166499
formating
...
svn-id: r38616
2009-02-20 20:01:31 +00:00
Willem Jan Palenstijn
7fdf8021d8
use new instead of malloc for int_hash_map_t
...
svn-id: r38613
2009-02-20 19:32:27 +00:00
Paweł Kołodziejski
08cd2c8806
formating
...
svn-id: r38612
2009-02-20 19:08:38 +00:00
Paweł Kołodziejski
947a296d33
formating
...
svn-id: r38607
2009-02-20 17:23:54 +00:00
Paweł Kołodziejski
b70f3ba603
formating
...
svn-id: r38605
2009-02-20 17:09:22 +00:00
Paweł Kołodziejski
61231c2a36
formating
...
svn-id: r38604
2009-02-20 17:05:47 +00:00
Paweł Kołodziejski
ac4fe7a4bc
formating
...
svn-id: r38603
2009-02-20 16:59:05 +00:00
Filippos Karapetis
2f4fc293e7
Used parentheses to indicate operator precedence (I hope I got them right)
...
svn-id: r38602
2009-02-20 16:34:21 +00:00
Paweł Kołodziejski
75f9d5457a
formating
...
svn-id: r38601
2009-02-20 16:30:22 +00:00
Paweł Kołodziejski
f4719cf79c
formating
...
svn-id: r38600
2009-02-20 16:22:09 +00:00
Paweł Kołodziejski
823d924064
fixed compilation
...
svn-id: r38599
2009-02-20 16:19:29 +00:00
