Commit Graph
269 Commits
Author SHA1 Message Date
Travis Howell 8914ef89ea Remove last use of time() in AGOS engine.
svn-id: r36016
2009-01-23 04:01:38 +00:00
Eugene Sandulenko 696897b058 Whoa! Removing trailing spaces.
svn-id: r35648
2009-01-01 15:06:43 +00:00
Travis Howell f66bd9c57b Correct the number of speech available in Simon the Sorcerer 1 & 2.
svn-id: r35474
2008-12-21 23:10:31 +00:00
Travis Howell 76624fc69c Add initial Smacker support for The Feeble Files.
svn-id: r35457
2008-12-21 04:36:11 +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
Max Horn 40136f2590 Switched various Engine APIs to use Common::Error
svn-id: r34916
2008-11-06 17:05:54 +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
Max Horn 2bc093828f Replaced Engine::_gameDataPath (a String) by Engine::_gameDataDir (an FSNode); adapted code to that (by using getChild() to get subdirs, not string concatenation
svn-id: r34434
2008-09-07 22:10:58 +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
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
Paul Gilbert ba351015cb Fix to prevent attempt to delete a non-initialised object during game exit
svn-id: r33283
2008-07-25 09:36:18 +00:00
Christopher Page 34d3d74b97 Fixed a small SFX issue with AGOS
svn-id: r33180
2008-07-21 19:46:23 +00:00
Christopher Page ebd3510b72 AGOS: Got rid of _masterVolume and replaced with _musicVolume and _sfxVolume so that music and sfx are separately controlled via the Options menu
svn-id: r33065
2008-07-14 22:10:04 +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
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 e36166bda2 Added syncSoundSettings() to Engine, sound settings can now be modified from the global main menu for most engines
svn-id: r32815
2008-06-26 23:22:28 +00:00
Christopher Page e53556af85 Fixed quitting from BASS intro, cleaned up comments in agos
svn-id: r32793
2008-06-26 00:50:16 +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
Christopher Page ad99e9b249 AGOS: Fixed a memory leak in the AGOS engine
svn-id: r32679
2008-06-12 19:34:32 +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
Travis Howell 942f838924 Add Max's patch for AGOSEngine::pauseEngineIntern().
svn-id: r32241
2008-05-24 01:17:04 +00:00
Chris Apers 1b69c18b56 Fixed PalmOS compilation
svn-id: r32223
2008-05-23 11:13:15 +00:00
Christopher Page 799fb932f4 AGOS: Fixed two memory leaks when returning to the launcher (_mouseData and _zoneBuffers)
svn-id: r32208
2008-05-21 18:52:27 +00:00
Christopher Page ca76ef4e1f AGOS Engine: Began implementation for a new quit event which will cleanly return to the launcher. This replaces the old shutdown() method within delay()
svn-id: r32203
2008-05-20 21:40:53 +00:00
Christopher Page 5e592d4e4a Fixed memory leak when returning to launcher in AGOS engine by properly creating and deleting midi driver pointer
svn-id: r32129
2008-05-14 23:26:32 +00:00
Johannes Schickel 600ab40bca Changed all delete [] usages to delete[].
svn-id: r31927
2008-05-07 14:31:45 +00:00
Travis Howell 63b1de5628 Add support for room states in Waxworks (DOS).
svn-id: r31218
2008-03-22 09:46:25 +00:00
Travis Howell 884276e22e Fix bug #1911558 - FF: Inventory doesn't scroll to the end.
svn-id: r31110
2008-03-12 00:22:30 +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
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
Travis Howell 72dc3dcc0d Set the number of speech segments in The Feeble File.
svn-id: r30508
2008-01-15 23:40:01 +00:00
Max Horn 6d37f5ccd8 Do not #include time.h globally (ideally, we should provide a localtime clone in OSystem so we can completly get rid of this)
svn-id: r29919
2007-12-20 14:29:58 +00:00
Max Horn f44a196087 Moved all time() calls in AGOS to a single new method AGOSEngine::getTime(); also replaced an evil function-static variable by a member variable (lastMinute)
svn-id: r29908
2007-12-20 09:43:46 +00:00
Eugene Sandulenko c640d1c604 Patch #1825276: "DETECTION: advanced detector engine simplification"
svn-id: r29386
2007-11-03 21:06:58 +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
Chris Apers 500481c4ec Cleanup: remove obsolete code (PalmOS 68K version not supported anymore)
svn-id: r28803
2007-09-01 19:13:04 +00:00
Travis Howell bb2796c57a Add support for multi-tune Protracker modules used in the Amiga version of Waxworks.
svn-id: r28256
2007-07-28 07:52:24 +00:00
Travis Howell cf3719d613 Add eriktorbjorn's patch for bug #1498158 - AOGS: Itemheap overflow on 64bit systems.
svn-id: r28189
2007-07-25 11:29:47 +00:00
Neil Millstone fddc9fb3f6 Memory block sizes for Simon 2 on DS port
svn-id: r27869
2007-07-02 22:41:29 +00:00
Max Horn f445d8c800 Changed AGOS to use full KeyState, not just ascii value, in key events
svn-id: r27800
2007-06-30 22:21:29 +00:00
Torbjörn Andersson 90e1169581 Work around a crash when quitting Simon 2. If this is the proper fix, it should
almost certainly go into the 0.10 branch as well.

svn-id: r27617
2007-06-22 20:20:34 +00:00
Travis Howell 00829f15c8 Minor cleanup.
svn-id: r27580
2007-06-21 06:37:00 +00:00
Travis Howell 89b2cf75e2 Use frameBuffer directly, in order to drop extra buffer (frontBuffer) and cleanup code.
svn-id: r27577
2007-06-21 03:14:20 +00:00
Travis Howell 61c91cafb9 Cleanup.
svn-id: r27552
2007-06-20 01:01:29 +00:00
Travis Howell 0a11c241d5 Fix muting music on startup in games, when using non-MIDI music.
svn-id: r27284
2007-06-10 06:08:59 +00:00
Travis Howell 2d2bda501e Fix timer code in Puzzle Pack, to match original speed.
svn-id: r27275
2007-06-10 04:14:53 +00:00
Travis Howell 14aa27c477 Add dirtyClips code for Simon the Sorcerer 1/2.
svn-id: r27227
2007-06-09 05:30:20 +00:00