Commit Graph

2868 Commits

Author SHA1 Message Date
Johannes Schickel
5a1c593bf2 Removed assert leftover.
svn-id: r34579
2008-09-16 11:54:37 +00:00
Max Horn
f3dfb5ebab Merged common/gzip-stream.* and common/zlib.*
svn-id: r34578
2008-09-16 11:50:10 +00:00
Max Horn
706fb37061 Modified uncompress in common/zlib.h to return a bool, so that we don't have to #include the real zlib.h; fixed PSP backend to not run uncompress inside an assert (which would cause it to not be invoked when turning off asserts)
svn-id: r34576
2008-09-16 11:42:21 +00:00
Max Horn
05d78c26b4 DS: Backported 0.12 changes to trunk
svn-id: r34568
2008-09-15 22:43:20 +00:00
Max Horn
7df6071a77 Turned compressed savefile wrapper into a generic stream wrapper
svn-id: r34566
2008-09-15 21:55:50 +00:00
Willem Jan Palenstijn
eef9a003ba fix eos() behaviour for CompressedInSaveFile
svn-id: r34562
2008-09-15 19:19:30 +00:00
Max Horn
ace51b317a DS: Some more compile fixes (prope solution would of course be to overload ::openForReading & ::openForWriting)
svn-id: r34550
2008-09-14 22:44:49 +00:00
Willem Jan Palenstijn
c8eeae8d4d Big patch changing semantics of ReadStream::eos():
eos() now only returns true _after_ trying to read past the end of the stream.

This has a large potential for regressions. Please test!

