ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,188 Commits 45 Branches 139 Tags
57504cb699c98d3257d5cb39aa6971b6aacf211c
Commit Graph
83 Commits
Author SHA1 Message Date
Filippos Karapetis 31a0c80905 Moved the kernel and the vocabulary outside of the engine state (they're static data, which never changes during a game) 
svn-id: r42398
 2009-07-11 23:45:54 +00:00
Willem Jan Palenstijn 8dd3492194 SCI: don't let TimerSongIterator loop forever, and don't immediately 
signal completion when starting it. This fixes a sync issue with
the departing spaceship at the start of SQ4CD (after the intro).

svn-id: r42385
 2009-07-11 15:00:40 +00:00
Filippos Karapetis 2b5fac58d5 Applied patch 2818733 - "SCI: Timer iterator for audio resources played via doSound" 
svn-id: r42375
 2009-07-11 06:53:39 +00:00
Filippos Karapetis a62b26ea80 Silenced the very chatty song iterator console messages by converting them to appropriate debug messages 
svn-id: r42240
 2009-07-07 20:43:27 +00:00
Filippos Karapetis a9aaf56b3e Cleanup: added an enum for the auto-detected features, removed the selectors which are only used for auto-detection from the convenience selector map and placed feature auto-detection in a separate function. Also, now the automatically detected graphics resources are shown in the console. 
svn-id: r42212
 2009-07-07 11:14:18 +00:00
Filippos Karapetis c716e43a2b - Added auto-detection for EGA graphics. As a result of this, GF_SCI1_EGA has been removed and versions SCI_VERSION_01_EGA and SCI_VERSION_01_VGA have been merged into SCI_VERSION_01 
- Simplified the checks for EGA and VGA graphics
- Fixed a bug in script_adjust_opcode_formats()
- Simplified the code in GfxResManager::getView() a bit

svn-id: r42206
 2009-07-07 07:44:25 +00:00
Filippos Karapetis 219b0de0d2 Renamed SCI_VERSION_01 -> SCI_VERSION_01_EGA 
svn-id: r42181
 2009-07-06 16:22:14 +00:00
Filippos Karapetis 30d1462da0 Swapped the music and audio resource check for SCI1.1 games. Digital sound effects are now preferred over the synthesized ones 
svn-id: r42179
 2009-07-06 15:50:44 +00:00
Filippos Karapetis b38c5f8c5c Proper handling of sound effects marked as music resources 
svn-id: r42174
 2009-07-06 12:44:55 +00:00
Filippos Karapetis 250a1a915a When a song isn't found, send a "stop handle" event so that the engine won't wait forever (e.g. in SQ4CD, perhaps others) 
svn-id: r42172
 2009-07-06 11:33:28 +00:00
Filippos Karapetis 522b161bec Replaced sciprintf() calls with printf, DebugPrintf, warning and error calls 
svn-id: r42167
 2009-07-06 10:39:22 +00:00
Filippos Karapetis c31d1b3180 - Fixed feature auto-detection for Conquests of Camelot 
- Auto-detected features are now printed in the console (to ease debugging)

svn-id: r42132
 2009-07-05 11:49:05 +00:00
Filippos Karapetis 230e7a8d2c Newer DoSound() semantics are now detected automatically, by the existence of the "setVol" selector. Removed game flag GF_SCI1_NEWDOSOUND 
svn-id: r42087
 2009-07-04 11:24:09 +00:00
Walter van Niftrik 1fb78d577f SCI: Moved audio code from AudioResource to the sfx core. 
svn-id: r41486
 2009-06-12 23:46:23 +00:00
Walter van Niftrik 5e68fbfe87 SCI: Moved SCI1 audio map handling into the resource manager. 
svn-id: r41408
 2009-06-09 19:18:48 +00:00
Walter van Niftrik a6ed05740f SCI: Moved resource36 handling into resource manager. 
svn-id: r41349
 2009-06-07 19:15:55 +00:00
Max Horn d07e9dfb13 SCI: Objectified SongLibrary 
svn-id: r41343
 2009-06-07 17:06:51 +00:00
Max Horn f2ca788004 SCI: Renamed various song/songlib related structs and members 
svn-id: r41342
 2009-06-07 17:06:32 +00:00
Filippos Karapetis 3b687a7a04 Replaced KP_ALT, SKPV_OR_ALT and UKPV_OR_ALT 
svn-id: r41340
 2009-06-07 16:50:34 +00:00
Filippos Karapetis 744323ca33 Replaced/removed KP_UINT, KP_SINT, SKPV and UKPV as well as the VIEW_PRIORITY and PRIORITY_BAND_FIRST wrappers 
svn-id: r41338
 2009-06-07 15:53:30 +00:00
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