libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 21:59:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
42,708 Commits 5 Branches 5 Tags 1.8 GiB
f403c0f8a8
Commit Graph

214 Commits

Author SHA1 Message Date
Johannes Schickel
7b6ad08eab Hopefully fix mingw64 compilation (borrowed from engines/scumm/saveload.h) 
svn-id: r39553
 2009-03-20 00:03:16 +00:00
Torbjörn Andersson
baca072844 Call updateScreen() from the delay() function, like we do in so many other 
engines, to ensure smooth mouse movement.

svn-id: r39433
 2009-03-15 22:52:40 +00:00
Joost Peters
8cfdca5ee8 formatting fix, aka buildbot rebuild incentive ;) 
svn-id: r39365
 2009-03-12 22:04:18 +00:00
Joost Peters
0c681f85a4 cleanup 
svn-id: r39147
 2009-03-06 00:41:46 +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
Joost Peters
f7b963101f Fix 1690836: "BASS: Speed difference" 
The original game's delay was 4 50hz ticks = 80ms (1000 / 50 * 4).
Changing gameSpeed to match this makes it run at exactly the same speed as in dosbox.

svn-id: r36318
 2009-02-14 00:21:53 +00:00
Joost Peters
f051fbb9d8 Formatting changes / consistency 
svn-id: r36304
 2009-02-13 16:55:16 +00:00
Max Horn
716f88f571 Avoid using g_engine if possible 
svn-id: r36149
 2009-01-30 16:04:39 +00:00
Max Horn
42b26e0f56 cleanup 
svn-id: r36133
 2009-01-30 01:15:17 +00:00
Max Horn
28cf213605 Moved AdvancedDetector from common/ to engines/ 
svn-id: r36132
 2009-01-29 22:13:01 +00:00
Max Horn
ac59693be2 A ton of code formatting fixes; also fixed warnings about single line loops like 'while(cond);' by inserting newlines 
svn-id: r36127
 2009-01-29 05:26:12 +00:00
Eugene Sandulenko
696897b058 Whoa! Removing trailing spaces. 
svn-id: r35648
 2009-01-01 15:06:43 +00:00
Max Horn
df20d264fd Pushing down some header deps (on common/system.h, mostly) 
svn-id: r35542
 2008-12-25 20:40:00 +00:00
Torbjörn Andersson
c2424b04a5 Fixed bug #2394861 ("BASS: artifacts if skipping intro on wrong screen"). As an 
added bonus, the Intro class is now freed as soon as the intro is over, rather
than at the end of the game.

svn-id: r35280
 2008-12-07 17:32:25 +00:00
Robin Watts
8f3b2e9b4d Remove warnings from NDS build. 
svn-id: r35172
 2008-11-29 18:01:16 +00:00
Joost Peters
5b04ab7883 un-break sky engine after recent gfx transaction changes 
svn-id: r35126
 2008-11-20 13:03:29 +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
7c40410ba7 Slight cleanup 
svn-id: r35027
 2008-11-12 21:15:35 +00:00
Filippos Karapetis
4952526581 Deleting save states via the launcher and the GMM is now supported in the sky engine 
svn-id: r35026
 2008-11-12 21:08:50 +00:00
Filippos Karapetis
6bfee1bae4 Saving and loading from the GMM is now supported in the sky engine 
svn-id: r35024
 2008-11-12 20:41:19 +00:00
Filippos Karapetis
c21038a448 Moved sky detection and meta engine specific code from sky.cpp into detection.cpp, like other engines 
svn-id: r35015
 2008-11-12 12:36:20 +00:00
Filippos Karapetis
c36a8c1c72 Added getMaximumSaveSlot definition for the sky engine 
svn-id: r35011
 2008-11-11 23:35:18 +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
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
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
Max Horn
7443b599c4 SKY: Fix detector to not (ab)use FSNode::getPath; if you want to open a FSNode, just pass it to File::open 
svn-id: r34704
 2008-09-30 12:59:29 +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
2f30e5f63d Comment out some #defines in skydefs.h as they conflict with other headers (esp. T2 conflicts with some template defs) 
svn-id: r34425
 2008-09-07 21:38:53 +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
531bcf847c Moved FilesystemNode / FSList to namespace Common; also got rid of some 'typedef Common::String String;' name aliases 
svn-id: r34302
 2008-09-03 11:22:51 +00:00
Joost Peters
3fef592c20 fix Virgin logo screen breakage that was introduced in the RTL merge 
svn-id: r34267
 2008-09-02 00:31:27 +00:00
