862 Commits

Author SHA1 Message Date
Torbjörn Andersson
a2d809f854 In o_quit_if_user_presses_y(), assume that any unknown language (e.g.
"English (GB)") behaves like "English (US)". This is consistent with how we
handle language in the rest of the Simon engine, as far as I can see.

Should "n" really be the key for a negative answer in all languages?

svn-id: r18536
2005-07-11 13:22:55 +00:00
Lars Persson
d4716a1fb5 * Start of generic key configuration support for ScummVM
* Moved KeyConfigDialog, key from WinCE to gui
* Updated wince code to inherit and use new GUI::Keys and launch new dialog
* New definition SMALL_SCREEN_DEVICE when keysdialog should be inittialized from options.cpp
* Added new function to SDL\Events that handles key remapping.  LINUPY & QTOPIA remapping moved to that function. SymbianOs.cpp overrides this function to enable key remapping to events
* Compiled VC6++ project. This with warnings and errors, but NOT in the changed code. (SAGA,KYRA)
* Compiled using WCE tools 3 for X86 target and running Scummvm in emulator to test
* Compiled with UIQ target. The rest Symbian platforms might require further configuration to operate properly
* Actor.h in Saga now compiles for default VC6 setting.
* Aspect.cpp does not compile in VC6/WCE due to template problems with the kFastAndNiceAspectMode setting.
* Changed order of creation of gamedetector and mainsystem in Main.cpp
* If anything does not compile, or is totally out of order, please revert changes.

svn-id: r18498
2005-07-05 20:22:56 +00:00
Torbjörn Andersson
0ed74c8dcd I don't think we need <ctype.h> here.
svn-id: r18450
2005-06-24 16:11:11 +00:00
Max Horn
8b1d7b9166 When including files from common/, explicitly use the common/ prefix
svn-id: r18444
2005-06-24 15:23:51 +00:00
Lars Persson
1c69696a9a Patches needed to build for SYMBIAN32 WINS/GCC added.
Test built for Symbian and run on P910i without any major problems.
Test built for MSVC6. Changed parts seems to compile ok but there are some problems with MSVC6 and some of the targets which the EPOC build does n't support (KYRA,SAGA).

