Commit Graph

315 Commits

Author SHA1 Message Date
Johannes Schickel
233512fe10 MADE: Create MusicPlayer in run() instead of MadeEngine's constructor.
This fixes MT-32 emulator initialization. When the constructor is run the
paths like extrapath etc. are not yet set up. Thus, the MT-32 emulator would
not be able to find the necessary roms in case they are in the extrapath.
2013-11-03 19:17:13 +01:00
Johannes Schickel
66fe0181ff MADE: Take advantage of Surface::getPixels. 2013-08-03 04:02:51 +02:00
Johannes Schickel
8f73027d82 MADE: Prefer getBasePtr over direct Surface::pixels access. 2013-08-03 02:52:32 +02:00
Filippos Karapetis
de230b7696 MADE: Show version-related before size-related incompatibilities in savegames
This gives clearer errors when users use savegames saved with a different version
2013-05-15 21:48:32 +03:00
Matthew Hoops
0031c41db8 COMMON: Change kPlatformPC to kPlatformDOS
"PC" was very ambiguous and now it matches what we show in the GUI.

This also corrects sword2's platform to Windows.
2013-05-02 18:43:10 -04:00
Eugene Sandulenko
e37bcb8884 MADE: Null terminate string. CID 1003874 2013-04-28 23:59:20 +03:00
Max Horn
cdfd5f85c8 ENGINES: Silence clang warning about unused private member _vm
This affects the Console / debugger classes of multiple engines.
An alternative solution would have been to remove the unused _vm
member vars. However, it seems likely that in the future, the _vm
member could be useful for methods added to the console. So instead,
we add a simple assert(_vm) to silence the clang warning.
2013-04-18 23:50:19 +02:00
Johannes Schickel
89abab97e3 JANITORIAL: Remove trailing whitespaces.
Powered by:
git ls-files "*.cpp" "*.h" "*.m" "*.mm" | xargs sed -i -e 's/[ \t]*$//'
2012-09-26 04:17:55 +02:00
Johannes Schickel
57e0381b62 MADE: Get rid of casts on CursorManager::replaceCursor calls. 2012-06-16 03:28:43 +02:00
Johannes Schickel
79dfc7be97 MADE: Get rid of casts on OSystem::copyRectToScreen calls. 2012-06-16 02:38:59 +02:00
Tarek Soliman
a4798602d7 JANITORIAL: Fix missing whitespace in pointer cast
find -name '*.h' -or -name '*.cpp' | xargs sed -r -i 's@\(([A-Za-z0-9]+)\*\)@(\1 *)@g'

This seems to have caught some params as well which is not undesirable IMO.
It also caught some strings containing this which is undesirable so I
excluded them manually. (engines/sci/engine/kernel_tables.h)
2012-02-15 10:07:10 -06:00
Tarek Soliman
921f602ab8 JANITORIAL: Fix whitespace in pointer template arg 2012-02-15 10:07:08 -06:00
Tarek Soliman
edc5249772 JANITORIAL: Fix template definition whitespace 2012-02-10 21:17:27 -06:00
Strangerke
bab4b6f729 LAUNCHER: Introduce GUIO0() in order to replace GUIO1(GUIO_NONE) 2011-11-16 22:38:58 +01:00
Johannes Schickel
3b7867ec54 MADE: Silence a few gcc warnings. 2011-10-29 20:56:00 +02:00
Strangerke
abdcc530cc LAUNCHER: Add GUIO_NOASPECT to made 2011-10-23 22:39:36 +02:00
Eugene Sandulenko
32972a5ffb AD: Switched rest of the engines to new GUIO 2011-10-23 17:53:13 +01:00
Filippos Karapetis
63b3db2753 MADE: Graphics::Surface is a struct, not a class 2011-10-15 12:24:31 +03:00
Filippos Karapetis
a606312c22 MADE: Graphics::Surface is a struct, not a class 2011-10-15 01:16:17 +03:00
Filippos Karapetis
121bef4f79 MADE: Added missing finalize() calls to the game state saving code
Thanks to wjp for finding these
2011-10-10 01:48:47 +03:00
Johannes Schickel
7b126c5f24 MADE: Minimize #include usage. 2011-10-09 22:58:37 +02:00
Johannes Schickel
76bc3a97a6 MADE: Fix include guard of made.h. 2011-10-09 22:07:49 +02:00
Filippos Karapetis
8c431e13a6 MADE: Hopefully fixed bug #2957333 - "MADE: Screen effects sometimes look wrong/bad"
Applied johndoe's patch from that tracker item
2011-09-26 22:22:16 +03:00
Tarek Soliman
45fa59598e MADE: Flag CD titles with ADGF_CD 2011-08-06 23:32:52 -05:00
Ori Avtalion
eec84253f0 MADE: Fix hidden overloaded virtual function warning 2011-06-30 00:53:33 +03:00
Max Horn
88913c0139 ALL: Remove trailing whitespaces
This tries to make our code a bit more compliant with our code formatting
conventions. For future use, this is the command I used:
  git ls-files "*.cpp" "*.h" | xargs sed -i -e 's/[ \t]*$//'
