Commit Graph
382 Commits
Author SHA1 Message Date
Max Horn 40136f2590 Switched various Engine APIs to use Common::Error
svn-id: r34916
2008-11-06 17:05:54 +00:00
Max Horn f32be87633 Turned enum PluginError into Common::Error, which in the future is to be used in more places. Help with this is highly welcome
svn-id: r34906
2008-11-05 17:24:56 +00:00
Travis Howell 85174e8504 Add game path with a depth of level 4, to prevent regressions when loading files in HE arcade games again.
svn-id: r34842
2008-10-22 23:30:21 +00:00
Max Horn f881b95ddd Removed File::addDefaultDirectoryRecursive, tweaked SearchMan API slightly
svn-id: r34836
2008-10-22 17:08:17 +00:00
Stephen Kennedy a7bb113e83 Merged revisions 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,33623,33626-33627,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,33719,33721-33723,33725-33727,33729-33730,33733,33736,33742,33754,33756,33758,33761,33763,33766,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,33928,33930,33932-33936,33938-33940,33942-33943,33948,33950,33953,33967,33973,33976,33978,33980,33985,33991,33993,33999-34000,34006,34009,34011,34013,34015,34019,34021-34023,34025,34027-34028,34030,34032-34034,34036,34038-34039,34041,34046-34048,34050-34055,34057,34059-34065,34067,34072,34074,34076,34078-34081,34084,34086-34087,34089-34090,34093,34096-34102,34104,34107,34113,34116,34119,34122,34124,34126,34128,34131-34132,34135,34138,34141,34144,34146,34149,34152-34154,34156-34157,34160,34163-34164,34169,34173,34179-34194,34196-34198,34200-34201,34205-34206,34208-34217,34219-34225,34227-34228,34234-34237,34239-34249,34251-34279,34281-34284,34286-34288,34290-34320,34323-34324,34326,34328-34329,34332,34334,34336,34338-34340,34343-34353,34356-34357,34359-34371,34373,34375,34378,34381-34382,34384-34385,34389-34391,34393-34394,34396-34397,34399-34405,34407-34409,34411,34413,34415,34417-34420,34423-34426,34428-34438,34440-34454,34456-34458,34460,34462-34469,34472,34474,34479-34481,34483-34498,34501-34505,34508,34511-34518,34520-34524,34526-34563,34566-34569,34571-34590,34592,34595-34599,34602-34603,34605,34613-34615,34617,34619-34624,34627-34628,34630-34639,34642-34649 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r34654
2008-09-26 21:53:08 +00:00
Johannes Schickel 7166d43774 Fix for bug #2120780 "GUI: gui-theme command-line option ignored", '-f' and '-g' command line switch behavior.
svn-id: r34637
2008-09-23 16:40:41 +00:00
Johannes Schickel 78d7a276cf Fix for bug #2089275: "GUI: Returning to launcher may trigger an error".
svn-id: r34532
2008-09-14 18:59:43 +00:00
Nicola Mettifogo 83e09d1aa4 Documented commit 34450 (game path searched recursively).
svn-id: r34456
2008-09-08 23:24:20 +00:00
Nicola Mettifogo fbc62e56fa Made searching the game path recursive (with the default depth of 4 levels). This is a temporary fix to make some games work, until we decide what to do with the file/directory searching.
svn-id: r34450
2008-09-08 14:38:07 +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 4d1df20cfd If launching scummvm with no game selected, clear the transient domain (and hence the effect of all command line args) before opening the launcher (may cause regressions)
svn-id: r34293
2008-09-03 08:57:39 +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
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
Max Horn e5c09b018a BASE: in runGame, do not set addDefaultDirectory() the game path before invoking createInstance() -- detectors must use FSNode for detection, not rely on File::open
svn-id: r33389
2008-07-29 00:54:28 +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 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
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
Max Horn c67b914376 Disabled return to launcher on trunk again
svn-id: r32745
2008-06-22 10:26:18 +00:00
Christopher Page 8297ead267 Merged revisions 32124,32126-32128,32131,32133,32135-32144,32146-32153,32155-32163,32165-32168,32170-32173,32175-32179,32181-32191,32193-32202,32204-32205,32209-32214,32216,32218,32220-32235,32237-32266,32269-32271,32273-32290,32292-32295,32297-32317,32319-32323,32325-32328,32330-32331,32334-32338,32343-32347 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r32350
2008-05-28 20:30:20 +00:00
Max Horn 6af9fcc579 Made the startup log output a bit more informative
svn-id: r32243
2008-05-24 14:12:32 +00:00
Christopher Page cbe03226a4 Merged revisions 31972-31973,31975-31981,31984-31989,31993-31994,31996-32014,32016-32020,32022-32025,32027-32028,32030,32034,32037-32038,32040-32058,32060-32087,32089-32093,32095-32123 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r32125
2008-05-14 20:37:18 +00:00
Jordi Vilalta Prat fe58f0ee4b - Added operator-> to Plugin subclasses so they don't have to reimplement the PluginObject subclass interfaces (thanks to Fingolfin for suggesting it)
- Added the PluginSubclass template to help creating Plugin subclasses

