Commit Graph
3264 Commits
Author SHA1 Message Date
Max Horn 756f592b61 SCUMM: Remove unused iMuse MIDI 'passthrough' code 2011-03-23 15:25:46 +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
Thierry Crozat fb4e5f7f84 I18N: Break keyboard shortcut translation by key
In the scumm help dialog, translate single keys, e.g. "Ctrl" or "Alt"
instead of asking the translator to translate individually  "Ctrl a",
"Ctrl b", "Alt a", "Alt b", Ctrl Alt a" and so on. This reduce greatly the
number of strings to translate.
2011-03-22 22:20:18 +00:00
athrxx ea79336ac9 Merge branch 'master' of https://github.com/scummvm/scummvm 2011-03-22 15:55:17 +01:00
athrxx 92f922aabe SCUMM FM-TOWNS: cleanup (thx LordHoto) 2011-03-22 15:53:43 +01:00
dhewg fa11a6e8cf SCUMM: Cleanup syncSoundSettings() 2011-03-19 16:04:56 +01:00
md5 d602a420b6 SCUMM: Changed usage of PI to M_PI (normally defined in math.h) 2011-03-19 02:33:09 +02:00
Matthew Hoops 6582b77f1c SCUMM: Use the new WinCursor code in SCUMM HE
Also, updated the MacResManager cursor code to reflect the SCUMM resource extractor code changes
2011-03-06 19:57:18 -05:00
Matthew Hoops a2a0b13de2 COMMON: Begin to merge some NE/PE code
The ID classes are now common to both. The files have been renamed to better illustrate their purpose.
2011-02-22 20:03:18 -05:00
Matthew Hoops 3a3fd9f009 SCUMM: Use the new PEResources class for HE cursors
Putt-Putt Saves the Zoo HE72 still works fine for me
2011-02-22 12:33:45 -05:00
dhewg adf6c8f09e SCUMM: More DISABLE_TOWNS_DUAL_LAYER_MODE mess
Uglify more code to fix compilation for DS
Only compile-tested
2011-02-20 12:09:58 +01:00
Johannes Schickel bb9e82c3b3 SCUMM: Adapt to setPalette RGBA->RGB change. 2011-02-14 17:08:33 +01:00
athrxx 4e6c025633 SCUMM FM-TOWNS: minor cleanup (git test) 2011-02-13 15:19:43 +01: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 2c00aed172 SCUMM: Avoid hiding overloaded virtual method
svn-id: r55809
2011-02-07 17:53:34 +00:00
Max Horn ab039812e7 COMMON: OSystem now has a PaletteManager
svn-id: r55806
2011-02-07 17:52:38 +00:00
David Turner ec885e5665 SCUMM: Fix Valgrind mismatched delete errors in SMUSH channel base class.
This was due to the SMUSH channel base class using new/delete to manage buffer, but the imuse_channel and saud_channel classes which subclass and override this using malloc/free.
The more C++ solution of moving all to new/delete was tried, but the buffer is passed into a MemoryReadStream and free()'d there, so all classes have been moved to malloc/free instead.
This is not a critical problem as the buffers are byte primitive type anyway.

svn-id: r55660
2011-01-30 16:50:55 +00:00
David Turner b644c6d466 SCUMM: Remove direct usage of OSystem quit() function in SCUMM engine code.
This would cause leaks, but occurs in development code only.

