Commit Graph

189 Commits

Author SHA1 Message Date
Max Horn
d3642080de Moved check for shouldRTL() from engines to scummvm_main
svn-id: r34310
2008-09-03 16:56:40 +00:00
Christopher Page
ec8dac5540 Added a MetaEngineFeature for RTL support, the RTL button is disabled in the GMM if the engine doesn't support it
svn-id: r33921
2008-08-16 02:53:16 +00:00
Christopher Page
9d3cdcb2da Defined some MetaEngineFeatures for the engines, the launcher uses these features to allow/disallow loading and deleting saves
svn-id: r33909
2008-08-15 18:15:14 +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
Gregory Montoir
52650efb6a fix for bug #2040484: TOUCHE: Graphic glitch with long answer options
svn-id: r33691
2008-08-07 21:50:12 +00:00
Gregory Montoir
303333352a fix for bug #2040311: TOUCHE: Missing characters in the spanish version
svn-id: r33690
2008-08-07 21:49:55 +00:00
Christopher Page
a51f454076 Added check for valid save slots, when loading savestates using -x
svn-id: r33483
2008-07-31 21:56:05 +00:00
Christopher Page
50b7e5aa0d Added --list-saves support for TOUCHE
svn-id: r33398
2008-07-29 06:04:16 +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
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
c210f90a62 TOUCHE works with the new GMM implementation
svn-id: r33046
2008-07-13 22:24:55 +00:00
Christopher Page
718a85e30d Sound settings for TOUCHE can be configured through the GMM
svn-id: r32864
2008-07-01 03:21:30 +00:00
Gregory Montoir
b6adcca897 moved midi driver object creation to MidiPlayer class (to match delete call)
svn-id: r32798
2008-06-26 10:12:12 +00:00
Gregory Montoir
c9a8fb25f3 flag 611 can be set from the scripts, set _quit when that happens.
svn-id: r32796
2008-06-26 07:13:05 +00:00
Christopher Page
102d79440d Touche now uses the new _quit flag
svn-id: r32795
2008-06-26 05:04:42 +00:00
Christopher Page
4d7798825c TOUCHE: Reverted some comments that were used for testing purposes
svn-id: r32641
2008-06-09 22:26:05 +00:00
Christopher Page
a98a350d14 TOUCHE: Fixed a memory leak
svn-id: r32566
2008-06-06 00:34:47 +00:00
Jordi Vilalta Prat
38a8aa516e Allow static and dynamic plugins to be used at the same time
svn-id: r31888
2008-05-06 03:00:26 +00:00
Max Horn
29f1e6de38 Advanced detector: replaced kADFlagAugmentPreferredTarget by its inverse, kADFlagDontAugmentPreferredTarget (since all AdvDetector engines except Kyra used kADFlagAugmentPreferredTarget, it seems reasonable to assume that as default)
svn-id: r31413
2008-04-05 22:29:08 +00:00
Max Horn
6547ef6e12 Started to get rid of Common::EncapsulatedADGameDesc (using plain Common::ADGameDescription instead)
svn-id: r31121
2008-03-14 17:31:04 +00:00
Max Horn
8a9a14002e Advanced Detector: Changed fallback detector from a callback function pointer to an overrideable method of AdvancedMetaEngine
svn-id: r31119
2008-03-14 13:59:31 +00:00
Jordi Vilalta Prat
c103290e2b Initial support for plugin types
svn-id: r30825
2008-02-08 00:02:23 +00:00
Max Horn
8a73356a2d Revised Engine plugin API to only provide a single func which returns a MetaEngine instance. Used this to simplify the rest of the plugin system
svn-id: r30780
2008-02-03 18:56:47 +00:00
Torbjörn Andersson
e51bf80218 Changed "COMPATIBLITY" to "COMPATIBILITY".
svn-id: r30754
2008-02-03 10:15:36 +00:00
Max Horn
34b35348be Moved AdvancedMetaEngine to namespace Common
svn-id: r30736
2008-02-02 11:52:04 +00:00
Max Horn
dc979b03cf New MetaEngine class (work in progress to replace the current Engine plugin API with a more object oriented approach)
svn-id: r30726
2008-02-02 00:54:52 +00:00
Jordi Vilalta Prat
d6c34bdc4b Fixed the spaces before tabs.
svn-id: r30667
2008-01-28 00:14:17 +00:00
Kostas Nakos
1f6237567e add virtual keyboard show/hide calls
svn-id: r30388
2008-01-10 22:04:00 +00:00
Gregory Montoir
3d59f80520 don't expose the Common::drawLine implementation details in client code, keep it local to graphics.cpp.
svn-id: r29640
2007-11-25 23:26:50 +00:00
Eugene Sandulenko
8d228219c9 Switch to our common drawLine routine
svn-id: r29635
2007-11-25 10:27:50 +00:00
Gregory Montoir
cbd9963af7 fix bug #1834852
svn-id: r29586
2007-11-20 21:00:41 +00:00
Gregory Montoir
52b18c9ae6 simplification, increased game state filenames
svn-id: r29399
2007-11-04 03:02:32 +00:00
Eugene Sandulenko
c640d1c604 Patch #1825276: "DETECTION: advanced detector engine simplification"
svn-id: r29386
2007-11-03 21:06:58 +00:00
Gregory Montoir
7ca277d252 don't update the screen directly after a gamestate load ; keychars and room background are now redrawn on the same frame (bug #1751226)
svn-id: r29133
2007-09-29 19:14:38 +00:00
Gregory Montoir
bdffcca128 workaround for original game glitch (bug #1751170)
svn-id: r29132
2007-09-29 19:13:04 +00:00
Gregory Montoir
d8831b44da simplified touche savegame listing
svn-id: r29112
2007-09-27 20:38:23 +00:00
Gregory Montoir
3d2485ca97 rename ui.cpp to menu.cpp for consistency with other engines
svn-id: r29108
2007-09-26 19:26:12 +00:00
Gregory Montoir
72d0be841f no need to assert here, just don't start playing the stream if read failed
svn-id: r29107
2007-09-26 19:20:59 +00:00
Gregory Montoir
8d84e9add1 add polish version (bug report #1800500)
svn-id: r29106
2007-09-26 19:18:47 +00:00
Gregory Montoir
af9abde7dd _currentObjectNum should also be set in text only talk mode
svn-id: r29103
2007-09-26 19:11:19 +00:00
Johannes Schickel
fb912f9539 Silence warnings on 64bit systems.
svn-id: r29088
2007-09-24 17:23:34 +00:00
Eugene Sandulenko
77eea722af Modified patch #1738058: "Action recorder".
svn-id: r28968
2007-09-19 13:55:05 +00:00
Nicola Mettifogo
258901bab9 Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.
svn-id: r28966
2007-09-19 08:40:12 +00:00
Max Horn
3abc11611e Code formatting fixes
svn-id: r28945
2007-09-18 20:16:33 +00:00
Max Horn
c3d3aebe87 Patch #1768757: Merge fsnode-gsoc into trunk (MAJOR change, will break compilation on some ports)
svn-id: r28944
2007-09-18 20:02:04 +00:00
Gregory Montoir
e5e353d89c fixed loading of savestates on startup
svn-id: r28476
2007-08-06 20:24:05 +00:00
David Corrales
6856535010 Merged fsnode with trunk: r27971:28460
svn-id: r28462
2007-08-05 19:34:20 +00:00
Gregory Montoir
79c67653b6 workaround for original game graphic glitch #1751170
svn-id: r28393
2007-08-01 20:59:59 +00:00
Gregory Montoir
9bdbb470c0 add missing clipping
svn-id: r28371
2007-07-31 21:19:45 +00:00
Gregory Montoir
d4999255b7 fix for bug #1751226 (glitches on save/load
svn-id: r28370
2007-07-31 21:17:15 +00:00
Gregory Montoir
012f16d5c3 added missing MIDI gm->mt32 program change mapping (bug #1759318)
svn-id: r28331
2007-07-30 17:45:43 +00:00
Gregory Montoir
d88354a853 renamed wrongly named parameter
svn-id: r28201
2007-07-25 20:05:35 +00:00
Gregory Montoir
12bec1c494 workaround for bug #1751149 (original game issue).
svn-id: r28200
2007-07-25 20:03:31 +00:00
Gregory Montoir
38b282b313 renamed some fields for clarification
svn-id: r28184
2007-07-24 09:53:28 +00:00
Gregory Montoir
9bb903ee6b fixed some issues in pathfinding code
svn-id: r28183
2007-07-24 09:50:24 +00:00
Max Horn
11b2806741 Removed the old (obsolete) audiostream factories for MP3/Vorbis/FLAC data which took a File pointer and a size (these were only implemented as brain-dead wrapper around the newer factory methods anyway)
svn-id: r28110
2007-07-15 18:29:05 +00:00
David Corrales
720c974faf Changed SaveFileManager::listSavegames() function to be engine agnostic. It now returns a list will the full paths of existing files that match a given regex.
Additionally, modified the 5 engines which use the default manager (Agos, Queen, Saga, Scumm and Touche) to parse the filename list and mark the available saves bool array correctly.

svn-id: r28046
2007-07-12 17:58:15 +00:00
David Corrales
9bfe5d5354 Merged the FSNode branch with trunk r27681:27969
svn-id: r27970
2007-07-08 16:58:54 +00:00
Torbjörn Andersson
dd77f8e153 Move the redrawing of dialog windows (options, save, load, ...) so that we do
not redraw it in the middle of changing to a different dialog. This should fix
bug #1745090 ("TOUCHE: Glitch in the menu").

svn-id: r27781
2007-06-30 08:24:36 +00:00
David Corrales
cacd7a28fd Merged the FSNode branch with trunk r27031:27680
svn-id: r27681
2007-06-23 18:51:33 +00:00
Max Horn
a041ef2317 Slightly updated key handling in BS2, Kyra, and Touche
svn-id: r27637
2007-06-22 23:03:12 +00:00
Torbjörn Andersson
245c997260 Use KEYCODE constants.
svn-id: r27597
2007-06-22 07:34:07 +00:00
Eugene Sandulenko
6e5b70f5e9 Patch #1733764: "Fallback detection patch". GSoC student.
svn-id: r27375
2007-06-12 12:22:25 +00:00
David Corrales
0cab5b7791 Merged the fs branch with trunk. r26949:27031
svn-id: r27032
2007-05-31 23:44:43 +00:00
Max Horn
218e132e37 Updated legal headers in source files, based on what Pidgin (the IM client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots
svn-id: r27024
2007-05-30 21:56:52 +00:00
Torbjörn Andersson
da658640ff Removed the case for the Italian version from displayQuitDialog(). According to
cyx, it uses the same keys as the English version. Odd.

svn-id: r26846
2007-05-15 16:25:34 +00:00
Torbjörn Andersson
13f2b1fd63 Added cases for missing languages to displayQuitDialog(). Should fix feature
request #1718531. I hope I used the correct keys.

svn-id: r26840
2007-05-14 19:14:48 +00:00
Gregory Montoir
0a37086d31 french and german versions of Touche use the same charset data (confirmed by looking in both original executables)
svn-id: r26819
2007-05-13 02:08:53 +00:00
Gregory Montoir
67c9099c34 this should trigger invalid resource types loads, if that ever happens
svn-id: r26818
2007-05-13 02:07:54 +00:00
Gregory Montoir
0e27c9c339 added a TODO for the german charset data and renamed some static arrays/data
svn-id: r26742
2007-05-03 22:56:02 +00:00
Gregory Montoir
510f3c6e75 added spanish charset data (bug report #1712107)
svn-id: r26741
2007-05-03 22:52:43 +00:00
Max Horn
579a3fe7cf Renamed plugin.cpp to detection.cpp in all engines
svn-id: r26622
2007-04-27 20:23:25 +00:00
Max Horn
3db1dd05bc Replaced another use of getEventManager() by using Engine::_eventMan
svn-id: r26360
2007-04-01 18:08:19 +00:00
Gregory Montoir
5aca9dce8c added the instance of EventManager returned by OSystem::getEventManager as a member of the Engine base class. This allows to simply the code a bit and should more efficient too (ie. less virtual function chain calls, obj->getA()->getB()). Also updated several engines to make use of it.
svn-id: r26357
2007-04-01 17:36:13 +00:00
Torbjörn Andersson
bc253d214b Slight simplification of last change. Make sure we don't "oversleep" in fast
mode.

svn-id: r26351
2007-04-01 15:04:11 +00:00
Torbjörn Andersson
7c4a8c6565 Make the mouse cursor move more smoothly. (Most of this improvement actually
comes from calling processEvents(), not from calling updateScreen() more
often.)

svn-id: r26350
2007-04-01 14:53:03 +00:00
Torbjörn Andersson
0d78a7ca64 Call updateScreen() more often in options/save/load dialog to keep mouse
movement smoother. And since this is potentially wasteful, only redraw the
entire dialog when it seems likely that it may have changed.

svn-id: r26348
2007-04-01 14:05:50 +00:00
Torbjörn Andersson
b4211fefc8 Call updateScreen() more often when drawing right-click menus, to make mouse
movement smoother.

svn-id: r26347
2007-04-01 14:04:45 +00:00
Torbjörn Andersson
9339d2a54e We still track the mouse position while waiting for an answer to the "Do you
want to quit?" question, so it makes sense to me to keep drawing the cursor.
Even if the original didn't.

svn-id: r26346
2007-04-01 13:38:03 +00:00
Torbjörn Andersson
cfa746830f Use the event manager to track the mouse position.
svn-id: r26345
2007-04-01 13:31:11 +00:00
Torbjörn Andersson
4550ca1572 Use the cursor manager instead of calling the backend functions directly.
(Maybe the backend functions ought to be protected?)

svn-id: r26344
2007-04-01 13:16:29 +00:00
Max Horn
ed54ea9155 Moved Event/EventType/keyboard enum from common/system.h (part of class OSystem) to common/events.h (part of namespace Common). Porters may have to make minor changes to their backends to get them to compile again
svn-id: r26180
2007-03-17 19:02:05 +00:00
Max Horn
15d9bc42ea Force all code to use EventManager::pollEvent instead of OSystem::pollEvent
svn-id: r26156
2007-03-17 00:53:21 +00:00
Gregory Montoir
feba06717f added md5 for spanish version of Touche (tracker item #1681643)
svn-id: r26151
2007-03-16 22:51:03 +00:00
Gregory Montoir
20fb62de3a Removed the localized titles in Touche game descriptions, that didn't work really well and this wasn't really consistent with other engines. Also added fallback detection so that an unknown game can be started (as my original code did before switching to AdvDetector).
svn-id: r26030
2007-03-08 21:34:35 +00:00
Max Horn
b3931a847d Trying to unify the order in which we try the various audio formats: Prefer FLAC (lossless) over Ogg Vorbis ('free') over MP3 -- the order is admittedly somewhat arbitrary, but at least now it's consistent across all parts of ScummVM
svn-id: r25837
2007-02-24 23:40:28 +00:00
Max Horn
b8aeefaffb Added finalize() method to Common::OutSaveFile (which by default just flushes the stream), changed engines to call that before deleting OutSaveFile instances (instead of just flushing)
svn-id: r25660
2007-02-17 18:55:51 +00:00
Torbjörn Andersson
16e7a12878 Some very obvious cleanups.
svn-id: r25635
2007-02-16 17:13:29 +00:00
Max Horn
7572d2b4f2 Changed detectBestMatchingGame to return a pointer to a ADGameDescription (or a subclass of it); added a (currently fake) fallback callback entry in ADParams
svn-id: r25574
2007-02-13 23:37:44 +00:00
Max Horn
4968e912ce AdvancedDetector changes:
* Renamed genGameList to gameIDList to make it match the corresponding
  plugin API function name
* removed the detectFunc param from detectGameForEngineCreation,
  as it *always* pointed to a straight wrapper around AdvancedDetector::detectAllGames
* as a consequence, removed the various GAME_detectGames functions from the
  engines, and removed the detectFunc param from ADVANCED_DETECTOR_DEFINE_PLUGIN

svn-id: r25547
2007-02-13 14:55:11 +00:00
Eugene Sandulenko
da7d8c9f35 Rename Common::GF_XXX to Common::ADGF_XXX
svn-id: r25545
2007-02-13 13:42:28 +00:00
Max Horn
55adc889e7 (re)added flags field to ADGameDescription, with currently only one value (GF_DEMO) -- this flag value is not yet used by anything (also, GF_DEMO hasn't been correctly set for AGI games yet)
svn-id: r25539
2007-02-13 01:28:18 +00:00
Eugene Sandulenko
70833e89a4 Fix warning.
svn-id: r25384
2007-02-04 13:37:02 +00:00
Gregory Montoir
c9cb0ca8bf removed preallocation of sprite tables (the previous values were taken from the original but it seems they can be lowered)
svn-id: r25351
2007-02-03 17:50:29 +00:00
Gregory Montoir
5bdfd2d102 added checks to prevent crash if no datafiles can be found, also fixed a typo
svn-id: r25283
2007-01-30 20:18:06 +00:00
Eugene Sandulenko
843ac74c0e Moved Touche engine to AdvancedDetector.
svn-id: r25272
2007-01-30 00:24:09 +00:00
Gregory Montoir
3341f49429 cleanup
svn-id: r25157
2007-01-21 22:06:54 +00:00
Eugene Sandulenko
cd8a5f3a98 First phase of detection-related plugins interface improvements. Now plugins
return StringMap instead of fixed list of parameters. This adds great
flexibility.

Current patch should not alter any functionality, i.e. if there are regressions,
submit a report. Phase 2 will benefit from these changes and will come later.

svn-id: r25134
2007-01-20 21:27:57 +00:00
Gregory Montoir
53d842f377 renamed an opcode, fixed an assert condition
svn-id: r25056
2007-01-08 12:39:31 +00:00
Gregory Montoir
ef2d914742 Enabled exit from in-game options
svn-id: r25017
2007-01-05 23:51:50 +00:00