libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-22 01:39:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
56,139 Commits 5 Branches 5 Tags 1.8 GiB
6a3f735392
Commit Graph

273 Commits

Author SHA1 Message Date
Johannes Schickel
e21d6e0d11 Merge branch 'osystem-palette' of https://github.com/lordhoto/scummvm into master 
Conflicts:
	backends/platform/android/android.cpp
	engines/sci/graphics/screen.cpp
	engines/sci/graphics/transitions.cpp
 2011-02-19 21:46:45 +01:00
Gregory Montoir
f5bfe8eb11 QUEEN: fix #1858081 - Jetty: "sign" at wrong position 
Off by one error in original object trigger ; since this is
minor glitch, this patch only fixes new game state (ie. existing
savegames are still affected).
 2011-02-19 17:17:15 +01:00
Johannes Schickel
46f232656e QUEEN: Adapt to setPalette RGBA->RGB change. 2011-02-14 17:08:32 +01:00
Max Horn
42ab839dd6 AUDIO: Rename sound/ dir to audio/ 
svn-id: r55850
 2011-02-09 01:09:01 +00:00
Max Horn
452048b271 QUEEN: Avoid hiding an overloaded virtual method 
svn-id: r55819
 2011-02-07 23:18:47 +00:00
Max Horn
ab039812e7 COMMON: OSystem now has a PaletteManager 
svn-id: r55806
 2011-02-07 17:52:38 +00:00
Max Horn
6edc86a19b DEBUG: Let GUI::Debugger::preEnter and postEnter (un)pause the engine 
svn-id: r54815
 2010-12-07 18:54:21 +00:00
David Turner
a00668331c QUEEN: Correct uninitialised read in Queen Adlib driver found by Valgrind. 
svn-id: r54410
 2010-11-21 18:42:00 +00:00
Max Horn
2180b2d6b5 COMMON: Split common/stream.h into several headers 
svn-id: r54385
 2010-11-19 17:03:07 +00:00
Max Horn
a7248a0601 ENGINES: Replace many printfs by warning/debug/debugN 
svn-id: r54031
 2010-11-01 21:37:47 +00:00
Max Horn
a984fb17c2 GUI: Add GCC_PRINTF to GUI::Debugger::DebugPrintf & fix resulting warnings 
svn-id: r54007
 2010-11-01 16:03:35 +00:00
Filippos Karapetis
abcceb8a4e QUEEN: Fixed code analysis warning - bug #3087851 
svn-id: r53499
 2010-10-15 14:37:50 +00:00
Max Horn
4ccce19876 ENGINES: Enhance namespace comments a bit 
svn-id: r53484
 2010-10-15 12:48:19 +00:00
Torbjörn Andersson
54b2a8c98d JANITORIAL: Cleanup (mostly whitespace) 
svn-id: r53161
 2010-10-12 04:19:58 +00:00
Johannes Schickel
6588398ce6 MIDI: Send a reset MIDI device signal on startup. 
This is currently done in the engine code. I adapted AGI, AGOS, DRACI,
GROOVIE, LURE, MADE, QUEEN, SAGA, SKY, TINSEL and TOUCHE to send a reset
device on startup. The sound output still works fine (started up a game
from every engine), so this should hopefully not introduce any regressions.

As far as I can tell it seems that SCUMM does send a proper device reset, so
I did not touch it. KYRA only sends a proper reset for MT-32 currently. I am
not sure about SCI though.

This fixes bug #3066826 "SIMON: MIDI notes off when using RTL after SCI".

svn-id: r52736
 2010-09-15 22:00:20 +00:00
Yotam Barnoy
8f04aff6dc QUEEN: fix for bug 3036170. File name test supports upper case for transferring from Windows to other systems (e.g. PSP) 
svn-id: r51566
 2010-08-01 07:02:05 +00:00
Max Horn
0b48a71c99 Remove PalmOS port 
svn-id: r50964
 2010-07-17 18:41:38 +00:00
Max Horn
1d4c82885d DEBUGGER: Simplify how our console debugger works / is used 
* Remove _isAttached member var and isAttached method
* Engines now always call the onFrame method; whether it does
  something is decided by the debugger class resp. its subclasses
* Make detach() protected instead of private, so that subclasses
  can invoke it
* Remove _detach_now member var (call detach() instead).
* Rename _frame_countdown to _frameCountdown and properly
  document it.
* Add more doxygen comments
* Cleanup

svn-id: r50963
 2010-07-17 18:38:42 +00:00
Florian Kagerer
c35e350531 AUDIO: get rid of MDT_PREFER_MIDI since it should be sufficient to either select MDT_PREFER_MT32 or MDT_PREFER_GM 
svn-id: r50288
 2010-06-25 20:51:57 +00:00
Max Horn
bbad3f333a Patch #1956501: "GUI/LAUNCHER: Midi device selection" 
svn-id: r50128
 2010-06-21 21:36:36 +00:00
Johannes Schickel
e4d1c8a1bd Replace one instance of strncpy with Common::strlcpy. 
svn-id: r49085
 2010-05-18 18:16:21 +00:00