svn-id: r55659
2011-01-30 14:53:47 +00:00
Travis Howell 2187411977 SCUMM: Fix bug #3167036 - BluesBirthday: Crash in the demo.
svn-id: r55589
2011-01-28 12:35:20 +00:00
Matthew Hoops 491393790d SCUMM: Restore the missing copyright for the PE code (wrongfully removed in r27024)
svn-id: r55532
2011-01-25 14:12:45 +00:00
Eugene Sandulenko caa6684752 VIDEO: Move video classes to Video:: namespace
svn-id: r55479
2011-01-23 19:08:09 +00:00
Eugene Sandulenko 806ccf5d25 GRAPHICS: Move graphics/video/ to video/. Step 1/2
svn-id: r55473
2011-01-23 17:14:43 +00:00
Johannes Schickel 5742a11510 SCUMM: Prefer "Could not" over "Couldn't" in some error messages.
svn-id: r55268
2011-01-16 20:24:58 +00:00
Arnaud Boutonné d063b074cd JANITORIAL: Suppress some useless includes
svn-id: r55091
2011-01-02 14:06:42 +00:00
Travis Howell ccb8a01b17 SCUMM: Correct fix for bug #3145951 - DIG: Subtitles won't turn off (regression).
svn-id: r55053
2010-12-28 06:05:57 +00:00
Travis Howell cfbac503ad SCUMM: Another fix for bug #3145951 - DIG: Subtitles won't turn off (regression).
svn-id: r55052
2010-12-28 05:43:03 +00:00
Travis Howell fe12e08dd6 SCUMM: Fix bug #3145951 - DIG: Subtitles won't turn off (regression).
svn-id: r55050
2010-12-27 14:07:53 +00:00
Travis Howell e7e92a7577 SCUMM: Fix bug #3143039 - ACTIVITY: Circus Stormin' crash.
svn-id: r55049
2010-12-27 14:02:17 +00:00
Matthew Hoops 375f32fbe9 VIDEO: Make VideoDecoder::decodeNextFrame() return a const Surface pointer
svn-id: r54927
2010-12-16 01:35:13 +00:00
Florian Kagerer 56f98a8574 SCUMM/FM-TOWNS: hopefully fix bug #1463434
o5_verbOps() case 9 (SO_VERB_NEW) works slightly different in SCUMM 3 FM-TOWNS (I don't know about DOS).
This should fix the issue with the broken key shortcuts.
Old savegames won't be fixed, though (since the broken verb states will be restored from the save file).

svn-id: r54872
2010-12-11 23:51:50 +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
Max Horn 31d2d2af4c SCUMM: Workaround for bug #1447058, a race condition in the game scripts
svn-id: r54730
2010-12-02 00:27:46 +00:00
Max Horn e85d196f33 SCUMM: Fix bug in V12 games causing chars to be lost when wrapping talk text
svn-id: r54729
2010-12-02 00:27:26 +00:00
Johannes Schickel b36b7ee349 SCUMM: Fix GM initialization when "enable_gs" is set.
This is a regression from r25630, which caused the code to send some garbage
data to the GS device, which resulted in some devices to fail with an
"Address Error." (like the Roland SC-55).

This might also fix bug #1927501 "GS option is broken". Even though actually
the device there failed with another error it is likely to be caused by the
same code. At least it is the only iMuse MIDI code change between 0.9.0 and
0.12.0, which might result in such a problem.

svn-id: r54727
2010-12-01 23:55:10 +00:00
Travis Howell 5132cf51e3 Fix bug #3093750 - FT: Truck and Aircraft computer text missing (regression).
svn-id: r54665
2010-11-30 07:57:42 +00:00
Thierry Crozat 16c73378b9 i18N: Add a few strings to translate in the SCUMM help dialog.
svn-id: r54547
2010-11-28 19:23:02 +00:00
Thierry Crozat f20da5f98c I18N: Add translation of the SCUMM help dialog.
svn-id: r54449
2010-11-23 22:47:20 +00:00
Max Horn 09ba53dcfb SCUMM: Use explicit XOR decoding code in BaseScummFile subclasses
This made it possible to turn some MemoryReadStream pointers into plain
SeekableReadStream pointers.

svn-id: r54435
2010-11-23 22:25:36 +00:00
Max Horn 54e0390752 SCUMM: Replace Common::File uses by SeekableReadStream and SearchMan
svn-id: r54434
2010-11-23 22:25:10 +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 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 668adaa461 GUI: Rename gui/GuiManager.* to gui/gui-manager.*
svn-id: r54265
2010-11-16 10:19:01 +00:00
Max Horn 427dc1ae93 GUI: Move major widgets to new directory gui/widgets
Also renamed the source/header files, now they are more closely
aligned to how we rename most other source files

svn-id: r54264
2010-11-16 10:11:57 +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 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
Florian Kagerer 206971d16b SCUMM/FM-TOWNS JAPANESE: fix out of bounds text drawing
(could cause invalid memory access in MI1)

svn-id: r54079
2010-11-05 00:36:23 +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 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