Walter van Niftrik
e3d3195a43
SCI: Resmgr cleanup and preparations for moving resource36 handling into resmgr.
...
svn-id: r41318
2009-06-07 02:18:38 +00:00
Max Horn
10c54394bd
SCI: Renamed EngineState::flags and version to _flags and _version (following our conventions); also slightly changed the EngineState constructor to init _version & _flags, and used this to make them constant
...
svn-id: r41177
2009-06-04 21:44:39 +00:00
Filippos Karapetis
e55388c787
Removed script_error_flag and script_debug_flag, which were used to error out if something went wrong and open the debugger console. Changed all the places where they were used to error() out instead, as ScummVM's debugger console can open on error()
...
svn-id: r41073
2009-05-31 15:34:23 +00:00
Johannes Schickel
2f90c8f398
- Fix various debugC calls (parameters passed were not correct)
...
- Fix unused variable warning in scriptdebug.cpp
svn-id: r41038
2009-05-30 17:30:54 +00:00
Filippos Karapetis
3490819a66
- Removed debug_mode from the engine state
...
- Turned all SCIkwarn and SCIkdebug functions to ScummVM's debugC function
- Placed some debug code in appropriate defines: DEBUG_PARSER, DEBUG_AVOIDPATH and DEBUG_SOUND
- Removed the "debuglog" command and the "script_checkloads_flag" and "sci_debug_flags" variables
svn-id: r41033
2009-05-30 15:40:49 +00:00
Johannes Schickel
f4b15bb87f
Fix warning about unused variable.
...
svn-id: r41005
2009-05-29 14:56:53 +00:00
Filippos Karapetis
74e87bf05d
Some WIP code on the speech used in KQ6CD
...
svn-id: r40996
2009-05-29 13:52:10 +00:00
Max Horn
d3bd7b622c
SCI: Turned SfxState into a proper class (i.e., convert the sfx_ funcs to member methods)
...
svn-id: r40973
2009-05-28 22:48:15 +00:00
Max Horn
99b520dd09
SCI: Merged SfxPlayer/NewPlayer code into sfx/core.cpp
...
svn-id: r40965
2009-05-28 22:02:45 +00:00
Max Horn
32975b25f4
SCI: cleanup
...
svn-id: r40959
2009-05-28 11:15:09 +00:00
Max Horn
d70504c910
SCI: Renamed sfx_state_t -> SfxState, preparing it to become a class eventually
...
svn-id: r40958
2009-05-28 10:54:30 +00:00
Filippos Karapetis
c75bdbc8e9
- SQ5 floppy starts now
...
- Added a new console command, "room", which shows the current room
svn-id: r40943
2009-05-27 16:45:42 +00:00
Filippos Karapetis
4dccd309e2
- Renamed the Audio commands to kSci*, from kSci1* (since they're pretty much the same for SCI1.1)
...
- Added enums for the audio sync cases
- Added a warning when kDoSync is called with the new semantics (SQ4CD or newer)
svn-id: r40936
2009-05-27 09:07:08 +00:00
Filippos Karapetis
16078599fb
Added a warning when kDoAudio is called with the new semantics (SQ4CD or newer) and fixed the detection entry for SQ4CD
...
svn-id: r40935
2009-05-27 08:48:57 +00:00
Johannes Schickel
4d66b55316
Fix g++ warning.
...
svn-id: r40905
2009-05-26 10:10:45 +00:00
Filippos Karapetis
780899fb0e
Rewrote the Audio stream parser. The introduction of KQ6 should work more correctly now (apart from Cassima's speech)
...
svn-id: r40904
2009-05-26 10:02:25 +00:00
Walter van Niftrik
de5ca1e472
SCI: Some small fixes for KQ6CD.
...
svn-id: r40898
2009-05-26 00:03:41 +00:00
Johannes Schickel
b9bdded269
Remove leftover debug messages.
...
svn-id: r40896
2009-05-25 20:55:49 +00:00
Filippos Karapetis
16d6499617
WIP code for the speech in the floppy version of KQ6 (still needs work)
...
svn-id: r40894
2009-05-25 19:57:09 +00:00
Filippos Karapetis
4470dada57
Fixed crash when starting KQ6
...
svn-id: r40885
2009-05-25 11:44:24 +00:00
Filippos Karapetis
d59796fb54
Objectified the AudioResource code (used for speech and digitized music in CD talkie games)
...
svn-id: r40880
2009-05-25 10:30:19 +00:00
Johannes Schickel
b3c6751b9b
Strip trailing whitespaces in the whole code base.
...
svn-id: r40867
2009-05-24 15:17:42 +00:00
Filippos Karapetis
8ab0f0256e
Fixed audio synchronization in the CD version of KQ5
...
svn-id: r40855
2009-05-24 09:40:48 +00:00
Filippos Karapetis
fc0fab937a
Oops, fixed silly typo
...
svn-id: r40816
2009-05-23 18:57:47 +00:00
Filippos Karapetis
6a7aae788d
Some more WIP code for kDoAudio(), taken from Greg's SCI engine. Sound and speech in KQ5CD should be working now
...
svn-id: r40815
2009-05-23 18:55:56 +00:00
Filippos Karapetis
ef4947060e
Some initial WIP code on kDoAudio (still not working)
...
svn-id: r40790
2009-05-22 22:19:15 +00:00
Filippos Karapetis
4799cbf1c3
Removed the PREG, PSTK, IS_NULL_REG and REG_EQ defines
...
svn-id: r40767
2009-05-21 17:18:46 +00:00
Filippos Karapetis
565cfa074d
Simplified SCI versions to be SCI version generations, and fixed some game entries in the process. Also, added a sanity check for invalid game entries
...
svn-id: r40596
2009-05-15 09:04:21 +00:00
Filippos Karapetis
3ab81fa502
Fixed regression with SCI1.1 games
...
svn-id: r40563
2009-05-14 17:06:47 +00:00
Filippos Karapetis
4a9e7e4393
Replaced the SCI_VERSION_FTU_DOSOUND_VARIANT_2 version check with the game feature flag GF_SCI1_NEWDOSOUND
...
svn-id: r40561
2009-05-14 13:51:42 +00:00
Filippos Karapetis
f75c950457
- Replaced SCI_VERSION_FTU_LOFS_ABSOLUTE with the GF_SCI1_LOFSABSOLUTE game flag
...
- Moved the version defines outside of versions.h
svn-id: r40559
2009-05-14 12:38:50 +00:00
Filippos Karapetis
4ec6c4127f
Added a feature flag for the SCI1.1 behavior of kSetCursor() in Eco 1 and KQ5 CD. Some cleanup
...
svn-id: r40554
2009-05-14 11:11:56 +00:00
Max Horn
37a0157c97
SCI: cleanup
...
svn-id: r40518
2009-05-12 23:32:32 +00:00
Max Horn
05c3c6ccb3
SCI: Replaced SFX_OK/SFX_ERROR by Common::Error, and got rid of sfx/sfx.h
...
svn-id: r40517
2009-05-12 23:31:55 +00:00
Walter van Niftrik
e7184402fb
SCI: Sound: Send signal immediately for currently unsupported fade-and-continue.
...
svn-id: r40484
2009-05-12 12:56:22 +00:00
Filippos Karapetis
5eb4bdce66
Added all the different cases of kDoAudio as enums
...
svn-id: r40150
2009-04-26 02:00:36 +00:00
Walter van Niftrik
dfd0245273
SCI: DoSync should work now, but the lip-syncing mechanism also needs DoAudio
...
(currently stubbed), so it hasn't been tested yet.
so it hasn't been tested yet.
svn-id: r40147
2009-04-25 23:31:03 +00:00
Filippos Karapetis
f1893d8f25
WIP (still non-working) code for speech sync in CD talkie games (like e.g. KQ5 CD and SQ4 CD), taken from Greg's SCI implementation.
...
svn-id: r40142
2009-04-25 08:50:42 +00:00
Max Horn
6b58973536
SCI: Renamed SongIteratorMessage -> SongIterator::Message; cleanup
...
svn-id: r39289
2009-03-10 02:42:22 +00:00
Max Horn
54e1256b0e
SCI: Reduce SFX header dependencies
...
svn-id: r39159
2009-03-06 18:11:12 +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
7ee049ab8f
SCI: Forgot to commit a couple files after renaming sfx headers
...
svn-id: r39010
2009-03-01 06:17:52 +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
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
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
b5df97ad2b
SCI: Moved kernel.h and kdebug.h from include/ to engine/; untangled header deps some more
...
svn-id: r38833
2009-02-24 05:51:55 +00:00
Jordi Vilalta Prat
b5ce8d9320
Whitespace cleanup
...
svn-id: r38783
2009-02-22 13:11:43 +00:00
Max Horn
ff17899d8e
SCI: Got rid of include/scitypes.h
...
svn-id: r38746
2009-02-21 21:16:41 +00:00