Max Horn
b3e404109c Move initGraphics and initCommonGFX from to new header. 
These functions are only used internally be Engine subclasses, and
by moving them to a separate header we can reduce indirect header
dependencies.

svn-id: r48934
 2010-05-04 11:58:12 +00:00
Gregory Montoir
8260919bad get rid of global Box objects and remove obsoleted PALMOS_ARM defines. 
svn-id: r48800
 2010-04-25 21:53:09 +00:00
Ori Avtalion
2fc9d6845b Apply patch #2982163 - CONFIG: Use HE keyword instead of HB for the Hebrew language 
svn-id: r48645
 2010-04-12 21:21:06 +00:00
Max Horn
a1840bd573 AUDIO: Rename Mixer::playInputStream to playStream 
svn-id: r48637
 2010-04-12 09:14:17 +00:00
Torbjörn Andersson
55fb1225c8 Stop the music before starting the next one, after discussing it with joostp. 
This should fix bug #2961891 ("FOTAQ: Floda Alarm Tone Won't Stop"). It's
probably too late to get this into the branch - at least before the release -
since it's not a particularly serious bug.

svn-id: r48381
 2010-03-24 17:46:35 +00:00
Max Horn
cac0ac66e2 COMMON: Get rid of Common::StringList 
svn-id: r48287
 2010-03-18 15:54:40 +00:00
Max Horn
c934642bdb COMMON: Move typedef StringList from str.h to new header str-array.h 
This removes the dependency on array.h from str.h.
Also, begun migration from the confusing type name "StringList" to
the more appropriate StringArray.

svn-id: r48282
 2010-03-18 15:09:24 +00:00
Max Horn
d78dba3bca COMMON: Move Common::RandomSource to common/random.* 
svn-id: r48279
 2010-03-18 15:07:11 +00:00
Yotam Barnoy
ef330ed9b4 Patch for bug 2943361 by littleboy, adding full kb modifier support to all engines + GUI and proper keypad handling 
svn-id: r48101
 2010-02-21 04:04:13 +00:00
Johannes Schickel
fe35d372da - Rename FlacStream to FLACStream. 
- Rename makeFlacStream to makeFLACStream.

svn-id: r47846
 2010-02-03 09:42:11 +00:00
Johannes Schickel
a505d32eff Replace use of Audio::makeRawMemoryStream by Audio::makeRawStream. 
svn-id: r47716
 2010-01-30 15:26:54 +00:00
Max Horn
1565f14bc1 Moved audio stream implementations (for MP3, FLAC, etc.) to new dir sound/decoders/ 
svn-id: r47579
 2010-01-26 22:48:45 +00:00
Johannes Schickel
aed02365ec Strip trailing spaces/tabs. 
svn-id: r47541
 2010-01-25 01:39:44 +00:00
Max Horn
4b996e7de7 Reorder params to Audio::makeRawMemoryStream 
svn-id: r47492
 2010-01-23 23:55:35 +00:00
Max Horn
dc5e08e623 Move raw audio flags from sound/mixer.h to sound/raw.h 
svn-id: r47395
 2010-01-19 22:30:33 +00:00
Max Horn
68826c27da Get rid of Mixer::playRaw for good 
svn-id: r47394
 2010-01-19 22:19:43 +00:00
Max Horn
557bb394de Get rid of Mixer::FLAG_AUTOFREE. 
Also fix several recently introduced new/delete vs. malloc/free mismatches.

svn-id: r47369
 2010-01-19 00:56:29 +00:00
Max Horn
7ec2da968c Switch most AudioStream factories to use DisposeAfterUse::Flag 
svn-id: r47334
 2010-01-16 21:36:08 +00:00
Johannes Schickel
0d995c5920 Rename all "Adlib" uses to "AdLib" to match the real name of the sound card / company. 
Check this for reference:
http://en.wikipedia.org/wiki/Ad_Lib,_Inc.
http://www.crossfire-designs.de/images/articles/soundcards/adlib.jpg (note the upper left of the card)

This commit does not touch "adlib" and "ADLIB" uses!

Also it does not update all the SCUMM detection entries, which still use "Adlib".

svn-id: r47279
 2010-01-12 21:07:56 +00:00
Max Horn
f720d99b0a Switch Mixer::playInputStream to use DisposeAfterUse::Flag 
svn-id: r47182
 2010-01-08 22:09:43 +00:00
Johannes Schickel
920dac2f9d Remove unsafe getTotalPlayTime from AudioStream. 
svn-id: r47037
 2010-01-05 20:14:28 +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
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
3399c3aeb6 Change doxygen inline comments from "//!" to "///" as proposed on -devel 
svn-id: r44802
 2009-10-08 21:28:57 +00:00
Bertrand Augereau
eda081173b Constness fix 
svn-id: r43975
 2009-09-06 11:37:15 +00:00
Jordi Vilalta Prat
3337be7b08 Fix indentation 
svn-id: r43837
 2009-08-30 20:50:23 +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