Christopher Page
58166351c6 Made sure to set the loading slot AFTER selecting the active domain when loading from the launcher. Also fixed the flickering Virgin logo in BASS 
svn-id: r33949
 2008-08-16 22:06:44 +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
2d31207a81 Fixed some memory leaks 
svn-id: r33846
 2008-08-13 20:27:39 +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
Torbjörn Andersson
117dee5e4a Fixed bug #1995033 ("BASS: BG Sound stopped on opening item list"). Apparently 
the sound is supposed to be paused and then unpaused, but the pause function is
called many more times than the unpause function. In the original, this
presumably didn't matter. In ScummVM's mixer, it does.

svn-id: r33570
 2008-08-03 10:16:17 +00:00
Torbjörn Andersson
e8cee7823d Fixed bug #1995022 ("BASS: wrong displayed 2 line text"). 
svn-id: r33568
 2008-08-03 09:51:13 +00:00
Torbjörn Andersson
dcecff4829 Fixed bug that prevented upper-case letters from being used in savegame names. 
Apparently, strchr(..., 0) will find the string terminator - at least for me -
and when that's added to the name, it will terminate the string.

svn-id: r33565
 2008-08-03 09:41:10 +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
Max Horn
0be985ce83 Changed class File (and derived classes) to only support read-only access; added a new class DumpFile for writing 
svn-id: r33412
 2008-07-29 16:09:10 +00:00
Christopher Page
8b01922317 Improved GMM sound settings support for SKY 
svn-id: r33178
 2008-07-21 19:37:12 +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
a6e1d6bd3d SKY works with the new GMM implementation, also updated gui/newgui.cpp and prevented pushEvent from pushing more than one EVENT_QUIT into the artificialEventQueue 
svn-id: r33041
 2008-07-13 20:41:39 +00:00
Christopher Page
d0dcc1ad79 Quit or RTL from the main menu now triggers an EVENT_QUIT in DefaultEventManager::pollEvent() 
svn-id: r32813
 2008-06-26 22:03:49 +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
27c427add2 Scumm and sky now use the new _quit flag 
svn-id: r32775
 2008-06-25 03:17:01 +00:00
Christopher Page
0f41f1ccf4 SKY: Fixed a memory leak in SKY engine 
svn-id: r32578
 2008-06-06 16:40:39 +00:00
Torbjörn Andersson
89e0c0b315 Since BASS treats speech separately from other sounds, let's use the 
speech_volume setting for that, as suggested on the forum.

svn-id: r31941
 2008-05-08 05:05: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
d31ca4982e Add support for --list-saves to the sky engine 
svn-id: r30987
 2008-02-27 16:07:38 +00:00
Max Horn
d4e9661809 Modified the BASS save/load code to use a StringList for storing the save state titles (simplified the code, removed some cruft) 
svn-id: r30986
 2008-02-27 15:44:39 +00:00
Max Horn
778309ed56 Simplified Control::handleKeyPress and fixed a long-standing bug in the verification of the save name 
svn-id: r30981
 2008-02-27 11:03:09 +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
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
Max Horn
015e73b792 cleanup 
svn-id: r30777
 2008-02-03 18:23:27 +00:00
Torbjörn Andersson
e51bf80218 Changed "COMPATIBLITY" to "COMPATIBILITY". 
svn-id: r30754
 2008-02-03 10:15:36 +00:00
