aboutsummaryrefslogtreecommitdiff
path: root/base/main.cpp
AgeCommit message (Collapse)Author
2009-01-24Remove the unused OSystem parameter of launcherDialog() (noticed by syke)Jordi Vilalta Prat
svn-id: r36038
2009-01-11Simplify code.Eugene Sandulenko
svn-id: r35826
2009-01-11Now _really_ restore transient domain handling which was before vkeybd merge.Eugene Sandulenko
svn-id: r35825
2009-01-11Fix regression brought by merge with vkeybs branch when command line parametersEugene Sandulenko
were ignored. Thanks to eriktorbjorn for reporting. svn-id: r35824
2009-01-11Merge in Virtual Keybpard & KeyMapper branch,Eugene Sandulenko
- Merge is perfromed in order to not let rotting the code - Makefile modifications were avoided Stuff to resolve: - Circular dependency of common/vkeybd from graphics/ - Make it compilable (?) - Add some keyboards - Decide on the key bindings svn-id: r35813
2009-01-02Renamed gui/newgui.cpp -> gui/GuiManager.cpp and gui/newgui.h -> ↵Johannes Schickel
gui/GuiManager.h svn-id: r35668
2008-12-25Renamed NewGui to GuiManagerMax Horn
svn-id: r35544
2008-12-22Fixed indentation and removed whitespaces at the end of lineJordi Vilalta Prat
svn-id: r35481
2008-11-14Committed my patch #2123680 "SDL: Backend transaction / rollback support".Johannes Schickel
svn-id: r35062
2008-11-08Pushing down some header depsMax Horn
svn-id: r34936
2008-11-07Added a destroy() call for SearchManager at the end of scummvm_main.Nicola Mettifogo
svn-id: r34929
2008-11-06Switched various Engine APIs to use Common::ErrorMax Horn
svn-id: r34916
2008-11-05Turned enum PluginError into Common::Error, which in the future is to be ↵Max Horn
used in more places. Help with this is highly welcome svn-id: r34906
2008-10-22Add game path with a depth of level 4, to prevent regressions when loading ↵Travis Howell
files in HE arcade games again. svn-id: r34842
2008-10-22Removed File::addDefaultDirectoryRecursive, tweaked SearchMan API slightlyMax Horn
svn-id: r34836
2008-09-26Merged revisions ↵Stephen Kennedy
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-23Fix for bug #2120780 "GUI: gui-theme command-line option ignored", '-f' and ↵Johannes Schickel
'-g' command line switch behavior. svn-id: r34637
2008-09-14Fix for bug #2089275: "GUI: Returning to launcher may trigger an error".Johannes Schickel
svn-id: r34532
2008-09-08Documented commit 34450 (game path searched recursively).Nicola Mettifogo
svn-id: r34456
2008-09-08Made searching the game path recursive (with the default depth of 4 levels). ↵Nicola Mettifogo
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-03Moved check for shouldRTL() from engines to scummvm_mainMax Horn
svn-id: r34310
2008-09-03If launching scummvm with no game selected, clear the transient domain (and ↵Max Horn
hence the effect of all command line args) before opening the launcher (may cause regressions) svn-id: r34293
2008-08-18- proper init of virtual keyboard now implemented (involved added ↵Stephen Kennedy
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-04Merged revisions ↵Christopher Page
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-07-29BASE: in runGame, do not set addDefaultDirectory() the game path before ↵Max Horn
invoking createInstance() -- detectors must use FSNode for detection, not rely on File::open svn-id: r33389
2008-07-16Quit and RTL code is more modular now. EVENT_RTL no longer sets ↵Christopher Page
_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-14Merged revisions ↵Christopher Page
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-07Implemented Common::EventManager::pushEvent() to insert fake events into the ↵Christopher Page
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-06-24Created Global Main Menu Dialog. Made a uniform _quit flag for engines. So ↵Christopher Page
far agi, agos, and cine are now using the new _quit flag. svn-id: r32770
2008-06-22Disabled return to launcher on trunk againMax Horn
svn-id: r32745
2008-05-28Merged revisions ↵Christopher Page
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-24Made the startup log output a bit more informativeMax Horn
svn-id: r32243
2008-05-14Merged revisions ↵Christopher Page
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-13- Added operator-> to Plugin subclasses so they don't have to reimplement ↵Jordi Vilalta Prat
the PluginObject subclass interfaces (thanks to Fingolfin for suggesting it) - Added the PluginSubclass template to help creating Plugin subclasses svn-id: r32082
2008-05-12Keep separated arrays for each type of pluginJordi Vilalta Prat
svn-id: r32046
2008-05-12- Added an engine plugin manager and moved engine specific functionality into itJordi Vilalta Prat
- base/plugins.* reorganization svn-id: r32045
2008-05-10Modified game loop to return to launcher, codeblocks layouts update 1.5->1.6Christopher Page
svn-id: r31992
2008-04-26Fixed segfault when trying to start invalid gameid from command line.Johannes Schickel
svn-id: r31731
2008-03-27Patch #1926787: small memory leak and cleanupMax Horn
svn-id: r31261
2008-03-26Modified Patch #1925352: Memory leak fixesMax Horn
svn-id: r31244
2008-02-15Merged lots of _mixer->isReady() warnings into a single one in Engine ↵Max Horn
constructor svn-id: r30871
2008-02-03Replaced GUI dialog with warning. We don't have any screen to draw on yet.Torbjörn Andersson
svn-id: r30782
2007-09-19Merged common/stdafx.h into common/scummsys.h. All referencing files have ↵Nicola Mettifogo
been updated. svn-id: r28966
2007-09-11Adding various FIXME comments to bogus (non-self-explanatory) existing FIXME ↵Max Horn
comments; and some other related cleanup svn-id: r28890
2007-09-01Cleanup: remove obsolete code (PalmOS 68K version not supported anymore)Chris Apers
svn-id: r28803
2007-07-01Patch #1595026: engine init/shutdown OSystem methodsMax Horn
svn-id: r27838
2007-06-15BASE code: renamed detectMain to detectPlugin and updated some comments for ↵Max Horn
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-12add DATA_PATH to directory search list when starting gameWillem Jan Palenstijn
svn-id: r27381
2007-05-30Updated legal headers in source files, based on what Pidgin (the IM client ↵Max Horn
formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots svn-id: r27024
2007-04-18Fixed bug #1701842, after discussing with Fingolfin.Torbjörn Andersson
svn-id: r26545