svn-id: r34549
2008-09-14 22:28:53 +00:00
Max Horn
fbfe30bf86 DS: Removed legacy GCC 2.x build code (NDS/DevKitPro uses GCC 3 or newer anyway); thinned down INCLUDES some more; added a FIXME to the elf->bin rule
svn-id: r34548
2008-09-14 22:24:35 +00:00
Max Horn
a7076b1f89 NDS: Replaced -I- by modern -iquote
svn-id: r34547
2008-09-14 22:15:13 +00:00
Max Horn
3c63c8688d Another NDS compilation fix, plus a warning fix
svn-id: r34546
2008-09-14 22:12:59 +00:00
Max Horn
5719225367 Changed VPATH to vpath, to allow building NDS port in parallel to another port (for the records, this patch went to Neil in January, and he didn't complain)
svn-id: r34544
2008-09-14 21:39:45 +00:00
Max Horn
02a846c669 Compilation fix for NDS
svn-id: r34542
2008-09-14 21:32:45 +00:00
Max Horn
655ce26b3f Big patch changing the signature of various Stream methods (some ports may need to be slightly tweaked to fix overloading errors/warnings)
svn-id: r34514
2008-09-13 16:51:46 +00:00
Lars Persson
2befee869b Fixed rev nr. 130 will give wrong ver. in installation.
svn-id: r34512
2008-09-13 08:35:38 +00:00
Lars Persson
472fc70b4d Fixed drascula dat path and version nr.
svn-id: r34511
2008-09-13 08:34:38 +00:00
Lars Persson
169edfccf3 Added SymbianStream.h for SymbianStdioStream definition
Renamed Symbian stream implementation to
SymbianStdioStream instead of StdioStream.

svn-id: r34498
2008-09-11 21:32:40 +00:00
Max Horn
14ac01a11a Simplify check for a slash in the string *g*
svn-id: r34485
2008-09-11 09:25:13 +00:00
Oystein Eftevaag
3b83564ad5 Merged up iPhone backend changes from 0.12 to trunk
svn-id: r34483
2008-09-10 19:46:08 +00:00
Max Horn
4a2a9f49ca Small fix to help with compile problems on Amiga
svn-id: r34474
2008-09-10 09:20:38 +00:00
Lars Persson
c331a92243 Updated/Fixed Symbian Filesystem handling.
Does not store ending backslash on path, and will list any sub folder properly, by adding '\' when needed.

svn-id: r34453
2008-09-08 21:54:04 +00:00
Max Horn
4f9dc05731 Add a priority param to OSystem::addSysArchivesToSearchSet (still in search for a better name ;)
svn-id: r34432
2008-09-07 21:59:25 +00:00
Max Horn
38a44f85ae Added new OSystem method addSysArchivesToSearchSet() [better name pending, suggestions welcome]
svn-id: r34424
2008-09-07 21:30:55 +00:00
Lars Persson
46c2c4300b Slightly updated built script. Faster?
svn-id: r34419
2008-09-07 18:30:07 +00:00
Lars Persson
87688f1044 Updated with two new variations, scumm and brokensword
svn-id: r34418
2008-09-07 18:28:58 +00:00
Lars Persson
864c2244f0 Set default save path via save manager.
Fix bug in symbian-fs GetChild function.

svn-id: r34417
2008-09-07 16:43:03 +00:00
Lars Persson
b3a48455db Updated readme about usage of snprintf source
Added vsnprintf implementation.
Cleanout SymbianOS.cpp from old file functions.

svn-id: r34407
2008-09-07 13:40:30 +00:00
Lars Persson
5c903a8bcb H file cleanup, remove old vibra support
svn-id: r34405
2008-09-07 13:17:21 +00:00
Lars Persson
aabf8ab1f4 Remove SYMBIAN special handing from default handler.
svn-id: r34403
2008-09-07 12:54:26 +00:00
Lars Persson
0d762f5260 Need to have own implementation of snprintf and vsnprintf.
svn-id: r34402
2008-09-07 12:39:56 +00:00
Lars Persson
951ab1878a Updated to include SymbianStream instead of StdioStream
svn-id: r34401
2008-09-07 12:38:35 +00:00
Lars Persson
c9262dd6e2 StdioStream implemented with Symbian file handling.
svn-id: r34400
2008-09-07 12:37:14 +00:00
Lars Persson
c4fcd2b578 Remove symbian defines from stdiostream.cpp
svn-id: r34399
2008-09-07 10:57:28 +00:00
Max Horn
f8bcb0782b Unlike ferror, our Stream::ioFailed() is also supposed to return true when the end of stream has been reached
svn-id: r34385
2008-09-06 17:00:50 +00:00
Lars Persson
5756308cec Portdefs cleanup, use snprintf from SDL and not sprintf (Which can cause memory overwrites).
Use bsearch implementation from WINCE port.

svn-id: r34382
2008-09-06 10:30:05 +00:00
Max Horn
e994723e7c Some tweaks to help (?) OS/2
svn-id: r34368
2008-09-05 20:42:41 +00:00
Lars Persson
5388ecf722 Add symbian implementations to create read/write configfile handles
svn-id: r34363
2008-09-05 19:03:30 +00:00
Lars Persson
f88ad12952 Change location of create fs factory for Symbian!
svn-id: r34362
2008-09-05 18:49:13 +00:00
Lars Persson
2c36f00ff2 Remove usage of main_features.inl and the file
svn-id: r34361
2008-09-05 18:45:04 +00:00
Lars Persson
51e93cadbe ADded Tinsel as supported engine strings
svn-id: r34351
2008-09-05 13:13:51 +00:00
Lars Persson
207efcc359 Add missing dialogs.cpp
svn-id: r34350
2008-09-05 13:03:31 +00:00
Lars Persson
531ff7b33c Still need to get that build working. Readjust buildscript
svn-id: r34348
2008-09-05 12:53:43 +00:00
Lars Persson
fe3c9b0176 Updated build script with new dialog.cpp
svn-id: r34347
2008-09-05 12:30:19 +00:00
Lars Persson
80dd18a820 Updated filehandling for Symbian OS
svn-id: r34346
2008-09-05 12:02:15 +00:00
Max Horn
5308f12c75 Ported AMIGA specific file buffering 'hack' from class File to StdioStream
svn-id: r34345
2008-09-05 11:59:33 +00:00
Lars Persson
d98161fc05 Added two new files
svn-id: r34344
2008-09-05 11:55:58 +00:00
Lars Persson
5c0b91397d Updated Symbian OS file actions with ferror and fflush.
svn-id: r34340
2008-09-05 11:31:51 +00:00
Lars Persson
53f6725596 Updated package revision no to 0.13. Updated default engine list
svn-id: r34339
2008-09-05 11:09:29 +00:00
Lars Persson
1a258a36d0 Updated buildscripts to support tinsel
svn-id: r34338
2008-09-05 11:06:27 +00:00
Joost Peters
3930783928 move save directory detection/creation from main() to OSystem_PSP::initBackend()
svn-id: r34326
2008-09-04 08:34:02 +00:00
Joost Peters
912684de2d remove deprecated SCUMMVM_SAVEPATH define -- pass default savepath to DefaultSaveFileManager ctor
svn-id: r34324
2008-09-04 08:16:39 +00:00
Max Horn
55a05dc0f4 Some cleanup by peres
svn-id: r34308
2008-09-03 15:22:19 +00:00
Max Horn
196ce8eb98 POSIX FSNode: got rid of Double-slashes in paths for childs of the root; simplified code
svn-id: r34307
2008-09-03 14:55:19 +00:00
Max Horn
7f18aaf8ec Pushed AbstractFilesystemNode::openForReading() / openForWriting() impls out to backends
svn-id: r34304
2008-09-03 12:56:46 +00:00
Max Horn
320a5dc99f Moved StdioStream to its own files inside backends
svn-id: r34303
2008-09-03 11:49:02 +00:00
Max Horn
531bcf847c Moved FilesystemNode / FSList to namespace Common; also got rid of some 'typedef Common::String String;' name aliases
svn-id: r34302
2008-09-03 11:22:51 +00:00
Max Horn
c350ffabf3 Added new AbstractFilesystemNode::openForReading & ::openForWriting method, based on StdioStream; changed FilesystemNode to use them
svn-id: r34301
2008-09-03 10:40:46 +00:00
Filippos Karapetis
9691562987 Cleanup
svn-id: r34295
2008-09-03 09:03:21 +00:00
Max Horn
c752e5fcfa Modified POSIX FSNode implementation to use Common::normalizePath & Common::lastPathComponent; added a TODO regarding relative paths
svn-id: r34283
2008-09-02 15:19:31 +00:00
Johannes Schickel
34d43e3319 Applied my patch from -devel, which reenables GMM opening via F6.
svn-id: r34281
2008-09-02 13:27:26 +00:00
Johannes Schickel
b235b51e62 Fake 320x200 resolution instead of 200x320.
svn-id: r34279
2008-09-02 13:17:40 +00:00
Johannes Schickel
d093a63133 Updated NULL backend for FS changes.
svn-id: r34277
2008-09-02 13:13:02 +00:00
Johannes Schickel
c41e1d9ded Added missing include.
svn-id: r34275
2008-09-02 13:05:43 +00:00
Max Horn
027ae0a6f6 First part of GSoC2008 RTL branch merge
svn-id: r34241
2008-09-01 17:30:03 +00:00
Stephen Kennedy
11c0a3bded Updated comments, and general cleanup
svn-id: r34203
2008-08-29 21:10:10 +00:00
Max Horn
cb21c25e41 FSNode code: Merged most versions of lastPathComponent() into one new AbstractFilesystemNode::lastPathComponent() method, with customizable path separator character
svn-id: r34197
2008-08-27 20:31:22 +00:00
Max Horn
31320430de Partial commit of patch #2012839: Atari Patch for adding Native MIDI and Fix Compile
svn-id: r34194
2008-08-27 18:52:21 +00:00
Max Horn
5860aa45b7 Slightly modified form of patch #2043093: OS/2 patches for posix-fs
svn-id: r34193
2008-08-27 18:38:06 +00:00
Max Horn
44266bfc28 Slightly cleaned up version of patch #2072006: Enhance OSystem_SDL::setupIcon
svn-id: r34192
2008-08-27 18:21:03 +00:00
Kostas Nakos
7214ab5f5b Update readme
svn-id: r34164
2008-08-25 17:43:56 +00:00
Kostas Nakos
50b55a6f6f patch 1868881: ini option to disable doubletap rmb
svn-id: r34141
2008-08-25 08:48:46 +00:00
Kostas Nakos
2b2bfc04c1 patch 1984130: Add Tremolo info
svn-id: r34138
2008-08-25 08:11:52 +00:00
Stephen Kennedy
baae044e38 Proper fix for key repeat bug - r34094 caused different problems due to repeated key up events
svn-id: r34115
2008-08-23 17:04:40 +00:00
Travis Howell
dded0de6c2 Remove warning about change of config file location under Windows, since it is frequently repeated (due to code restructures). The information is mentioned in the README anyway.
svn-id: r34104
2008-08-22 13:01:23 +00:00
Max Horn
16e02f051d Turned SymbianFilesystemFactory from a singleton into a normal class; adapted symbian backend accordingly
svn-id: r34101
2008-08-22 11:49:34 +00:00
Max Horn
79751b07ae SDL backend: Simplified openConfigFileForReading/openConfigFileForWriting impl; also init _fsFactory in constructor, as it is needed to load the config file
svn-id: r34100
2008-08-22 11:45:29 +00:00
Max Horn
a237ba75bc Symbian backend does not have to implement config file methods, as long as they are identical to those in the SDL backend...
svn-id: r34099
2008-08-22 11:41:14 +00:00
Max Horn
b727ac880d Turned Windows, AmigaOS and POSIX FSFactories into plain classes; no need for them to be singletons (actually true for all other FS factories)
svn-id: r34098
2008-08-22 11:36:47 +00:00
Max Horn
74238bb53a Moved POSIXFilesystemNode class declaration to a new header file, to enable subclassing
svn-id: r34097
2008-08-22 11:19:41 +00:00
Max Horn
3ec5658d00 code formatting cleanup
svn-id: r34096
2008-08-22 11:17:12 +00:00
Stephen Kennedy
648f6ed934 Fixed display cursor position bug
svn-id: r34095
2008-08-22 10:47:36 +00:00
Stephen Kennedy
2d52f129bb Fix for key repeat bug
svn-id: r34094
2008-08-22 10:36:12 +00:00
Johannes Schickel
9138128f5c - Committed Max' compressed save backseeking support from patch #2050337 "KYRA/SCUMM: Thumbnail support/improvement"
- Extended SCUMM engine to support savegames without thumbnail header. (Increased savegame version to prevent saves to be loaded from older ScummVM versions)
- Fixed KYRA to properly support savegames without thumbnail header.

svn-id: r34054
2008-08-20 14:24:16 +00:00
Lars Persson
a045b77b59 Don't Use CEikonEnv::Static, get FS from system class instead
svn-id: r34025
2008-08-19 08:54:28 +00:00
Lars Persson
106a38efc3 Enable save game action key in Touche for WinCE devices.
svn-id: r34013
2008-08-18 21:19:18 +00:00
Lars Persson
206c849ffa Enable quick F5 save key for Touche!
svn-id: r34011
2008-08-18 21:09:46 +00:00
Robin Watts
90b59af2ba Updates to the scummvm blitting code as discussed on the mailing list.
1) Remove DS version of the ARM blitters in favour of the 'normal' ARM one.
 2) Update normal ARM blitter to use Carlo's clever algorithm.
 3) Update C version with Max Horns patch (slightly tweaked - counting down
on loops is better, M'kay).

svn-id: r34006
2008-08-18 20:04:15 +00:00
Stephen Kennedy
3451895189 Final changes to keymapper:
* HardwareKey's now have a type too, so that we can either match a key to an action or vice versa.
* Better test keymaps - with special gui keymap that is activated when a dialog is opened

svn-id: r34005
2008-08-18 19:54:46 +00:00
Kostas Nakos
f57e600fa5 switching to libTremolo
svn-id: r33999
2008-08-18 18:15:32 +00:00
Kostas Nakos
b809665671 do away with the smush force redraw hack
svn-id: r33991
2008-08-18 17:24:25 +00:00
Stephen Kennedy
12d649f011 remap dialog updates
svn-id: r33990
2008-08-18 15:13:55 +00:00
Stephen Kennedy
68e45aab3a Makefile update for last commit
svn-id: r33989
2008-08-18 14:47:08 +00:00
Stephen Kennedy
565fa728e7 Removed KeymapManager class. Automatic mapping now done in Keymap. Rest of KeymapManager functionality is implemented in Keymapper.
svn-id: r33988
2008-08-18 14:45:42 +00:00
Stephen Kennedy
049ac6c42b Updated to latest version of XMLParser, and modified VirtualKeyboardParser to reflect changes.
svn-id: r33987
2008-08-18 12:44:54 +00:00
Stephen Kennedy
d92909203b - proper init of virtual keyboard now implemented (involved added EventManager::init() which is called after screen has been initialised)
- changed HardwareKey / Action id field to an array of 4 chars instead of int32. Means that the keymap key/value pairs in config file are more readable.

svn-id: r33986
2008-08-18 10:07:11 +00:00
Lars Persson
8d4461d2c9 Improved filehandling for securer and quicker way to get ref to file session
svn-id: r33978
2008-08-17 21:16:07 +00:00
Stephen Kennedy
63c4a61032 Various virtual keyboard bug fixes
svn-id: r33969
2008-08-17 12:11:34 +00:00
Johannes Schickel
388b3f0296 Properly close files opened when checking for config file on WIN32.
svn-id: r33953
2008-08-16 22:30:47 +00:00
Max Horn
c91bf34039 Replaced ARM_USE_GFX_ASM by USE_ARM_GFX_ASM
svn-id: r33934
2008-08-16 11:37:36 +00:00
Lars Persson
37b149049e Enable CINE
svn-id: r33932
2008-08-16 08:49:36 +00:00
Christopher Page
909b66ef54 Merged revisions 33777,33781-33788,33790,33792-33793,33795,33797,33805,33807-33812,33815-33817,33819,33822,33826,33829,33837,33839,33844,33847,33858-33861,33864,33871-33873,33875,33877-33879,33886,33889-33892,33894,33896,33900,33902-33903,33919 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33924
2008-08-16 04:30:01 +00:00
Stephen Kennedy
8c2340d323 Optimization and cleanup of VirtualKeyboardGUI
svn-id: r33916
2008-08-15 21:00:54 +00:00
Stephen Kennedy
93780d51ca Added clear event to virtual keyboard
svn-id: r33913
2008-08-15 19:41:34 +00:00
Stephen Kennedy
6ef8324302 * Added Virtual Keyboard descriptions for all keycodes
* Tweaking of key delivery queue

svn-id: r33907
2008-08-15 17:53:18 +00:00
Lars Persson
b4a2aee964 UpdUpdated actions and Readme for Symbian OS port!
svn-id: r33902
2008-08-15 14:38:25 +00:00
Stephen Kennedy
6f09c4f10e Added close button on remap dialog
svn-id: r33888
2008-08-15 01:22:09 +00:00
Stephen Kennedy
fca5a0ad34 Virtual Keyboard:
* added support for submit, cancel, backspace, and cursor movement commands
* minor API modifications

svn-id: r33887
2008-08-15 01:21:29 +00:00
Stephen Kennedy
c61294e70f Changed Action constructor to take a pointer to the Keymap it belongs too, meaning Keymap::addAction is automatically called
svn-id: r33885
2008-08-14 23:45:02 +00:00
Stephen Kennedy
6d0ed23b44 Fixed crash when clicking on area of remap dialog with no button in
svn-id: r33884
2008-08-14 23:38:13 +00:00
Stephen Kennedy
86d0c8cb11 Fixed simple keymap test
svn-id: r33874
2008-08-14 21:21:05 +00:00
Stephen Kennedy
08ef79ce45 Loads of valgrind fixes
svn-id: r33869
2008-08-14 19:20:25 +00:00
Stephen Kennedy
d40e7a6640 Fix for regression
svn-id: r33854
2008-08-14 01:48:19 +00:00
Stephen Kennedy
c1e8e340ff * Saving of keymaps fully implemented
* Added Keymapper::cleanupGameKeymaps() with code to remove game keymaps from active stack

svn-id: r33853
2008-08-14 01:42:02 +00:00
Stephen Kennedy
5ca906fbd7 Keymapper: support for saving to config file enabled
svn-id: r33850
2008-08-13 22:20:18 +00:00
Max Horn
8a84e3a46f cleanup
svn-id: r33847
2008-08-13 20:37:54 +00:00
Kostas Nakos
56c9e3ab04 fix a small bug in the quit dialog
svn-id: r33844
2008-08-13 19:32:25 +00:00
Stephen Kennedy
70dde2d8bd RemapDialog now properly uses reflowLayout() and open(), so that the same instance can be reopened
svn-id: r33843
2008-08-13 19:24:52 +00:00
Kostas Nakos
5a54dc61a4 fix bug #1910057: FT multifunction
svn-id: r33839
2008-08-13 19:13:53 +00:00
Kostas Nakos
e514760c7a fix bug #2038992 by saving and restoring channel volumes
svn-id: r33829
2008-08-13 15:16:38 +00:00
Stephen Kennedy
17c1dba992 Keymapper WIP:
* Further improvement of automatic mapping
* Remap dialog - added timeout feature

svn-id: r33827
2008-08-13 14:33:17 +00:00
Stephen Kennedy
532faef82b Keymapper WIP:
* Improved automatic mapping algorithm
* Remap dialog overhaul - now displays active keymap(s)

svn-id: r33821
2008-08-13 11:46:08 +00:00
Stephen Kennedy
300a1df2b0 Remap dialog WIP
svn-id: r33791
2008-08-11 23:08:21 +00:00
Andre Heider
c8188bf344 build a wii binary per default
svn-id: r33788
2008-08-11 22:44:29 +00:00
Andre Heider
15ca970498 video mode polishing:
* proper fullscreen video mode
* multiple graphic modes with different overscan values
* "fullscreen mode" stretches the picture on 16:9 displays
* fixed broken sword 1/2 gfx garbage
* support for setShakePos()

svn-id: r33787
2008-08-11 22:43:00 +00:00
Stephen Kennedy
626547a706 * Updated virtual keyboard pack
svn-id: r33776
2008-08-11 13:12:32 +00:00
Stephen Kennedy
b2032650d1 * Added test keyboard pack
svn-id: r33775
2008-08-11 11:55:10 +00:00
Christopher Page
fcc00f20b9 Merged revisions 33719,33721-33723,33725-33727,33729-33730,33733,33736,33742,33754,33756,33758,33761,33763,33766 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33769
2008-08-10 21:58:18 +00:00
Kostas Nakos
002c55dfac add support for drascula engine
svn-id: r33754
2008-08-10 17:10:09 +00:00
Andre Heider
c60565e108 Updated the Makefile to the new build system.
Introduced a Makefile variable to build a gamecube version.

svn-id: r33723
2008-08-09 20:02:56 +00:00
Christopher Page
ce3d1e1a7d Merged revisions 33632-33633,33635,33637,33639-33640,33642-33645,33648,33654-33655,33664,33667-33670,33673-33674,33678,33682,33686-33691,33693,33696,33698,33700,33703,33708,33710,33712-33714,33716 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33720
2008-08-09 19:03:29 +00:00
Andre Heider
f098b2817f Updates to the recent OSystem API changes
svn-id: r33719
2008-08-09 18:37:18 +00:00
Kostas Nakos
355f100793 fix MR on ce: allocate large buffer on the heap instead and of the stack, and improve the workaround
svn-id: r33714
2008-08-09 18:09:24 +00:00
Stephen Kennedy
4eacc09024 Keymapper WIP:
* Got rid of default keymaps as they over-complicated the API
* Remapping dialog WIP

svn-id: r33699
2008-08-08 14:23:59 +00:00
Kostas Nakos
a30ecc96a0 setup interface for later kyra games
svn-id: r33682
2008-08-07 18:36:12 +00:00
Stephen Kennedy
2645ca48ad * Moved VK code into backends/vkeybd
* Moved Keymapper code into backends/keymapper

svn-id: r33681
2008-08-07 16:38:39 +00:00
Stephen Kennedy
66e4e3ec1a * Removed Shape base class
* Reverted Rect to not derive from Shape
* ImageMap now just uses Polygon's

svn-id: r33680
2008-08-07 15:44:48 +00:00
Stephen Kennedy
d6ffc14a7e Keymapper cleanup:
*Removed need to call initGame / cleanupGame on Keymapper

svn-id: r33679
2008-08-07 14:16:48 +00:00
Stephen Kennedy
69d7c1d2ca * Some Valgrind fixes
* Got rid of svn:mergeinfo properties

svn-id: r33677
2008-08-07 13:19:00 +00:00
Stephen Kennedy
72da19afef Keymapper WIP:
* Made Keymap class responsible for loading / saving of mappings

svn-id: r33665
2008-08-06 19:21:45 +00:00
Stephen Kennedy
57b13141af Keymapper WIP:
* Implemented stack-based active map in Keymapper
* Started proper testing by adding code to OSystem_SDL to set up simple HardwareKeySet and Keymap

svn-id: r33660
2008-08-06 14:21:05 +00:00
Torbjörn Andersson
4e66938e8c Committed my patch #2026097 ("ALSA: Try both 65:0 and 17:0 by default"), with a
slight modification to the README changes. (I don't know how to interpret all
the output from aconnect, so I'm only documenting "the most important bit".)

svn-id: r33648
2008-08-05 21:43:10 +00:00
Travis Howell
a9bef1051e Remove file attribute check, since getChild() can be called on file path that doesn'r exist.
svn-id: r33633
2008-08-05 11:42:04 +00:00
Christopher Page
2acbc2a88e Merged revisions 33626-33627 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33629
2008-08-05 02:31:26 +00:00
Travis Howell
7318533189 Fix win32 compile.
svn-id: r33626
2008-08-05 00:21:46 +00:00
Christopher Page
4198ee9623 Merged revisions 33188-33189,33191-33193,33196,33198,33202-33203,33206,33210,33212,33218-33220,33222,33224-33226,33229-33243,33246,33248-33250,33252,33258-33261,33263,33266,33270,33272-33283,33285,33287-33290,33295-33298,33321,33325-33330,33332-33335,33337-33340,33342,33345,33347,33349-33350,33352-33357,33359-33367,33369-33371,33373,33375-33377,33379-33380,33383-33385,33387-33389,33392-33394,33400-33402,33404-33405,33407-33410,33412-33416,33418-33419,33425-33427,33432,33436-33438,33444,33446,33452-33453,33455-33459,33463-33464,33466-33471,33473-33474,33478,33490,33492,33495-33496,33509-33512,33518-33519,33522-33527,33529-33530,33537,33541,33544,33546,33550,33552-33554,33556,33558,33561-33562,33565,33568,33570,33574,33576,33578-33581,33584-33587,33590,33596,33604-33611,33614-33615,33617-33618,33620-33621 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
 

svn-id: r33624
2008-08-04 22:34:07 +00:00
Lars Persson
5dd834488e Symbian build package should now contain drascula.dat also
svn-id: r33623
2008-08-04 20:00:56 +00:00
Max Horn
4f5479ee74 Pushed some port specific code from DefaultSaveFileManager out to port specific code in backends/platform/
svn-id: r33621
2008-08-04 19:38:28 +00:00
Lars Persson
476e5bbb10 List the correct engines in about,
updated actions with Lure (from WinCE). 
Increased min heap size to 5MB

svn-id: r33618
2008-08-04 18:14:17 +00:00
Max Horn
4900a3e96e Remove some code which was rendered obsolete by md5's commit r33610
svn-id: r33617
2008-08-04 17:46:22 +00:00
Max Horn
2f2a4f03d0 Modified DefaultSaveFileManager::checkPath to perform at least basic checks on non-UNIX, non-Symbian systems
svn-id: r33615
2008-08-04 17:41:07 +00:00
Max Horn
92d6ee3d76 Moved ConfMan.registerDefault calls for savepath to DefaultSaveFileManager (eventually, should be pushed into backends/platform/ code)
svn-id: r33614
2008-08-04 17:17:37 +00:00
Filippos Karapetis
2efe13026d Fixing compilation under MSVC
svn-id: r33610
2008-08-04 15:01:41 +00:00
Max Horn
d061e50a7e DefaultSaveFileManager: Killed class StdioSaveFile, used FilesystemNode::openForReading()/openForWriting() instead (may cause regressions, watch out)
svn-id: r33608
2008-08-04 11:48:33 +00:00
Max Horn
c92ee34e45 Removed join_paths from default save manager, and use FSNode API instead (may lead to regressions, watch out)
svn-id: r33605
2008-08-04 11:32:42 +00:00
Max Horn
01f07b5e21 cleanup
svn-id: r33587
2008-08-03 18:29:37 +00:00
Max Horn
b54a1227d9 OSYSTEM: Pushed some SDL/Symbian specific code to the respective backends; made openConfigFileForReading/openConfigFileForWriting return 0 if they failed to open a file
svn-id: r33585
2008-08-03 17:05:01 +00:00
Stephen Kennedy
1caf48b084 Keymapper WIP:
* Renamed UserAction to simply Action
* Implemented simple automatic mapping algorithm

svn-id: r33497
2008-08-01 16:44:49 +00:00
Lars Persson
e89a01dc63 Enabled the correct features for standard builds
svn-id: r33478
2008-07-31 17:33:48 +00:00
Stephen Kennedy
f2e71ec6d6 added display functionality to VirtualKeyboard to allow preview of key presses to be visible
svn-id: r33476
2008-07-31 17:26:03 +00:00
Stephen Kennedy
ad6563a57a Bug fixes to get new keyboard pack working
svn-id: r33465
2008-07-31 10:54:13 +00:00
Stephen Kennedy
a4ac44875e Merged revisions 33188-33189,33191-33193,33196,33198,33202-33203,33206,33210,33212,33218-33220,33222,33224-33226,33229-33243,33246,33248-33250,33252,33258-33261,33263,33266,33270,33272-33283,33285,33287-33290,33295-33298,33321,33325-33330,33332-33335,33337-33340,33342,33345,33347,33349-33350,33352-33357,33359-33367,33369-33371,33373,33375-33377,33379-33380,33383-33385,33387-33389,33392-33394,33400-33402,33404-33405,33407-33410,33412-33416,33418-33419,33425-33427,33432,33436-33438,33444,33446 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33450
2008-07-30 14:40:54 +00:00
Stephen Kennedy
e2a2a672f5 - major re-factoring of VK - all GUI-related code has been abstracted to VirtualKeyboardGUI class
- fixed bug with parsing modifiers in VirtualKeyboardParser
- fixed numerous GCC warnings

svn-id: r33448
2008-07-30 13:47:54 +00:00
Stephen Kennedy
a051061e38 GCC compilation fixes
svn-id: r33430
2008-07-29 23:24:48 +00:00
Max Horn
4a9104515c SDL: Properly init vars related to mixer double buffering
svn-id: r33385
2008-07-29 00:02:06 +00:00
Nicola Mettifogo
b0e2cd5967 Fixed constructor for WindowsFilesystemNode. On Windows, trailing slashes can be added only to directory names.
svn-id: r33350
2008-07-28 02:56:17 +00:00
Lars Persson
ff64eb3756 Fix for ftell error when caching. HOF now starts properly
svn-id: r33340
2008-07-27 18:22:23 +00:00
Johannes Schickel
52e3dec37b Fixed win32 plugin provider.
svn-id: r33330
2008-07-27 11:07:38 +00:00
Oystein Eftevaag
5ca78661b1 The iPhone backend is now (mostly) up to speed again, and works for firmware 2.0
svn-id: r33326
2008-07-27 10:15:57 +00:00
Stephen Kennedy
6e48d5c76d VirtualKeyboard:
- implemented functionality for modifier keys
- cleaned up parser
- started on text display

svn-id: r33317
2008-07-26 20:35:46 +00:00
Stephen Kennedy
dfcdbb0d33 KeymapManager - implemented loading/saving of keymaps
- Refactoring of code to map a key to a UserAction - now we call a method on UserAction to do it (and it then tells the Keymap class)
- General cleanup of code

svn-id: r33262
2008-07-24 10:00:56 +00:00
Stephen Kennedy
2f064da102 Most of Keymapper class complete
DefaultEventManager now initialises Keymapper and passes key press events to it

svn-id: r33227
2008-07-23 08:45:12 +00:00
Lars Persson
62d4a469b9 AddedAdded MAD as default feature
svn-id: r33218
2008-07-22 20:13:57 +00:00
Lars Persson
abecf0a5f7 Fixed seek problem when cached data is used.
svn-id: r33210
2008-07-22 18:52:13 +00:00
Stephen Kennedy
0861fa4c00 Merged revisions 32879,32883,32895,32899,32902-32904,32910-32912,32923-32924,32930-32931,32938,32940,32948-32949,32951,32960-32964,32966-32970,32972-32974,32976,32978,32983,32986-32990,32992,32994,33002-33004,33006-33007,33009-33010,33014,33017,33021-33023,33030,33033,33052-33053,33056-33058,33061-33064,33068,33070,33072,33075,33078-33079,33083,33086-33087,33089,33094-33096,33098-33099,33104,33108-33109,33114-33117,33120,33135-33146,33160,33162,33165,33167-33169 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33185
2008-07-22 00:15:13 +00:00
Christopher Page
09f4fd946e Merged revisions 33052-33053,33056-33058,33061-33064,33068,33070,33072,33075,33078-33079,33083,33086-33087,33089,33094-33096,33098-33099,33104,33108-33109,33114-33117,33120,33135-33146,33160,33162,33165,33167-33169 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33183
2008-07-21 22:46:39 +00:00
Stephen Kennedy
a58080bd58 Changed pushEvent to use a const& argument
svn-id: r33175
2008-07-21 18:53:55 +00:00
Stephen Kennedy
871adba671 Refactored KeymapManager to use Domain's of Keymaps rather than a single list.
Further development of Keymapper interface: 
- switchKeymap method to change Keymaps
- initGame/deInitGame methods to control loading/unloading of game-specific maps

svn-id: r33173
2008-07-21 15:55:25 +00:00
Stephen Kennedy
757ed1a094 Moved UserAction and HardwareKey classes into their own respective header files.
Added HardwareKeySet class to manage a devices set of hardware keys.
Started implementing Keymapper class.

svn-id: r33157
2008-07-21 00:11:25 +00:00
Marcus Comstedt
e54ac15109 Solaris tr does not like character classes in some locales. Use "C" locale.
svn-id: r33143
2008-07-20 17:56:43 +00:00
Kostas Nakos
0d08240e45 a little more cleanup
svn-id: r33142
2008-07-20 17:04:27 +00:00
Kostas Nakos
90781369cb modified patch #1882942 - optimize and kill code for really old platforms
svn-id: r33141
2008-07-20 16:55:51 +00:00
Stephen Kennedy
4c730401fe WIP KeymapManager implementation, can only register/unregister keymaps.
svn-id: r33131
2008-07-20 15:42:52 +00:00
Kostas Nakos
8b5e175af4 workaround for bogus findfirstfile. kyra now starts up correctly
svn-id: r33120
2008-07-20 11:15:29 +00:00
Max Lingua
8c807529a7 Added "DEPDIR := .deps" in Makefile.ps2
Thanks Max [the other one] for pointing it out!

svn-id: r33117
2008-07-20 01:44:40 +00:00
Max Lingua
282cb3c0df 1. Re-added "rpckbd" as in 0.11.0
2. Committed only its source, you will need to do a make inside its folder
   before being able to compile our beloved PlayStation2 backend.

Enjoy,
 -max

svn-id: r33115
2008-07-20 01:30:47 +00:00
Stephen Kennedy
0b8203b0e5 More WIP development of Keymap class
svn-id: r33113
2008-07-19 19:12:49 +00:00
Lars Persson
ec02171268 Enable support to turn off ALL variations. all variation is most often the one used
svn-id: r33109
2008-07-19 07:44:12 +00:00
Lars Persson
6cff2e8239 eof was not working properly with caching
svn-id: r33108
2008-07-19 07:08:37 +00:00
Stephen Kennedy
19345b5a62 Keymap class implemented. KeymapManager and Keymapper classes started
svn-id: r33107
2008-07-19 00:57:37 +00:00
Lars Persson
4657a52b07 Fixed typo in filehandling
svn-id: r33104
2008-07-18 22:07:52 +00:00
Lars Persson
0f03a7bcd8 Introduced cache for filereading to fix slowness in AGOS among others.
svn-id: r33099
2008-07-18 20:40:48 +00:00
Lars Persson
7b00db0312 Symbian soundsmixer update. (Compile fix)
svn-id: r33098
2008-07-18 19:02:40 +00:00
Paul Gilbert
cb366384f7 In OSystem_SDL::closeMixer moved the call to SDL_CloseAudio to before the deletion of the _mixer variable in to fix an assert that was being generated in OSystem_SDL::mixCallback
svn-id: r33095
2008-07-18 09:36:49 +00:00
Max Horn
0f74124d78 Committing PS2 changes on behalf of the other Max ;)
svn-id: r33089
2008-07-17 15:56:24 +00:00
Christopher Page
7f480ac571 Quit and RTL code is more modular now. EVENT_RTL no longer sets _shouldQuit, shouldQuit is only set if there's an EVENT_QUIT. EVENT_RTL and EVENT_QUIT are completely separate from each other. Engine::quit() method now checks both _shouldQuit and _shouldRTL to determine if the engine should exit. There is no longer a need for resetQuit(), so it's removed
svn-id: r33082
2008-07-16 04:22:56 +00:00
Christopher Page
7ecd54a9da Reverted some incorrect changes and fixed sound settings issues for LURE. Fixed issues with quitting and calling GMM during intro sequences in LURE. Added a KEYCODE_MAINMENU in common/keyboard.h for the GMM.
svn-id: r33081
2008-07-15 22:54:39 +00:00
Max Horn
943b4c2036 Implemented audio double buffering (for now OSX only)
svn-id: r33075
2008-07-15 17:13:06 +00:00
Max Horn
0860df5d0e Fixed code formatting
svn-id: r33056
2008-07-14 07:54:18 +00:00
Christopher Page
d2e8d4831e Merged revisions 32744-32745,32747,32750-32759,32762-32764,32769,32777,32783,32785-32786,32789-32791,32798-32799,32801-32807,32809-32812,32816-32817,32819-32821,32823-32830,32832-32836,32838-32844,32846-32850,32852-32854,32858-32859,32865-32868,32873-32874,32879,32883,32895,32899,32902-32904,32910-32912,32923-32924,32930-32931,32938,32940,32948-32949,32951,32960-32964,32966-32970,32972-32974,32976,32978,32983,32986-32990,32992,32994,33002-33004,33006-33007,33009-33010,33014,33017,33021-33023,33030,33033 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33051
2008-07-14 00:10:09 +00:00
Christopher Page
a6e1d6bd3d SKY works with the new GMM implementation, also updated gui/newgui.cpp and prevented pushEvent from pushing more than one EVENT_QUIT into the artificialEventQueue
svn-id: r33041
2008-07-13 20:41:39 +00:00
Stephen Kennedy
28cb417fb1 Added comments in virtual-keyboard-parser.h describing the file format. Added a delay functionality to the delivery of artificial events in DefaultEventManager, to get round events being ignored when delivered consecutively.
svn-id: r33012
2008-07-12 12:40:57 +00:00
Stephen Kennedy
8aa09cbb99 Better handling of virtual keyboard and gui being displayed at the same time. VK now also uses its own cursor.
svn-id: r33008
2008-07-11 20:10:14 +00:00
Christopher Page
67c8c39fdf Queen works with the new GMM implementation, and made a correction to a change in parallaction
svn-id: r32999
2008-07-11 00:49:01 +00:00
Bertrand Augereau
f41ab55021 Fixed a few warnings
svn-id: r32994
2008-07-10 18:01:54 +00:00
Stephen Kennedy
48ed272c8d - added system delay to event loop, to reduce CPU usage
svn-id: r32979
2008-07-09 23:05:47 +00:00
Neil Millstone
9f96471f47 DS: Backend changes for new mixer code
svn-id: r32978
2008-07-09 16:50:23 +00:00
Stephen Kennedy
1f0b3ceb36 Added pushEvent to EventManager (from cpage88's branch) and changed VirtualKeyboard so that it uses this method to feed key presses its resulting key press events.
svn-id: r32977
2008-07-09 13:33:36 +00:00
Stephen Kennedy
b035101732 - keyboard fully tested with multiple modes - key press events successfully passed back to engine, mode switching also works
- added support to re-parse keyboard pack if overlay size changes (to find more suitable layouts)

svn-id: r32975
2008-07-09 11:30:49 +00:00
Christopher Page
e808cdf7a0 Reimplemented pushEvent() and artificialEventQueue to work with Events instead of EventTypes. Reimplemented Queue as a List instead of Array. Updated AGOS, AGI, CINE, GOB, and KYRA to work with the current implementation of the GMM
svn-id: r32971
2008-07-09 02:27:05 +00:00
Joost Peters
a833c9dd86 set DEPDIR
svn-id: r32969
2008-07-08 17:46:26 +00:00
Joost Peters
65ddc23a6b Enable static engines -- time to start thinking about prx/plugin support!
svn-id: r32968
2008-07-08 17:41:09 +00:00
Joost Peters
926df065f4 changes for new Mixer API
svn-id: r32967
2008-07-08 17:20:26 +00:00
Stephen Kennedy
d1bc01b1a9 - Virtual keyboard now can now be dragged, when the user clicks on any part of it that is not a special area.
- Fixed non-virtual destructor warnings for Shape and Rect classes

svn-id: r32965
2008-07-08 15:03:39 +00:00
Christopher Page
a4f56de13a Implemented Common::EventManager::pushEvent() to insert fake events into the event queue. Quit and RTL events have been added, and are now tracked by the DefaultEventManager using shouldQuit() and shouldRTL(). AGOS is working with this new implementation, other engines to follow.
svn-id: r32952
2008-07-07 22:34:45 +00:00
Stephen Kennedy
641e3d752e MILESTONE: bitmap showing with key color transparency implemented!
- SurfaceKeyColored class handles blitting of keycolor transparency data
- ImageMap tested - Rect and Polygon areas seem to be working as expected

svn-id: r32950
2008-07-07 21:10:58 +00:00
Stephen Kennedy
ee8d55375b - updates for GCC compilation - still having linker errors though :(
svn-id: r32944
2008-07-07 15:45:48 +00:00
Stephen Kennedy
275ffece2f - changed VirtualKeyboard classes to Common namespace
- updated XMLParser from Tanoku's branch

svn-id: r32943
2008-07-07 15:42:26 +00:00
Stephen Kennedy
5840c2480f - renaming of files
svn-id: r32942
2008-07-07 15:06:43 +00:00
Stephen Kennedy
7e3639e68b - moved VirtualKeyboard files into backends/common directory
svn-id: r32941
2008-07-07 14:52:30 +00:00
Stephen Kennedy
98f999f8e0 WIP: VirtualKeyboard updates:
- got keyboard bitmap displaying (no transparency as yet)
- simple event loop for VK to capture mouse clicks done (and untested code to process the clicks)
- pollEvent() method to deliver the virtual key press events to EventManager

svn-id: r32939
2008-07-07 14:30:11 +00:00
Sven Hesse
1f4ebd2f47 Don't let listSavefiles() search subdirectories. Files with the same name (in different directories) would cause duplicate entries for the same file.
svn-id: r32938
2008-07-07 13:01:54 +00:00
Andre Heider
95ca13246e adjustments to the recent mixer api changes
svn-id: r32924
2008-07-06 12:04:19 +00:00
Marcus Comstedt
32f653f2b1 Enable all engines.
svn-id: r32923
2008-07-05 22:53:17 +00:00
Christopher Page
a14a0d16c1 Changes to implementation of the GMM
svn-id: r32872
2008-07-02 00:30:49 +00:00
Lars Persson
f530c36ad4 del instead of rm command
svn-id: r32853
2008-06-30 19:10:32 +00:00
Joost Peters
0a3d03797a changes required for new mixer API + implement getMillis() and delayMillis() using gettimeofday() and usleep() resp.
svn-id: r32846
2008-06-29 23:36:44 +00:00
Kostas Nakos
20a50f523e fix some quirks of the newer build system
svn-id: r32840
2008-06-29 14:41:44 +00:00
Kostas Nakos
76769bf515 finish up new mixer changes
svn-id: r32839
2008-06-29 14:40:41 +00:00
Marcus Comstedt
4b09d08292 Updated to use new EngineMan.detectGames() API.
svn-id: r32838
2008-06-29 12:10:38 +00:00
Marcus Comstedt
3f22509321 New Mixer API.
svn-id: r32836
2008-06-29 11:51:47 +00:00
John Willis
86706eb7d7 Small GP2X tidy (mostly svn:executable on scripts) and fixes needed to reflect "Patch ##1956946 (Audio::Mixer internal API revision)"
svn-id: r32835
2008-06-29 10:16:20 +00:00
Marcus Comstedt
7a9e911896 Set $(DEPDIR).
svn-id: r32832
2008-06-28 22:16:51 +00:00
Max Horn
c45d632f3b Patch ##1956946 (Audio::Mixer internal API revision) with some tweaks
svn-id: r32828
2008-06-28 15:28:29 +00:00
Max Horn
e68efca5a1 Doxygenified a comment
svn-id: r32827
2008-06-28 15:27:40 +00:00
Max Horn
3b1a60c3b2 Removed obsolete ::clearSoundCallback() code
svn-id: r32826
2008-06-28 15:13:54 +00:00
Max Horn
861cf07522 Removed dead X11 backend
svn-id: r32825
2008-06-28 15:00:27 +00:00
Joost Peters
ad447b6f39 add getFilesystemFactory() method to null backend
svn-id: r32823
2008-06-28 13:53:39 +00:00
Christopher Page
d0dcc1ad79 Quit or RTL from the main menu now triggers an EVENT_QUIT in DefaultEventManager::pollEvent()
svn-id: r32813
2008-06-26 22:03:49 +00:00
Lars Persson
73b155d087 Remove inclusion of .o in mmp.in
svn-id: r32806
2008-06-26 18:45:46 +00:00
Lars Persson
dcca780744 Changed default paths
svn-id: r32805
2008-06-26 18:31:33 +00:00
Lars Persson
fafda89d0c Fixed Symbian buildsystem for new defines. Fixed ARM asm syntax for Symbian build.
svn-id: r32803
2008-06-26 16:51:02 +00:00
Christopher Page
f878820bbe Created Global Main Menu Dialog. Made a uniform _quit flag for engines. So far agi, agos, and cine are now using the new _quit flag.
svn-id: r32770
2008-06-24 21:15:30 +00:00
Johannes Schickel
5c8a93b486 Update comment.
svn-id: r32752
2008-06-22 12:39:40 +00:00
Christopher Page
37a7a572cf Merged revisions 32668-32669,32676,32687-32689,32693,32695,32698-32701,32705 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r32720
2008-06-16 19:06:48 +00:00
Eugene Sandulenko
bc01acd18f Make null plugin compilable
svn-id: r32705
2008-06-15 07:15:58 +00:00
Jordi Vilalta Prat
256036d4af Fixed ALSA's invalid port error message
svn-id: r32698
2008-06-14 04:52:10 +00:00
Jordi Vilalta Prat
8eac356946 Added initial interface to list music devices and their types
svn-id: r32695
2008-06-13 16:04:43 +00:00
Jordi Vilalta Prat
177993b145 Renamed MIDI plugins to Music plugins
svn-id: r32693
2008-06-13 14:30:47 +00:00
Christopher Page
e86a422e25 Merged revisions 32564-32565,32567-32575,32577,32579-32594,32596-32603,32605-32639,32644-32646,32648-32666 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r32667
2008-06-11 17:36:21 +00:00
Jordi Vilalta Prat
280a7c4c22 Show warnings when a plugin couldn't be loaded
svn-id: r32627
2008-06-09 03:59:16 +00:00