316 Commits

Author SHA1 Message Date
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
Matthew Hoops
a1d41da096 Merge remote branch 'upstream/master' into t7g-ios
Conflicts:
	audio/decoders/qdm2.h
	common/util.cpp
	engines/groovie/music.cpp
	engines/groovie/resource.h
	video/qt_decoder.cpp
	video/qt_decoder.h
2011-05-11 00:30:28 -04: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
spookypeanut
db24f1e068 GROOVIE: fix for bug #3093310
Instead of crashing if the save game isn't writable, popup a
gui message and then skip
2011-04-25 08:51:21 +01:00
Scott Thomas
accb0c2a5d GROOVIE: Add timer for MusicPlayerMPEG4 (required for music fade in/out) 2011-04-20 23:40:03 +09:30
Scott Thomas
daede376e1 GROOVIE: Tweak supernatural teeth detection (for VDX playback speed) 2011-04-20 23:40:02 +09:30
Scott Thomas
2cc7b80b34 GROOVIE: Set some T7G iOS m4a files to loop based on DOS XMI looping 2011-04-20 23:40:01 +09:30
Johannes Schickel
8ff527ac4e GROOVIE: Replace TODO about YUV data with a comment.
Since the surfaces in question are never used outside the ROQ code it is fine
to use a faked RGB pixel format even when they are actually YUV data.
2011-04-19 15:05:18 +02:00
Johannes Schickel
89fe3ff141 GROOVIE: Do not access Surface::bytesPerPixel anymore. 2011-04-17 20:56:16 +02:00
Johannes Schickel
aca6733721 GROOVIE: Prefer Surface::create taking a PixelFormat over the one taking a byte depth.
Groovie seems to use Graphics::Surface also to store YUV data, I used a fake
PixelFormat setup there and added a TODO about it.
2011-04-17 16:26:30 +02:00
Scott Thomas
f33810a8c0 GROOVIE: Implement resource search-by-name for v2 games 2011-04-15 21:46:08 +09:30
Scott Thomas
8e9dbe5c3d GROOVIE: Use uint32 when searching for a video id by name
This brings ResMan::getRef into line with the rest of the engine.
2011-04-15 21:46:06 +09:30
Max Horn
2e095e25f2 ALL: centre -> center 2011-04-14 14:34:28 +02:00
Max Horn
84184aabc0 ALL: colour -> color 2011-04-14 14:12:35 +02:00
Matthew Hoops
6d153f311c Merge remote branch 'upstream/master' into t7g-ios
Conflicts:
	video/qt_decoder.cpp
2011-04-13 16:04:29 -04:00
Scott Thomas
47c2a9adbe GROOVIE: MPEG4 player should override unload so scripts can stop music 2011-04-13 22:22:19 +09:30
Scott Thomas
f54769f987 GROOVIE: Use provided OCReMix song for T7G iOS credits 2011-04-13 22:19:21 +09:30
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
Scott Thomas
2e59957471 GROOVIE: T7G iOS isn't a CD game - don't check or prompt user 2011-04-11 19:33:01 +09:30
Scott Thomas
412a152e6b GROOVIE: T7G iOS patches in 7/11 soundtrack files during intro sequence 2011-04-11 19:27:28 +09:30
Scott Thomas
5c4d7baa06 GROOVIE: Determine correct MPEG4 resource to load for based on fileref 2011-04-08 21:08:47 +09:30
Scott Thomas
c44b509b05 GROOVIE: Store resource name in ResInfo struct 2011-04-08 21:00:59 +09:30
Matthew Hoops
25236ebde1 GROOVIE: Implement MusicPlayerMPEG4::updateVolume() 2011-04-07 20:34:54 -04:00
Matthew Hoops
9c2fc6721d GROOVIE: Hook into the new QuickTimeAudioStream code 2011-04-07 19:40:07 -04:00
Scott Thomas
d40874d6f4 GROOVIE: Add detection for T7G iOS based on m4a files 2011-04-08 07:21:21 +09:30
Matthew Hoops
af59f33b7b GROOVIE: Add a stub MPEG4 music player 2011-04-07 10:52:58 -04:00
Scott Thomas
d5ff478100 GROOVIE: Fix brace formatting. 2011-04-08 00:17:59 +09:30
Scott Thomas
7c39b844b8 GROOVIE: Add additional play-speed modes to T7G.
These two speed modes enable faster movement throughout the mansion.
iOS mode matches the behavior of the official iOS release while
tweaked mode additionally uses original framerate for 'teeth'
animations.
2011-04-07 23:38:35 +09:30
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
79ba16a89d GROOVIE: Set global volume levels 2011-03-19 16:04:52 +01:00
dhewg
12a561f119 GROOVIE: Mark overwritten members as virtual 2011-03-04 21:31:14 +01:00
Jordi Vilalta Prat
dd43dfc81c GROOVIE: Simplify the cursor palette reading. 2011-02-16 12:25:11 +01:00
Johannes Schickel
5d9e69146c GROOVIE: Adapt to setPalette/grabPalette 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
ab039812e7 COMMON: OSystem now has a PaletteManager
svn-id: r55806
2011-02-07 17:52:38 +00:00
Matthew Hoops
c18035c07a GROOVIE: Disable other T7G Mac entries as they should no longer be needed
svn-id: r55765
2011-02-04 15:42:58 +00:00
Matthew Hoops
2be57434a1 COMMON: Only take the md5 of the resource fork data section
Since various apps can modify the type/creator of the files, we can't rely on the header of the resource fork to take the md5. I've therefore also recalculated all of the detector entries (all 5 of them) that use the Mac resource fork code.

svn-id: r55764
2011-02-04 15:27:56 +00:00
Jordi Vilalta Prat
2f7c04e54b GROOVIE: Fix a memory leak reported by cppcheck.
svn-id: r55150
2011-01-07 17:44:20 +00:00
Henry Bush
49d529cb7a GROOVIE: Add two new t7g detection entries, one from bug tracker, one from me
svn-id: r54961
2010-12-19 08:56:42 +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
059944e59c COMMON: Push #include audiocd.h in system.h out to .cpp files
svn-id: r54148
2010-11-08 23:07:42 +00:00
Max Horn
82e473bc3b BACKENDS: Partial merge of gsoc2010-opengl: Audio CD changes only
This commit contains the AudioCDManager changes from the gsoc2010-opengl
branch. The other changes in that branch are restricted to the backends
directory only (plus configure).

The Nintendo DS and Dreamcast ports still need to be ported over to
the new Audio CD system, but that should be fairly easy to do.

svn-id: r54147
2010-11-08 22:53:36 +00:00
Max Horn
aa54388de0 ENGINES: Do not include engines/savestate.h from engines/game.h
svn-id: r54119
2010-11-07 17:15:46 +00:00
Max Horn
e27b05ef35 COMMON: Rename String::printf() to String::format()
This is a first step towards getting rid of all uses of regular printf,
fprintf, vprintf, vfprintf, puts, fputs, etc. in our codebase.

The name format() reflects the purpose of the function, and parallels
String.format() in Java, boost::format, and others.

svn-id: r54004
2010-11-01 16:02:28 +00:00
Jordi Vilalta Prat
9ab69ab6f4 GROOVIE: Fix bug #3095031 (regression in Russian T7G).
Additionally fixed some NEWS file punctuation.

svn-id: r53874
2010-10-27 14:31:20 +00:00