Commit Graph

664 Commits

Author SHA1 Message Date
Paul Gilbert
e27ef211f8 Fix for a rare case where the NPC handler for Ewan the shopkeeper can cause an assert when you rejoin Goewin in the Weregate caves.
svn-id: r47197
2010-01-09 09:27:40 +00:00
Paul Gilbert
43f19bc722 Added a new LureLanguage enumeration of supported languages, and changed game code to use it
svn-id: r47019
2010-01-05 08:24:27 +00:00
Paul Gilbert
c8f991e89b Bugfix for crash if an error occurs before the game object (and thus the debugger) is created
svn-id: r47018
2010-01-05 05:25:18 +00:00
Torbjörn Andersson
72eb9ec9ea Fixed a bunch of cppcheck warnings. Mostly about checking if a pointer is null
before freeing it, which isn't necessary.

svn-id: r46941
2010-01-03 19:37:43 +00:00
Max Horn
c8873d8492 Changed MidiDriver::createMidi to take a MidiDriverType instead of an int
svn-id: r46316
2009-12-09 18:12:51 +00:00
Paul Gilbert
e3d354f63c Bugfix for reactivating an NPC when it was previously deactivated at precisely the moment when it was about to do a pathfinding
svn-id: r46189
2009-11-29 09:02:02 +00:00
Max Horn
df651bf20f Added Doxygen comments for the various engine namespaces (currently mostly without details; help filling these out is welcome)
svn-id: r46128
2009-11-24 22:10:14 +00:00
Max Horn
51933629d1 Changed foo(void) to foo() in almost all non-backend source files
svn-id: r45616
2009-11-02 21:54:57 +00:00
Max Horn
2df38ec61e LURE: Turn HotspotTickHandlers into a proper class; convert static vars in various of its methods to member vars
svn-id: r45285
2009-10-20 19:51:57 +00:00
Max Horn
d0876b06ed Remove some unused variables
svn-id: r44853
2009-10-09 22:21:45 +00:00
Max Horn
2e964baeef Some const correctness changes; cleanup
svn-id: r44850
2009-10-09 21:47:33 +00:00
Max Horn
f242266f6d Change a couple places from 'end of namespace' to 'End of namespace', for consistency
svn-id: r44634
2009-10-04 21:26:33 +00:00
Paul Gilbert
e67b0ef08c Replaced delete operator with delete[]
svn-id: r44514
2009-10-01 12:03:12 +00:00
Filippos Karapetis
b4f1960318 Reverted parts of revisions #44298, #44299 and #44300, to prevent warnings and issues in compilers which don't support NORETURN
svn-id: r44314
2009-09-24 17:52:53 +00:00
Filippos Karapetis
5028d5a68b Reverted my commit #44290 - apparently, it was a bad idea, as g_engine is a hack
svn-id: r44311
2009-09-24 17:07:27 +00:00
Filippos Karapetis
16d7d9ba23 Fixed some more warnings about unreachable code
svn-id: r44299
2009-09-24 10:02:13 +00:00
Filippos Karapetis
a70351e5ea Changed some references from LureEngine to the global g_engine (e.g. calls to shouldQuit()), to minimize places where LureEngine is referenced
svn-id: r44290
2009-09-24 06:53:03 +00:00
Jordi Vilalta Prat
3337be7b08 Fix indentation
svn-id: r43837
2009-08-30 20:50:23 +00:00
Johannes Schickel
ac5a6552ca Switched LURE to use a single central RandomSource instance, instead of (sometimes) creating a new RandomSource every function call.
svn-id: r43715
2009-08-24 23:04:25 +00:00
Paul Gilbert
2b945eabf1 Bugfix for Castle Skorl problem reported on the list
svn-id: r43507
2009-08-18 12:25:04 +00:00
Johannes Schickel
7e71865e91 Move the event recorder to its own class (EventRecoder inside common/EventRecorder.[h/cpp]).
svn-id: r42751
2009-07-25 12:59:46 +00:00
Paul Gilbert
53783575d8 Bugfix for player blocking room entrance causing NPCs trying to enter getting an excessive number of action entries
svn-id: r42676
2009-07-23 10:49:30 +00:00
Max Horn
cbea1a1193 Added more GCC_PRINTF attributes, and fixed resulting warnings in format strings
svn-id: r42054
2009-07-03 10:40:49 +00:00
Eugene Sandulenko
1bd6f6c99f Added game GUI options to advancedDetector and updated all engines
svn-id: r41272
2009-06-06 17:56:41 +00:00
Torbjörn Andersson
0999534749 The error() and warning() functions add ! and newline automatically. (I didn't
look at debug() and debugC(), since I'm really bored with this now. :-)

svn-id: r41061
2009-05-31 10:02:16 +00:00
Max Horn
fb79b18571 Changed SaveFileManager methods to take Common::String params (instead of char pointers)
svn-id: r41000
2009-05-29 14:38:22 +00:00
Johannes Schickel
b3c6751b9b Strip trailing whitespaces in the whole code base.
svn-id: r40867
2009-05-24 15:17:42 +00:00
Jordi Vilalta Prat
047f116515 Renamed MetaEngine::getCopyright() to getOriginalCopyright() to better match the meaning of the returned string, as discussed some time ago in scummvm-devel
svn-id: r39132
2009-03-05 12:04:58 +00:00
Max Horn
3fcbda829a Merged Engine::go() and ::init() into a new run() method (currently implemented by calling the existing init&go methods; to be cleaned up by engine authors
svn-id: r39002
2009-03-01 04:30:55 +00:00
Paul Gilbert
f8963cf550 Disable GMM Save/Loading when a cut-scene is playing
svn-id: r36165
2009-01-31 12:26:44 +00:00
Paul Gilbert
e2baabcab9 Enabled runtime save/loading from the GMM menu, and fixed launcher listing of savegames
svn-id: r36164
2009-01-31 12:15:21 +00:00
Paul Gilbert
13c7397837 Bugfix to properly have one NPC character move out of the way when two NPCs bump into each other
svn-id: r36153
2009-01-31 01:58:10 +00:00
Paul Gilbert
26210ad976 Bugfix to stop characters changing rooms if the entrance in the other room is blocked by another NPC
svn-id: r36144
2009-01-30 12:22:30 +00:00
Max Horn
7cb437b56f Renamed SpecialDebugLevel to DebugChannel
svn-id: r36142
2009-01-30 05:10:24 +00:00
Max Horn
28cf213605 Moved AdvancedDetector from common/ to engines/
svn-id: r36132
2009-01-29 22:13:01 +00:00
Paul Gilbert
8315753dda Bugfix to allow characters to start moving when some other object (such as a door) has marked part of the area the character is standing on as occupied
svn-id: r36120
2009-01-28 10:27:14 +00:00
Paul Gilbert
6ef26264f4 Added a debug subcommand to enable a hotspot's position to be changed
svn-id: r36095
2009-01-27 10:27:07 +00:00
Paul Gilbert
52df26d4b2 Implemented the Engine::getDebugger method
svn-id: r36068
2009-01-26 06:53:23 +00:00
Paul Gilbert
b3a7e53794 Bugfix for #2480853 - Skorl doesn't follow Minnow into Cellar
svn-id: r35695
2009-01-03 11:35:00 +00:00
Paul Gilbert
0a8541cc0a Bugfix for #2480857 - Additionally savegames were crashing ScummVM
svn-id: r35694
2009-01-03 10:44:43 +00:00
Paul Gilbert
a45e25620d Changed the debugger 'schedule' command to be able to list the schedule, even for currently disabled NPCs
svn-id: r35693
2009-01-03 10:43:07 +00:00
Eugene Sandulenko
696897b058 Whoa! Removing trailing spaces.
svn-id: r35648
2009-01-01 15:06:43 +00:00
Robin Watts
8f3b2e9b4d Remove warnings from NDS build.
svn-id: r35172
2008-11-29 18:01:16 +00:00
Johannes Schickel
2ef8a32a01 Fixed various g++ warnings ("format not a string literal and no format arguments").
svn-id: r35096
2008-11-16 20:20:31 +00:00
Johannes Schickel
5a0556f09c Committed my patch #2123680 "SDL: Backend transaction / rollback support".
svn-id: r35062
2008-11-14 22:08:10 +00:00
Filippos Karapetis
f5729a4a8b - The GMM save dialog is now working for all engines which support the appropriate features
- Added a new method to the MetaEngine class, getMaximumSaveSlot(), and implemented it in all engines for which the listSavefiles() method is implemented (it goes together with the listSavefiles method). It is used to fill the unused save slots in the save/load dialogs of each engine, so that the user can create new save games in empty slots
- Unified the save/load dialog list numbering in the GMM load/save screens and in the load screen of the main menu (before a game is started)

svn-id: r34963
2008-11-09 16:13:34 +00:00
Max Horn
40136f2590 Switched various Engine APIs to use Common::Error
svn-id: r34916
2008-11-06 17:05:54 +00:00
Max Horn
fe2935ad4b Got rid of the unused 'filename' attribute in SaveStateDescriptor
svn-id: r34905
2008-11-05 15:41:12 +00:00
Max Horn
61aadb378d Fixed the EngineFeature vs. MetaEngineFeature mess, clarified some EngineFeature comments
svn-id: r34896
2008-11-04 16:11:40 +00:00
Filippos Karapetis
b7a219ebc6 Renamed engine feature kSupportsDirectLoad to kSupportsLoadingDuringStartup, as discussed in patch #2122869
svn-id: r34854
2008-10-26 16:42:08 +00:00
Paul Gilbert
b9a0e32c3c Changed NPC schedules to be loaded when an NPC is activated - this avoids an issue with the Castle Skorl's pre-activation room number being invalid room #99
svn-id: r34748
2008-10-05 10:25:35 +00:00
Paul Gilbert
8706081b82 Bugfix to prevent NPC characters managing to walk beyond room exits without leaving the room, and thus getting stuck
svn-id: r34737
2008-10-04 11:10:25 +00:00
Max Horn
3248906156 Engine class changed:
- Moved initCommonGFX() && GUIErrorMessage() out of class Engine
- got rid of the _autosavePeriod member (this prevented users from
  changing the autosave period during runtime)
- Got rid of an evil 'using GUI::Dialog' statement
- Clarified some Doxygen comments

svn-id: r34720
2008-10-02 17:48:01 +00:00
Max Horn
9b160804ab Renamed Engine::quit to Engine::shouldQuit (previously, it was easily confused with Engine::quitGame); also cleaned up engine.h a bit
svn-id: r34700
2008-09-30 12:27:38 +00:00
Johannes Schickel
0a35842954 Committed my patch #2105593 "Launcher/MetaEngine: Finnished removeSaveState".
svn-id: r34495
2008-09-11 19:47:45 +00:00
Max Horn
d3642080de Moved check for shouldRTL() from engines to scummvm_main
svn-id: r34310
2008-09-03 16:56:40 +00:00
Max Horn
10a8cdee39 Merging more of the GSoC 2008 RTL branch: LURE
svn-id: r34251
2008-09-01 20:18:17 +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
e30d16ddc2 Fixed more warnings
svn-id: r33649
2008-08-05 21:56:45 +00:00
Christopher Page
dac805c281 Added -x and --list-saves support for LURE
svn-id: r33291
2008-07-25 19:41:17 +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
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
Paul Gilbert
eaeb1587f4 Fix for missing data in the savegame format that could result in not being able to talk to Goewin in the apothecary after restoring a savegame
svn-id: r33057
2008-07-14 10:33:57 +00:00
Christopher Page
17ce8db211 Lure works with the new GMM implementation
svn-id: r32996
2008-07-10 22:34:48 +00:00
Christopher Page
113aa1e77f LURE: Made sure to lock _soundMutex in syncSounds()
svn-id: r32934
2008-07-07 03:30:34 +00:00
Christopher Page
563e28b668 Fixed some warnings
svn-id: r32857
2008-06-30 23:06:38 +00:00
Christopher Page
c1ae3f7dd0 Sound settings for Lure can be modified through the GMM
svn-id: r32855
2008-06-30 22:41:55 +00:00
Christopher Page
6e3474896c Kyra and Lure are now using the new _quit flag
svn-id: r32772
2008-06-25 00:55:18 +00:00
Christopher Page
8cb11a808a Cleaned up some unnecessary comments
svn-id: r32721
2008-06-16 19:55:59 +00:00
Christopher Page
a596879c8e LURE: Fixed memory leaks in the LURE engine
svn-id: r32675
2008-06-12 18:11:09 +00:00
Christopher Page
203f62ad7c LURE: Fixed some memory leaks when returning to the launcher from the LURE engine
svn-id: r32357
2008-05-28 23:28:11 +00:00
Paul Gilbert
93de8c71b8 Fixed compiler warning of unused variable
svn-id: r32239
2008-05-24 01:05:32 +00:00
Paul Gilbert
e2437d33f8 Implemented LureEngine::pauseEngineIntern
svn-id: r32238
2008-05-24 01:03:27 +00:00
Paul Gilbert
76c43c94d1 Changed the delayed sequence list from using a system milliseconds expiry point to a milliseconds countdown - this should fix potential problems that could arise if a modal dialog was kept on-screen too long
svn-id: r32237
2008-05-24 00:54:04 +00:00
Johannes Schickel
600ab40bca Changed all delete [] usages to delete[].
svn-id: r31927
2008-05-07 14:31:45 +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
Paul Gilbert
76b1f4bcea Added a debugger command 'script' to allow execution of script engine methods
svn-id: r31568
2008-04-19 00:34:02 +00:00
Torbjörn Andersson
0dcfa7b3df Fixed warning. (The 'anim' variable shadowed the anim() function.)
svn-id: r31421
2008-04-06 12:17:41 +00:00
Filippos Karapetis
6a9acd7a5e Replaced ManagedList with Common::SharedPtr in the rest of the lure engine
svn-id: r31420
2008-04-06 12:00:37 +00:00
Filippos Karapetis
bd1224e36c Replaced ManagedList with Common::SharedPtr in lure's sound system
svn-id: r31419
2008-04-06 11:12:42 +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
Torbjörn Andersson
ff688574c4 Changed spaces to tabs.
svn-id: r31362
2008-04-02 04:23:00 +00:00
Paul Gilbert
74e5ef5c56 Commit of Hans de Goede's patches to the sound handling code
svn-id: r31194
2008-03-19 10:37:33 +00:00
Max Horn
63c09d5a40 Removed some unportable and unused code ;-)
svn-id: r31193
2008-03-19 10:18:05 +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
Paul Gilbert
9ac46607fc Bugfix for loading older savegame versions
svn-id: r30879
2008-02-16 05:12:32 +00:00
Max Horn
88bb567e18 Merged lots of _mixer->isReady() warnings into a single one in Engine constructor
svn-id: r30871
2008-02-15 17:01:35 +00:00
Paul Gilbert
fe1078f08f Changed error dialog display to exit ScummVM through the standard execution path rather than using the exit() method
svn-id: r30866
2008-02-14 22:52:57 +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
Jordi Vilalta Prat
5165ff448d Converted the remaining engines to use MetaEngine
svn-id: r30728
2008-02-02 02:35:13 +00:00
Lars Persson
fe52777943 clibable menus for symbian
svn-id: r30706
2008-01-29 22:39:09 +00:00
Paul Gilbert
e32e1b732c Changed array of method pointers to case statement to fix compiler error in earlier versions of gcc
svn-id: r30672
2008-01-28 11:28:49 +00:00
Jordi Vilalta Prat
d6c34bdc4b Fixed the spaces before tabs.
svn-id: r30667
2008-01-28 00:14:17 +00:00
Jordi Vilalta Prat
66e9d4f5e8 Removed trailing spaces.
svn-id: r30664
2008-01-27 19:47:41 +00:00