2011-06-20 00:59:48 +02:00
Max Horn
879c3c7817 DETECTOR: Pass allFiles to AdvancedMetaEngine::fallbackDetect()
Also reorder the parameters of composeFileHashMap, placing the "return value"
first.
2011-06-14 18:52:11 +02:00
Max Horn
7c992d6598 DETECTOR: Merge ADParams into AdvancedMetaEngine 2011-06-14 18:17:01 +02:00
Max Horn
97f82b5a93 MADE: Switch to alternate AdvancedMetaEngine, avoid ADParams 2011-06-10 22:15:43 +02:00
Max Horn
4827cc914a ENGINES: Change incorrect use of 'target' to 'gameid' 2011-06-10 22:15:40 +02:00
Max Horn
080b590261 MADE: Remove all instances of s(n)printf 2011-06-02 10:49:09 +02:00
Max Horn
4cbe4ede66 COMMON: Registers RandomSources in constructor with the event recorder
This also removes the dependency of engines on the event recorder header
and API, and will make it easier to RandomSources that are not properly
registered.
2011-05-17 12:17:26 +02:00
Thierry Crozat
3c59e37035 ENGINES: Unify engine names
This unifies the engine names in MetaEngine::getName() and the
credits. In particular drop "Engine" or "engine" from the names when
it was present and use expanded names in credits when the
MetaEngine uses it (e.g. "Beneath a Steel Sky" instead of "BASS").
2011-05-16 00:11:32 +01:00
strangerke
69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Johannes Schickel
71bdb86e02 Merge pull request #16 "Add a PixelFormat to Graphics::Surface.".
For further discussion check here:
https://github.com/scummvm/scummvm/pull/16

Conflicts:
	graphics/png.cpp
2011-05-01 16:54:45 +02:00
Ori Avtalion
9414d7a6e2 JANITORIAL: Reduce header dependencies in shared code
Some backends may break as I only compiled SDL
2011-04-28 15:08:58 +03:00
Ori Avtalion
cd6ee0589d JANITORIAL: Format forward declarations to follow convention 2011-04-28 12:20:34 +03:00
Johannes Schickel
b6fc71b0c5 MADE: Prefer Surface::create taking a PixelFormat over the one taking a byte depth. 2011-04-17 16:29:23 +02:00
Max Horn
0ce2ca4e00 COMMON: Replace MKID_BE by MKTAG
MKID_BE relied on unspecified behavior of the C++ compiler,
and as such was always a bit unsafe. The new MKTAG macro
is slightly less elegant, but does no longer depend on the
behavior of the compiler.
Inspired by FFmpeg, which has an almost identical macro.
2011-04-12 16:53:15 +02:00
dhewg
d83a83ef50 JANITORIAL: Remove/comment unused vars
Found by GCC 4.6's -Wunused-but-set-variable
2011-03-29 21:57:56 +02:00
Max Horn
8c931fd1e8 AUDIO: Add Audio::MidiPlayer::createDriver(), let some engines use it 2011-03-28 18:06:36 +02:00
Max Horn
7949d7c6de AUDIO: Move more common code to Audio::MidiPlayer
This also should fix some regressions from the previous
commits, related to MidiParser's either being leaked,
or being deleted and then used again (i.e., crashing).

I tested as many games as I had available, but further
testing of all affected engines is called for anyway.
2011-03-25 14:15:53 +01:00
Max Horn
84d68f31e8 MADE: Change MusicPlayer to derive from Audio::MidiPlayer 2011-03-24 16:46:47 +01:00
Max Horn
088bd7a70b ENGINES: Remove unused MIDI pass-through code 2011-03-23 17:07:48 +01:00
Max Horn
e70fd59b35 ENGINES: Further simplify pseudo MidiDrivers; fix some regressions
The regression affected AGOS and maybe some others; specifically,
the real MidiDriver would have been deleted twice -- I previously
missed that the Engine instances takes care of freeing the real
MidiDriver, not the MidiPlayer wrapping it.

This commit should clarify the ownership of the real MidiDriver for
most pseudo MidiDrivers.
2011-03-23 16:49:41 +01:00
Max Horn
29847ea42d AUDIO: Change several fake MidiDrivers to MidiDriver_BASE subclasses
Many engines follow the advice in audio/midiparser.h and create a
"pseudo-MidiDriver" subclass. But MidiParser really only needs a tiny
subset of the MidiDriver capabilities, namely those found in
MidiDriver_BASE. So we try to subclass from that whenever possible; this
allows us to remove many stub methods, and enables further future
simplifications.
2011-03-23 15:25:47 +01:00
Max Horn
8982fff1b7 AUDIO: Add pure virtual MidiDriver::isOpen() method
This in turn enables modifying MidiDriver_MPU401::close() to allow
it to be called on a midi driver that has not yet been opened.

The specific issue that triggered me to make these changes was a
crash-upon-quit in HUGO, caused by it instantiating a midi driver,
then encountering an error (missing hugo.dat) *before* having
opened the new midi driver; the general cleanup code then tries
to close the (not yet opened) midi driver -> kaboom

Also fixed some engines which were leaking MidiDriver instances.
2011-03-22 23:51:47 +01:00
dhewg
a42360ce3d MADE: Cleanup syncSoundSettings()
And respect global mute settings
2011-03-19 16:04:54 +01:00
Johannes Schickel
2078024ee4 MADE: Revert a little behavior change in setRGBPalette.
This was introduced when converting to the new RGB data setPalette call. It
should not have caused any troubles, since start is always 0 it seems, but
better be sure about this one and keep the original behavior.
2011-02-15 22:59:21 +01:00
Johannes Schickel
81111e2d59 MADE: Adapt to setPalette RGBA->RGB change.
This change is not tested. It should work just fine though, since it just
removes the RGB->RGBA conversion before calling setPalette.
2011-02-14 17:08:32 +01:00