svn-id: r32082
2008-05-13 09:30:23 +00:00
Jordi Vilalta Prat 9ba353b9d8 Keep separated arrays for each type of plugin
svn-id: r32046
2008-05-12 01:26:43 +00:00
Jordi Vilalta Prat 2c9968fe80 - Added an engine plugin manager and moved engine specific functionality into it
- base/plugins.* reorganization

svn-id: r32045
2008-05-12 00:26:29 +00:00
Christopher Page 307ef24582 Modified game loop to return to launcher, codeblocks layouts update 1.5->1.6
svn-id: r31992
2008-05-10 23:44:46 +00:00
Johannes Schickel bba003e53a Fixed segfault when trying to start invalid gameid from command line.
svn-id: r31731
2008-04-26 10:21:53 +00:00
Max Horn 9287ea8376 Patch #1926787: small memory leak and cleanup
svn-id: r31261
2008-03-27 11:06:29 +00:00
Max Horn b0c6a12c81 Modified Patch #1925352: Memory leak fixes
svn-id: r31244
2008-03-26 19:29:33 +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
Torbjörn Andersson 0c6cd983dc Replaced GUI dialog with warning. We don't have any screen to draw on yet.
svn-id: r30782
2008-02-03 21:15:48 +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 4cc9d17c34 Adding various FIXME comments to bogus (non-self-explanatory) existing FIXME comments; and some other related cleanup
svn-id: r28890
2007-09-11 09:20:39 +00:00
Chris Apers 500481c4ec Cleanup: remove obsolete code (PalmOS 68K version not supported anymore)
svn-id: r28803
2007-09-01 19:13:04 +00:00
Max Horn 8fcece52ac Patch #1595026: engine init/shutdown OSystem methods
svn-id: r27838
2007-07-01 20:29:28 +00:00
Max Horn a097a11ce7 BASE code: renamed detectMain to detectPlugin and updated some comments for clarity; added some TODO/FIXME comments; added a dialog that's shown if the user tries to start a game for which no plugin feels responsible
svn-id: r27423
2007-06-15 17:29:49 +00:00
Willem Jan Palenstijn 3b7b869476 add DATA_PATH to directory search list when starting game
svn-id: r27381
2007-06-12 21:21:40 +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 a3bde14ead Fixed bug #1701842, after discussing with Fingolfin.
svn-id: r26545
2007-04-18 20:59:51 +00:00
Max Horn b9658b5960 Do not use addDefaultDirectoryRecursive to add 'path', rather use the non-recurseive addDefaultDirectory (see also bug #1672098)
svn-id: r25922
2007-03-02 12:57:38 +00:00
Max Horn 8ae2be31e0 Don't add '.' to the search dirs as a last fallback. Fixes bug #1597208
svn-id: r25382
2007-02-04 13:04:36 +00:00
Max Horn baaedb1651 Added game.cpp file with some funcs/methods declared in game.h
svn-id: r25137
2007-01-21 00:25:04 +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
Eugene Sandulenko 4d840e5295 Patch #1595319: "Enable the command line --debugflags before engine.init()"
svn-id: r24705
2006-11-13 12:03:08 +00:00
Max Horn c7b2f4d332 Print sensible messages if engine instantiation failed
svn-id: r24684
2006-11-12 03:21:44 +00:00
Max Horn 07f7761479 Backend modularization: Create timer manager, savefile manager and audio mixer in the backends for increased flexibility
svn-id: r24443
2006-10-22 15:42:29 +00:00
Max Horn f95f5ed133 Added OSystem::getTimerManager and OSystem::getMixer methods (wip)
svn-id: r24405
2006-10-21 12:03:43 +00:00
Max Horn 4c14cf6d1a Moved base/engine.cpp and .h to engines/ (main motivation: helps untangle the linker dependency graph). Porters will have to update project files
svn-id: r23974
2006-09-23 00:42:35 +00:00
Max Horn 4ee581adb5 Fixed some broken #include's (the PS2 and Symbian may need more fixed, though)
svn-id: r23666
2006-08-04 17:47:57 +00:00
Torbjörn Andersson 5cb8802699 The GUI now uses the cursor palette for all themes. Therefore, it shouldn't be
necessary to set up a "dummy" palette for the cursor any more. If an engine
wants to display an error message without using the GUI, it can set up its own
palette.

With this change, ScummVM no longer sets a palette before _screen is created in
the SDL backend.

svn-id: r23575
2006-07-23 07:18:37 +00:00