Max Horn
c4f6295330 Fixed some more warnings observed on buildbot 
svn-id: r42010
 2009-07-01 20:51:34 +00:00
Eugene Sandulenko
eb909702af Add GUI options support to Sky, Queen and Sword1&2 engines (which do not use AD) 
svn-id: r41274
 2009-06-06 17:57:39 +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
Max Horn
65b5d31814 COMMON: Removed Stream::ioFailed() and clearIOFailed(), as they are deprecated; however, retained ioFailed in SeekableReadStream and File for now (so for now this mainly affects WriteStream subclasses) 
svn-id: r40725
 2009-05-19 11:42:14 +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
dd98126423 Engines: Fused several init&go methods into a single run method 
svn-id: r39003
 2009-03-01 04:42:46 +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
Travis Howell
9f2d6d82ca Make the subtitle settings in Options section of the global main menu optional, and enable only for game engines where subtitles settings are synced. 
svn-id: r36237
 2009-02-07 06:47:19 +00:00
Max Horn
341bc64aaf do not include common/debug.h from common/util.h 
svn-id: r36143
 2009-01-30 05:25:17 +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
Max Horn
4b7d455580 Got rid of Stream::readLine_OLD calls in two places (mostly untested, please check/test for regressions) 
svn-id: r35198
 2008-12-01 21:13:02 +00:00
Gregory Montoir
2730a6dddc queen doesn't use target name for savestate files (amiga & dos versions use the same savegame data) 
svn-id: r35190
 2008-11-30 11:52:54 +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
8f33d4a40a Implemented GMM loading (and, once the GMM supports it, saving) for SCUMM 
svn-id: r34913
 2008-11-06 15:41:38 +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
Max Horn
55c10e0ec6 Patch #2122869: ALL: Common load dialog 
svn-id: r34883
 2008-11-03 18:32:16 +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
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
Filippos Karapetis
814e27fe40 Fix for bug #2101083 - "ANY - MSVC71 compilation fails due to warnings-as-errors" 
svn-id: r34457
 2008-09-09 06:47:41 +00:00
Max Horn
57e724bfc3 Renamed SeekableReadStream::readLine to SeekableReadStream::readLine_OLD; added a new alternate SeekableReadStream::readLine() instead 
svn-id: r34315
 2008-09-03 17:53:25 +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
Max Horn
dcd52c1210 Merging more of the GSoC 2008 RTL branch: QUEEN 
svn-id: r34247
 2008-09-01 17:55:52 +00:00
Torbjörn Andersson
235ab94ef3 Refined the workaround for wrongly compressed audio. If the sample rate is given 
as 11025 Hz, it should be 11840 Hz. However, a fixed version of compress_queen
won't necessarily produce files with that sample rate, since LAME will resample
the sounds to 12000 Hz. I.e. we can only override the rate if it's exactly 11025.

svn-id: r34169
 2008-08-25 18:47:27 +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
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
5f4c9f913f Turned InSaveFile & OutSaveFile into simple typedefs 
svn-id: r33606
 2008-08-04 11:38:25 +00:00
Torbjörn Andersson
b79f069c58 Applied my patch #2030058 ("Workaround for incorrectly compressed FotAQ"), and 
made a mention in NEWS that speech is played correctly now. Of course, we
should still provide a correctly compressed version at some point.

svn-id: r33471
 2008-07-31 13:45:58 +00:00
Christopher Page
c318987ff5 Added --list-saves support for QUEEN 
svn-id: r33390
 2008-07-29 01:52:29 +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
45d24a58f9 QUEEN sound settings work with the GMM 
svn-id: r33093
 2008-07-18 01:46:33 +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
Gregory Montoir
cdade7eff3 fix bug #1876741: changed .SB playback rate to 11840Hz (matches dos game) 
svn-id: r33079
 2008-07-15 20:31:11 +00:00
Gregory Montoir
2bae0df17e fix bug #1995042: stop previous sfx playback when starting a new sfx (matches original dos code). Also removed the "sound skipping" hack in final bam scene. 
svn-id: r33078
 2008-07-15 20:26:12 +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
67c8c39fdf Queen works with the new GMM implementation, and made a correction to a change in parallaction 
svn-id: r32999
 2008-07-11 00:49:01 +00:00
Christopher Page
a42bb09c72 QUEEN: Made it possible to quit during the intro cutaways 
svn-id: r32933
 2008-07-06 23:42:29 +00:00
Christopher Page
6d1350638a Queen sound settings are now configurable through the GMM 
svn-id: r32922
 2008-07-05 22:04:15 +00:00
Gregory Montoir
358d2ec44a fix possible oob access 
svn-id: r32799
 2008-06-26 10:12:47 +00:00
Christopher Page
7d0eb4f4f0 Queen and Saga now use the new _quit flag 
svn-id: r32774
 2008-06-25 02:14:55 +00:00
Christopher Page
18b892e534 QUEEN: Modified engine to use a quit flag instead of system->quit() in order to return to the launcher 
svn-id: r32525
 2008-06-04 05:21: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
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