Commit Graph

2389 Commits

Author SHA1 Message Date
Johannes Schickel
64c4e65201 KYRA: Enforce use of American English in comments. 2011-04-14 14:03:07 +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
Johannes Schickel
d9441aeb80 KYRA: Add some assertion to prevent out of bounds access. 2011-04-11 00:36:03 +02:00
Johannes Schickel
073da68efa KYRA: Constify static data table in LoL code. 2011-04-11 00:35:28 +02:00
Johannes Schickel
93f591580a KYRA: Get rid of non-const static variable in Kyra2 code. 2011-04-11 00:34:16 +02:00
Johannes Schickel
8fe9f8e73a KYRA: Cleanup. 2011-04-11 00:31:24 +02:00
Johannes Schickel
ee4699a495 KYRA: Get rid of non-const static variables in HoF. 2011-04-11 00:21:18 +02:00
Max Horn
6cf1de87ac DEVTOOLS: Renamed 'tools' directory to 'devtools' 2011-04-09 23:47:35 +02:00
Johannes Schickel
eb731514f7 KYRA: Slight cleanup.
This more or less silently fixes the silent music introduced with f19e201, by
me setting volume to "true" instead of "255". Whoops.
2011-04-07 01:09:52 +02:00
Johannes Schickel
f19e2019b8 KYRA: Cleanup background music looping of Kyra3. 2011-04-07 01:01:55 +02:00
Johannes Schickel
6d0bb19a51 KYRA: Cleanup static variable usage in LoK. 2011-04-07 00:11:36 +02:00
Johannes Schickel
f4dde64406 KYRA: Slight cleanup. 2011-04-07 00:11:36 +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
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
Johannes Schickel
16be240ab1 KYRA: Fix regression in Screen::setInterfacePalette.
This fixes an out of bounds write introduced with 9216c7e.
2011-02-20 21:37:39 +01:00
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
Johannes Schickel
b5d1c66915 KYRA: Set type for NULL MIDI driver to PC Speaker.
This avoids a dialog about MT-32 to General MIDI conversion shown when running
Kyrandia 1. Formerly the NULL MIDI output type was set to General MIDI, which
caused the aforementioned dialog to show up, because Kyrandia 1 has no General
MIDI tracks.
2011-02-16 23:30:03 +01:00
athrxx
e23696d900 KYRA/LOL: add comments for last commit 2011-02-16 16:31:22 +01:00
athrxx
d7e700f370 KYRA/LOL: fixed hand item cursor bug
This fixes a bug when loading savegames with different active hand items via GMM. The mouse cursor was not set to the active hand item in these cases.
2011-02-16 16:23:44 +01:00
Johannes Schickel
9216c7e3de KYRA: Adapt to setPalette/grabPalette RGBA->RGB changes. 2011-02-14 17:08:32 +01:00
Johannes Schickel
24eab0ac73 KYRA: Rename KyraEngine_MR::runDialog to doDialog to avoid name clashes with Engine::runDialog.
svn-id: r55864
2011-02-10 01:19:48 +00:00
Johannes Schickel
a9361da157 KYRA: Remove superfluous const in type conversion.
svn-id: r55863
2011-02-10 01:19:24 +00:00
Max Horn
42ab839dd6 AUDIO: Rename sound/ dir to audio/
svn-id: r55850
2011-02-09 01:09:01 +00:00
Max Horn
2d1c8a3533 ALL: Fix whitespaces / indention
svn-id: r55818
2011-02-07 23:01:06 +00:00
Max Horn
ab039812e7 COMMON: OSystem now has a PaletteManager
svn-id: r55806
2011-02-07 17:52:38 +00:00
Johannes Schickel
d925e38acf KYRA: Hopefully fix valgrind warnings in the HoF intro when text is disabled.
svn-id: r55623
2011-01-29 19:03:50 +00:00
Johannes Schickel
2cc3bd880f KYRA: Clean up main menu code in Kyra2/Kyra3.
svn-id: r55620
2011-01-29 18:40:04 +00:00
David Turner
450dac35c7 KYRA: Fix Valgrind Uninitialized Memory Read at end of VQA Playback.
svn-id: r55619
2011-01-29 18:20:38 +00:00
David Turner
f050e2d66f KYRA: Close Memory Leaks in Kyra 3 (Malcolm's Revenge) Menu.
svn-id: r55618
2011-01-29 18:18:29 +00:00
Florian Kagerer
8347b44fb2 KYRA FM-TOWNS: improved cd audio music fading
svn-id: r55039
2010-12-25 22:10:51 +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
Jordi Vilalta Prat
d5a4f554af ALL: Fix a few typos
svn-id: r54716
2010-12-01 20:03:05 +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
a0df86955f ALL: Push down deps on stream.h from .h to .cpp files
svn-id: r54358
2010-11-19 01:37:04 +00:00
Max Horn
ee4770ffb6 ENGINES: Change 'colour' to 'color'
Only changed this in engines where 'color' was/is already used
almost exclusively

svn-id: r54288
2010-11-17 12:22:08 +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
Florian Kagerer
97a98cf9db LOL: fixed minor text displayer bug
svn-id: r54132
2010-11-08 00:08:38 +00:00
Max Horn
4d3a07b494 COMMON: Rename and tweak MD5 functions
* names now comply to our naming conventions
* the function computeStreamMD5AsString which computes the MD5
  as a hex string now returns it as a Common::String
* add doxygen comments

svn-id: r54121
2010-11-07 17:16:59 +00:00
Max Horn
18d40017e8 ENGINES: Unify code layout of all ADParams instances
svn-id: r54105
2010-11-07 01:01:18 +00:00
Johannes Schickel
8252fc30ce KYRA: Pause engine when the debugger is open.
svn-id: r54032
2010-11-01 22:19:16 +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
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
Florian Kagerer
ec680ef8aa LOL: fixed bug #3099321
(Crash in Yvel tavern basement)

svn-id: r53973
2010-10-31 00:20:30 +00:00
Florian Kagerer
a04b4e6517 LOL: workaround for bug #3098935
(Vaelan's Cube can be duplicated at Scotia's Barrier)
This is a bug in the game data of early unpatched floppy versions.
This can also be fixed by applying the official patch (ftp://ftp.westwood.com/pub/lands1/updates/lolus123.exe).

svn-id: r53954
2010-10-30 18:37:15 +00:00
Florian Kagerer
c9442e26ad KYRA: match music settings with latest launcher code changes.
(Last commit got trunkated somehow)

svn-id: r53927
2010-10-29 19:00:37 +00:00
Florian Kagerer
67566890bd KYRA: match music settings with latest launcher code changes.
(Users will get AdLib music at default unless they have specified a MIDI device in the launcher (MT-32 for KYRA, GM for HOF and LOL.)

svn-id: r53926
2010-10-29 18:57:19 +00:00
Johannes Schickel
07e9c6a035 KYRA: Minor formatting cleanup.
svn-id: r53915
2010-10-29 00:40:35 +00:00
Johannes Schickel
32338876f8 KYRA: Rename KyraEngine::saveGameState to KyraEngine::saveGameStateIntern.
This is to avoid name similarity between KyraEngine::saveGameState(Intern)
and Engine::saveGameState.

svn-id: r53912
2010-10-28 23:57:24 +00:00