75 Commits

Author SHA1 Message Date
Willem Jan Palenstijn
d3e60f2ae3 Depend on backend timer API instead of a new mutex
This fixes a deadlock between the backend's timer mutex and
the sound callbackMutex that would occur while restoring a game.

svn-id: r38939
2009-02-27 22:20:11 +00:00
Eugene Sandulenko
d53c75fc8f Fix code formatting
svn-id: r38930
2009-02-27 12:59:02 +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
Max Horn
170916201c SCI: Moved almost all files from include/ to other dirs; only include/engine.h remains
svn-id: r38920
2009-02-27 02:23:00 +00:00
Andre Heider
dbe632e8ed protect the sfx timer with the callbackMutex to fix the race the condition when restarting or restoring a game.
svn-id: r38913
2009-02-26 19:32:22 +00:00
Max Horn
fde001ce81 SCI: Changed 'typedef enum { } NAME' into C++-style 'enum NAME { }'
svn-id: r38908
2009-02-26 16:16:46 +00:00
Paweł Kołodziejski
91ee9a3eb8 not needed this includes anymore
svn-id: r38857
2009-02-24 21:13:32 +00:00
Andre Heider
357299c570 substitute all time related functions, removing sci_gettime sci_get_current_time altogether.
svn-id: r38845
2009-02-24 18:31:05 +00:00
Eugene Sandulenko
a27285f117 Normalized guard #defines
svn-id: r38842
2009-02-24 15:33:40 +00:00
Max Horn
1e4db221e5 SCI: Moved engines/sci/include/sci_memory.h and engines/sci/scicore/sci_memory.cpp into engines/sci/; moved macros from the header into the source file
svn-id: r38832
2009-02-24 05:39:10 +00:00
Max Horn
8997a45773 SCI: Replaced two uses of sci_fopen by Common::File; moved is_print_str() to the only spot it is used
svn-id: r38791
2009-02-22 19:45:53 +00:00
Jordi Vilalta Prat
b5ce8d9320 Whitespace cleanup
svn-id: r38783
2009-02-22 13:11:43 +00:00
Max Horn
d6e397233f SCI: More cleanup
svn-id: r38758
2009-02-21 22:40:58 +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
Max Horn
8430b662a9 SCI: Changed typedef struct -> struct
svn-id: r38752
2009-02-21 22:06:42 +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
041869ed36 SCI: Untangling #include dependencies a bit
svn-id: r38740
2009-02-21 19:54:15 +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
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
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
273271767b When using error, no need to add a trailing newline
svn-id: r38718
2009-02-21 18:20:40 +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
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
Paweł Kołodziejski
f18d5500b1 formating
svn-id: r38709
2009-02-21 17:23:28 +00:00
Paweł Kołodziejski
d23166c2a1 formating
svn-id: r38706
2009-02-21 16:20:53 +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
Willem Jan Palenstijn
baa7c7b997 remove some endlines from warning() calls
svn-id: r38683
2009-02-21 11:26:54 +00:00
Oystein Eftevaag
25f7c37171 Wrapped the SCI engine in the Sci namespace.
svn-id: r38676
2009-02-21 10:23:36 +00:00
Max Horn
bcb1a71052 SCI: Fixed more warnings
svn-id: r38658
2009-02-21 04:10:21 +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
Filippos Karapetis
80868065e6 Downgraded some errors to warnings and printf's
svn-id: r38642
2009-02-20 23:19:47 +00:00
Filippos Karapetis
2ddce51a56 Changed more messages to warnings/errors
svn-id: r38621
2009-02-20 20:39:02 +00:00
Max Horn
a2aba2f18e SCI: Renamed resource_mgr_t -> ResourceManager; added remark to 'the other resource manager' that it should be renamed to GraphicsManager or so
svn-id: r38592
2009-02-20 15:24:22 +00:00
Max Horn
c3ffac5e62 SCI: Removed unused file
svn-id: r38591
2009-02-20 15:20:48 +00:00
Travis Howell
422ebda3ba Add change from Quietust, to fix MSVC 7.1 compile.
svn-id: r38574
2009-02-20 03:46:00 +00:00
Filippos Karapetis
45d3382c9a We only got 1 mixer - removed the unneeded file mixers.cpp
svn-id: r38569
2009-02-20 00:31:22 +00:00
Paweł Kołodziejski
dd30cc6382 remove dreamcast mixer platform code - no use for scummvm
svn-id: r38499
2009-02-18 19:35:35 +00:00
Max Horn
766783b493 SCI: Some random cleanup
svn-id: r38497
2009-02-18 19:14:40 +00:00
Max Horn
88bb21f9e1 Removed unused file
svn-id: r38482
2009-02-18 14:49:24 +00:00
Max Horn
471f630c2e SCI: Moved sfx_pcm_urat_t from include/sfx_pcm.h to sfx/mixer.h
svn-id: r38434
2009-02-17 18:17:01 +00:00
Sven Hesse
2ef866690d Fixing compilation for me
svn-id: r38421
2009-02-17 15:54:15 +00:00
Eugene Sandulenko
2a68f8c1cb Remove unneeded files
svn-id: r38414
2009-02-17 15:21:38 +00:00
Eugene Sandulenko
b0abacf7cd Update headers. sfx/
svn-id: r38410
2009-02-17 15:07:44 +00:00
Filippos Karapetis
d39d83e525 Replaced sci_free() with free() - it's OK to free a NULL pointer, so the checking that sci_free() performed is not necessary
svn-id: r38406
2009-02-17 13:51:52 +00:00
Filippos Karapetis
d6b5855800 Removed more directories which are not part of the SCI engine - again, the code and documentation can be referenced from /vendor/freesci/glutton/src/sfx
svn-id: r38404
2009-02-17 10:33:16 +00:00
Filippos Karapetis
7f8f0e96f7 Removed directory which is not part of the SCI engine - the code can be referenced from /vendor/freesci/glutton/src/sfx/mt32_GM_mapping
svn-id: r38403
2009-02-17 10:25:26 +00:00
Filippos Karapetis
ffc07febeb Removed unused SFX code
svn-id: r38396
2009-02-17 09:15:17 +00:00