svn-id: r18430
2005-06-21 22:08:21 +00:00
Max Horn
2de46dc8eb Moved some more stuff to namespace Audio (enough for tonight)
svn-id: r18040
2005-05-11 00:01:44 +00:00
Max Horn
1a615346ab Moved class SoundMixer to Audio::Mixer (didn't call the namespace 'Sound' because we already have many classes with that name)
svn-id: r18039
2005-05-10 23:48:48 +00:00
Max Horn
72f4c03b0b Moved (In/Out)SaveFile(Manager) and Timer to namespace Common
svn-id: r18038
2005-05-10 23:17:38 +00:00
Max Horn
b75c969e66 Moved class File and the MD5 stuff to namespace Common
svn-id: r18037
2005-05-10 22:56:25 +00:00
Travis Howell
2f1ff2afec Use debugger for errors, where possible.
svn-id: r17998
2005-05-09 12:12:14 +00:00
Travis Howell
a0d6b39d9b Use debugger for errors.
svn-id: r17997
2005-05-09 11:39:31 +00:00
Travis Howell
9c80416334 re-order
svn-id: r17996
2005-05-09 10:54:24 +00:00
Travis Howell
3c225d4a1f Add a surprise.
svn-id: r17995
2005-05-09 10:51:00 +00:00
Max Horn
cca744f69a Comply to our coding conventions
svn-id: r17975
2005-05-08 21:49:52 +00:00
Max Horn
bd8831487f Renamed variables to match our naming conventions; added Sound::isVoiceActive() method; made some more members of class Sound private
svn-id: r17958
2005-05-08 12:33:25 +00:00
Travis Howell
21717273b4 No need to check for speech file in non-talkie versions.
svn-id: r17952
2005-05-08 05:56:09 +00:00
Travis Howell
169c85a19b Auto detect effect file type in Simon the Sorcerer 1.
svn-id: r17951
2005-05-08 05:23:31 +00:00
Travis Howell
0bcd57e87f Cleanup
svn-id: r17950
2005-05-08 04:54:08 +00:00
Travis Howell
d9b81f4ab8 Fix sound regressions.
svn-id: r17948
2005-05-08 02:50:43 +00:00
Travis Howell
3cbaf48932 Cleanup
svn-id: r17934
2005-05-06 13:22:48 +00:00
Travis Howell
6e06194dd9 Ooops
svn-id: r17932
2005-05-06 12:29:37 +00:00
Travis Howell
1057d5fa69 Rename sprite field.
Cleanup.

svn-id: r17931
2005-05-06 12:23:19 +00:00
Travis Howell
076e42c302 Use ScummVM code formatting for names.
svn-id: r17930
2005-05-06 11:37:33 +00:00
Travis Howell
947be5edc2 Rename sprite field.
Cleanup

svn-id: r17928
2005-05-06 08:46:45 +00:00
Travis Howell
c8b17da61c Auto detect music and voice types, where possible.
Use correct set of MIDI tracks for MT32 in Simon the Sorcerer 2.

svn-id: r17925
2005-05-06 03:09:53 +00:00
Max Horn
ce3cd9b194 Changed the semantics of debug level 0 from off back to something more similiar to how it used to be (default debug level now is -1)
svn-id: r17788
2005-04-24 12:21:53 +00:00
Max Horn
5626581da8 These structs must be packed
svn-id: r17770
2005-04-23 14:00:51 +00:00
Max Horn
8fddaada1d Simplified debuglevel handling:
- it's only honored in the global level of the config file
 - all checks for it go through gDebugLevel now, which is made global
 - the '-d' switch is handled in a slightly saner and consistent way
 - removed 'debuglevel' from the config format documentation; we do
   not want to encourage the avarage user to use it

svn-id: r17769
2005-04-23 13:52:27 +00:00
Max Horn
88d0b6cc44 Only modify gDebugLevel, not the transient config
svn-id: r17754
2005-04-22 20:04:25 +00:00
Max Horn
969ef3dac9 * Added new virtual base class 'Stream', ReadStream and
WriteStream are now subclasses of it.
* Added new methods eos(), ioFailed(), clearIOFailed() to
  all streams. This allows better error checking.
* SaveFile classes take advantage of these new standard
  stream APIS
* Removed File::gets()
* Added SeekableReadStream::readLine() (replaces File::gets)
* Added WriteStream::writeString, for convenience

svn-id: r17752
2005-04-22 17:40:09 +00:00
Travis Howell
dfaf0145da Add tempo fix for simon1demo music, from bug #1164263.
svn-id: r17677
2005-04-19 06:25:35 +00:00
Max Horn
839c8add38 Get rid of errno; add some (optional) error checking facilities to SaveFile classes (they are ugly, and to simple, but better than nothing)
svn-id: r17589
2005-04-13 18:36:55 +00:00
Max Horn
e79c168d35 split SaveFileManager::openSavefile and class SaveFile into two, each, one for loading and one for saving
svn-id: r17517
2005-04-10 15:13:40 +00:00
Jonathan Gray
24c92d0091 Remove usage of vsprintf in favour of vsnprintf and make
more use of STRINGBUFLEN.  Some ports may need a new stub for
this, discussed with Chrilith.

svn-id: r17463
2005-04-09 01:52:44 +00:00
Torbjörn Andersson
c7bb5eacda Whitespace
svn-id: r17438
2005-04-07 12:11:35 +00:00
Jerome Fisher
eda317924e Committed patch #1168149 (Shared GM/MT-32 mapping) by eriktorbjorn as-is. This does the following:
- Replaces multiple identical MT-32-to-General MIDI mapping tables with a common one in MidiDriver.
- Changes Sky's GmChannel class to allow NULL instrument and velocity mapping tables, giving a 1-to-1 mapping without creating a dummy table.

svn-id: r17361
2005-04-03 22:01:38 +00:00
Travis Howell
59331fe535 Add another French version
svn-id: r17310
2005-03-31 15:12:13 +00:00
Nicolas Bacca
8c37cd52a6 Quit game with 'Action key' on WinCE Smartphones
svn-id: r17246
2005-03-26 14:09:21 +00:00
Max Horn
9a4bc8ce16 Patch #1117443 (Experimental plugin code revision)
svn-id: r17231
2005-03-25 17:55:57 +00:00
Max Horn
7cd2cb2b17 PlayingSoundHandle -> SoundHandle; also, turned the handle activity check into a mixer method
svn-id: r17106
2005-03-12 18:56:09 +00:00
Max Horn
0ec193b4be changing AudioDataType -> SoundType, so now the constant names match the name of the data type / the SoundMixer method names
svn-id: r17052
2005-03-09 18:12:54 +00:00
Max Horn
abd12dd1b6 Use class Mutex instead of MutexRef
svn-id: r16679
2005-01-28 22:05:51 +00:00
Travis Howell
1d86d0599d Set SFX volume correctly
svn-id: r16612
2005-01-22 02:01:22 +00:00
Travis Howell
3b637456aa Set SFX volume correctly.
svn-id: r16611
2005-01-22 01:47:07 +00:00
Travis Howell
211ec4c32a Change SIMON to use makeWAVStream - patch #1101740
svn-id: r16555
2005-01-14 00:38:54 +00:00
Max Horn
cffd917165 system.h was being included in tons of places, without any good reason; reduced this (total dependencies on system.h went down from 193 to 85 files)
svn-id: r16527
2005-01-10 22:06:49 +00:00
Max Horn
7df70de2b1 Mark some places which probably should use loadWAVFromStream(); maybe some of the engine maintainers can look into using it
svn-id: r16503
2005-01-09 15:57:38 +00:00
Max Horn
47280d9433 Updated copyright
svn-id: r16398
2005-01-01 16:09:25 +00:00
Max Horn
d299f0601b Reducing header dependencies a bit
svn-id: r16347
2004-12-27 22:08:20 +00:00
Max Horn
d138a880bf Fix for bug #1091748 (DIG: Starting new games takes a long time); turns out querying the debuglevel from the config-manager very often is too slow
svn-id: r16345
2004-12-27 21:54:20 +00:00