Jordi Vilalta Prat
c070f0d04f Converted queen and sky to use MetaEngine (forgot them because they don't use the AdvancedDetector). 
svn-id: r30752
 2008-02-03 09:39:26 +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
Paul Gilbert
6eb64102a4 Fix to remove a tab character from the GPL header 
svn-id: r30238
 2008-01-05 12:45:14 +00:00
Max Horn
3d46219592 Patch #1689516: BASS: Update the cursor when right-clicking in inventory 
svn-id: r30085
 2007-12-30 17:58:22 +00:00
Eugene Sandulenko
d4d072fe04 Patch #1857121: Refactoring of the getSavePath method 
svn-id: r30032
 2007-12-28 07:37:04 +00:00
Gregory Montoir
a34df6e72d add Common::Rect::center (handy for ::setFocusRectangle()) 
svn-id: r29751
 2007-12-07 20:53:06 +00:00
Max Horn
aa034c4e4d This workaround is no longer needed 
svn-id: r28980
 2007-09-20 08:47:13 +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
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
Chris Apers
500481c4ec Cleanup: remove obsolete code (PalmOS 68K version not supported anymore) 
svn-id: r28803
 2007-09-01 19:13:04 +00:00
David Corrales
9bfe5d5354 Merged the FSNode branch with trunk r27681:27969 
svn-id: r27970
 2007-07-08 16:58:54 +00:00
Max Horn
e1bcd70436 Re-added __attribute__(packed) 
svn-id: r27830
 2007-07-01 18:18:43 +00:00
Max Horn
675fc8ab71 Whitespace fix 
svn-id: r27762
 2007-06-28 19:48:41 +00:00
Willem Jan Palenstijn
1af6b35edb increase mt-32 sysex delay to prevent buffer overflow (see FR#1393726) 
svn-id: r27731
 2007-06-26 22:33:07 +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
c99515be86 Changed BASS to use more KEYCODEs 
svn-id: r27670
 2007-06-23 15:40:28 +00:00
Max Horn
05ca0d86ba Converted BASS to use Common::KeyState 
svn-id: r27635
 2007-06-22 22:18:56 +00:00
David Corrales
3b96c7fad5 Renamed methods in the FilesystemNode class to match the AbstractFSNode implementations. 
Also exposed the new methods (exists, isReadable and isWritable) in FilesystemNode.

svn-id: r27113
 2007-06-05 21:02:35 +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
Max Horn
d4660cce55 Removing more semicola 
svn-id: r26597
 2007-04-26 19:08:53 +00:00
Max Horn
00b9bc7b36 Removing lots of superfluous semicola (see mail by David Weinehall on scummvm-devel) 
svn-id: r26594
 2007-04-25 19:31:23 +00:00
Robert Göffringmann
fb59ee92a2 corrected printf string 
svn-id: r26363
 2007-04-01 20:06:26 +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
Max Horn
852971cfe6 Fixed a compiler warning about 'unknown conversion type character' (not sure if the statement was meant this way or another, but at least for now I can again compile with -Werror) 
svn-id: r26356
 2007-04-01 17:13:45 +00:00
Robert Göffringmann
63ff4aa50b Fixed setFocusRectangle code. At least I think I did, I don't know where it came from and I can't test it either. But it looked rather broken. 
svn-id: r26335
 2007-04-01 00:13:54 +00:00
Robert Göffringmann
2edec11986 improved debugger a bit 
svn-id: r26334
 2007-04-01 00:00:28 +00:00
Robert Göffringmann
c0ca592d54 fixed graphic glitch when playing the floppy intro with spanish subtitles and added a few comments. 
svn-id: r26333
 2007-03-31 18:20:52 +00:00
Robert Göffringmann
549e535a97 BASS is not Counter Strike, so redrawing the screen at 70 fps feels a little pointless. It's also more than the average pal tv set can do ;) 
svn-id: r26328
 2007-03-30 19:13:23 +00:00
Torbjörn Andersson
7a41f19639 Update the screen in escDelay(). Seems to fix some glitches when changing 
scaler at certain points in the intro.

svn-id: r26322
 2007-03-29 20:06:39 +00:00
Torbjörn Andersson
86a60b633d Fixed long-standing font bug. We were using the control panel font for LINC 
space and terminals, and the LINC font for the control panel. Since these fonts
contain different sets of characters, this would often cause the wrong
character to be displayed, particularly in non-English languages. This also
explains why we had to use the "wrong" font for the control panel recently.

The functions to patch the LINC character set (actually the control character
set) should no longer be needed, and have been removed.

Should fix bug #1669564.

svn-id: r26275
 2007-03-22 18:49:42 +00:00
Robert Göffringmann
139608f451 Fixed bug #1678349: BASS: music is off, but drum track plays 
svn-id: r26219
 2007-03-18 17:58:26 +00:00
Torbjörn Andersson
003dfed001 Fixed control panel sliders. 
svn-id: r26209
 2007-03-18 14:30:26 +00:00
Robert Göffringmann
3f6745a2f4 Applied eriktorbjorn's patch for bug #1657466: 
"BASS: wrong music slider behavior"
and did some cleanup.

svn-id: r26208
 2007-03-18 14:08:34 +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
478c0644f1 SKY: Changed Control class to use event manager for mouse coord tracking, and also made it respect the SF_MOUSE_LOCKED flag 
svn-id: r26177
 2007-03-17 16:31:46 +00:00
Max Horn
59064dbef4 SKY: respect the SF_MOUSE_LOCKED flag upon mouse clicks, too 
svn-id: r26176
 2007-03-17 16:22:51 +00:00
Torbjörn Andersson
c1f4dbda77 Use the new getButtonState() function to test if the mouse button is still 
pressed. This way, it won't matter if we've already missed the "mouse up"
event. Fixes bug #1510038 ("BASS: Possible glitch when examining inventory
items".

svn-id: r26162
 2007-03-17 09:37:47 +00:00