Merge remote branch 'upstream/master' into pegasus

Conflicts: video/qt_decoder.cpp
scummvm · Dec 12, 2011 · 0027965 · 0027965
2 parents d932df7 + d1628fe
commit 0027965
Show file tree

Hide file tree

Showing 920 changed files with 71,477 additions and 71,185 deletions.
diff --git a/.gitignore b/.gitignore
@@ -29,6 +29,7 @@ lib*.a
 
 /build
 /staging
+/portdist
 
 /backends/platform/dc/gui
 /backends/platform/dc/graphics
@@ -164,3 +165,6 @@ ScummVM.config
 ScummVM.creator
 ScummVM.files
 ScummVM.includes
+
+#Ignore Komodo IDE/Edit project files
+*.komodoproject
diff --git a/AUTHORS b/AUTHORS
@@ -71,6 +71,9 @@ ScummVM Team
        Kari Salminen
        Eugene Sandulenko
 
+    Composer:
+       Alyssa Milburn
+
     CruisE:
        Paul Gilbert
        Vincent Hamm          - (retired)
@@ -84,9 +87,9 @@ ScummVM Team
        Pawel Kolodziejski
 
     DreamWeb:
-       Vladimir Menshakov
        Torbjorn Andersson
        Bertrand Augereau
+       Vladimir Menshakov    - (retired)
 
     Gob:
        Torbjorn Andersson
@@ -119,12 +122,6 @@ ScummVM Team
     Lure:
        Paul Gilbert
 
-    M4:
-       Torbjorn Andersson
-       Paul Gilbert
-       Benjamin Haisch
-       Filippos Karapetis
-
     MADE:
        Benjamin Haisch
        Filippos Karapetis
@@ -178,15 +175,15 @@ ScummVM Team
        Jonathan Gray         - (retired)
 
     Sword25:
-       Eugene Sandulenko
-       Filippos Karapetis
-       Max Horn              - (retired)
-       Paul Gilbert
        Torbjorn Andersson
+       Paul Gilbert
+       Max Horn              - (retired)
+       Filippos Karapetis
+       Eugene Sandulenko
 
     TeenAgent:
        Robert Megone         - Help with callback rewriting
-       Vladimir Menshakov
+       Vladimir Menshakov    - (retired)
 
     Tinsel:
        Torbjorn Andersson
@@ -204,8 +201,8 @@ ScummVM Team
        Gregory Montoir
 
     TsAGE:
-       Paul Gilbert
        Arnaud Boutonne
+       Paul Gilbert
 
     Tucker:
        Gregory Montoir
@@ -239,8 +236,8 @@ ScummVM Team
        Fabio Battaglia
 
     Nintendo DS:
-       Neil Millstone
        Bertrand Augereau     - HQ software scaler
+       Neil Millstone
 
     OpenPandora:
        John Willis
@@ -255,8 +252,8 @@ ScummVM Team
        Max Lingua
 
     PSP (PlayStation Portable):
-       Joost Peters
        Yotam Barnoy
+       Joost Peters
 
     SDL (Win/Linux/OS X/etc.):
        Max Horn              - (retired)
@@ -432,6 +429,7 @@ Other contributions
 
     Spanish:
        Tomas Maidagan
+       Jordi Vilalta Prat
 
     Swedish:
        Hampus Flink
@@ -442,11 +440,11 @@ Other contributions
   Websites (design)
   -----------------
      Dobo Balazs           - Website design
+     William Claydon       - Skins for doxygen, buildbot and wiki
      Yaroslav Fedevych     - HTML/CSS for the website
-     David Jensen          - SVG logo conversion
      Jean Marc Gimenez     - ScummVM logo
+     David Jensen          - SVG logo conversion
      Raina                 - ScummVM forum buttons
-     William Claydon       - Skins for doxygen, buildbot and wiki
 
   Code contributions
   ------------------
@@ -482,50 +480,50 @@ Other contributions
 
   FreeSCI Contributors
   --------------------
-     Anders Baden Nielsen  - PPC testing
-     Bas Zoetekouw         - Man pages, debian package management, CVS
-                             maintenance
-     Carl Muckenhoupt      - Sources to the SCI resource viewer tools that
-                             started it all
+     Francois-R Boyer      - MT-32 information and mapping code
+     Rainer Canavan        - IRIX MIDI driver and bug fixes
+     Xiaojun Chen
+     Paul David Doherty    - Game version information
+     Vyacheslav Dikonov    - Config script improvements
+     Ruediger Hanke        - Port to the MorphOS platform
+     Matt Hargett          - Clean-ups, bugfixes, Hardcore QA, Win32
+     Max Horn              - SetJump implementation
+     Ravi I.               - SCI0 sound resource specification
+     Emmanuel Jeandel      - Bugfixes and bug reports
+     Dmitry Jemerov        - Port to the Win32 platform, numerous bugfixes
      Chris Kehler          - Makefile enhancements
-     Christoph Reichenbach - UN*X code, VM/Graphics/Sound/other
-                             infrastructure
      Christopher T. Lansdo - Original CVS maintainer, Alpha compatibility
                              fixes
+     Sergey Lapin          - Port of Carl's type 2 decompression code
+     Rickard Lind          - MT-32->GM MIDI mapping magic, sound research
+     Hubert Maier          - AmigaOS 4 port
+     Johannes Manhave      - Document format translation
      Claudio Matsuoka      - CVS snapshots, daily builds, BeOS and cygwin
                              ports
      Dark Minister         - SCI research (bytecode and parser)
-     Dmitry Jemerov        - Port to the Win32 platform, numerous bugfixes
-     Emmanuel Jeandel      - Bugfixes and bug reports
-     Francois-R Boyer      - MT-32 information and mapping code
+     Carl Muckenhoupt      - Sources to the SCI resource viewer tools that
+                             started it all
+     Anders Baden Nielsen  - PPC testing
+     Walter van Niftrik    - Ports to the Dreamcast and GP32 platforms
+     Rune Orsval           - Configuration file editor
+     Solomon Peachy        - SDL ports and much of the sound subsystem
+     Robey Pointer         - Bug tracking system hosting
+     Magnus Reftel         - Heap implementation, Python class viewer,
+                             bugfixes
+     Christoph Reichenbach - UN*X code, VM/Graphics/Sound/other
+                             infrastructure
      George Reid           - FreeBSD package management
-     Hubert Maier          - AmigaOS 4 port
-     Hugues Valois         - Game selection menu
-     Johannes Manhave      - Document format translation
-     Jordi Vilalta         - Numerous code and website clean-up patches
      Lars Skovlund         - Project maintenance, most documentation,
                              bugfixes, SCI1 support
-     Magnus Reftel         - Heap implementation, Python class viewer,
-                             bugfixes
-     Matt Hargett          - Clean-ups, bugfixes, Hardcore QA, Win32
-     Max Horn              - SetJump implementation
-     Paul David Doherty    - Game version information
-     Petr Vyhnak           - The DCL-INFLATE algorithm, many Win32
-                             improvements
-     Rainer Canavan        - IRIX MIDI driver and bug fixes
-     Rainer De Temple      - SCI research
-     Ravi I.               - SCI0 sound resource specification
-     Ruediger Hanke        - Port to the MorphOS platform
-     Rune Orsval           - Configuration file editor
-     Rickard Lind          - MT-32->GM MIDI mapping magic, sound research
      Rink Springer         - Port to the DOS platform, several bug fixes
-     Robey Pointer         - Bug tracking system hosting
-     Sergey Lapin          - Port of Carl's type 2 decompression code
-     Solomon Peachy        - SDL ports and much of the sound subsystem
-     Vyacheslav Dikonov    - Config script improvements
-     Walter van Niftrik    - Ports to the Dreamcast and GP32 platforms
-     Xiaojun Chen
+     Rainer De Temple      - SCI research
      Sean Terrell
+     Hugues Valois         - Game selection menu
+     Jordi Vilalta         - Numerous code and website clean-up patches
+     Petr Vyhnak           - The DCL-INFLATE algorithm, many Win32
+                             improvements
+     Bas Zoetekouw         - Man pages, debian package management, CVS
+                             maintenance
 
      Special thanks to Prof. Dr. Gary Nutt for allowing the FreeSCI VM
      extension as a course project in his Advanced OS course.
@@ -557,6 +555,8 @@ Special thanks to
    Tristan          - For additional work on the original MT-32 emulator
    James Woodcock   - Soundtrack enhancements
 
+   Some icons by Yusuke Kamiyamane
+
    Tony Warriner and everyone at Revolution Software Ltd. for sharing with us
    the source of some of their brilliant games, allowing us to release
    Beneath a Steel Sky as freeware... and generally being supportive above

diff --git a/Makefile.common b/Makefile.common
@@ -252,9 +252,6 @@ endif
 ifdef ENABLE_LURE
 DIST_FILES_ENGINEDATA+=lure.dat
 endif
-ifdef ENABLE_M4
-DIST_FILES_ENGINEDATA+=m4.dat
-endif
 ifdef ENABLE_QUEEN
 DIST_FILES_ENGINEDATA+=queen.tbl
 endif

diff --git a/NEWS b/NEWS
@@ -1,7 +1,36 @@
 For a more comprehensive changelog of the latest experimental code, see:
         https://github.com/scummvm/scummvm/commits/
 
-1.4.0 (????-??-??)
+1.5.0 (????-??-??)
+ New Games:
+   - Added support for Soltys.
+
+ SDL ports:
+   - Added support for OpenGL (GSoC Task).
+
+ Broken Sword 1:
+   - Fixed incorrect sound effects in the DOS/Windows demo.
+
+ Cine:
+   - Implemented Roland MT-32 output driver.
+
+ SCUMM:
+   - Added support for the Macintosh version of SPY Fox in Hold the Mustard.
+
+1.4.1 (????-??-??)
+ AGOS:
+   - Fixed loading videos directly from InstallShield cabinets in the Windows
+     version of the The Feeble Files.
+
+ KYRA:
+   - Fixed bug in the original Lands of Lore GUI which made ScummVM error out
+     in the case the user did not have a contiguous save slot usage.
+
+ SCI:
+   - Fixed race condition in SCI1.1 palette changes. This fixes an error in
+     QFG1VGA, when sleeping at Erana's place.
+
+1.4.0 (2011-11-11)
  New Games:
    - Added support for Lands of Lore: The Throne of Chaos.
    - Added support for Blue's Birthday Adventure.
@@ -11,6 +40,10 @@ For a more comprehensive changelog of the latest experimental code, see:
  New Ports:
    - Added PlayStation 3 port.
 
+ General:
+   - Fixed the ARM assembly routine for reverse stereo audio.
+   - Added support for building with MacPorts out of the box.
+
  AGI:
    - Implemented sound support for the DOS version of Winnie the Pooh in the
      Hundred Acre Wood.
@@ -42,12 +75,19 @@ For a more comprehensive changelog of the latest experimental code, see:
    - Improved palette handling for the Amiga version of Indiana Jones and the
      Fate of Atlantis.
 
- SDL ports:
-   - Added support for OpenGL (GSoC Task).
+ Broken Sword 1:
+   - Fix freeze in Windows demo.
+   - Fix crash when using cutscene subtitles pack with the Macintosh version.
 
- TINSEL:
+ Tinsel:
    - Fixed deleting saved games from the list of saved games (from the launcher
      and the in-game ScummVM menu).
+   - The US version of Discworld II now shows the correct title screen and
+     language flag.
+
+ Android port:
+   - Fixed plugins on Android 3.x.
+   - Moved the default saved game location to the SD card.
 
 1.3.1 (2011-07-12)
  General:

diff --git a/README b/README
@@ -956,6 +956,7 @@ arguments -- see the next section.
   --themepath=PATH         Path to where GUI themes are stored
   --list-themes            Display list of all usable GUI themes
   -e, --music-driver=MODE  Select music driver (see also section 7.0)
+  --list-audio-devices     List all available audio devices
   -q, --language=LANG      Select game's language (see also section 5.2)
   -m, --music-volume=NUM   Set the music volume, 0-255 (default: 192)
   -s, --sfx-volume=NUM     Set the sfx volume, 0-255 (default: 192)

diff --git a/audio/audiostream.h b/audio/audiostream.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef SOUND_AUDIOSTREAM_H
-#define SOUND_AUDIOSTREAM_H
+#ifndef AUDIO_AUDIOSTREAM_H
+#define AUDIO_AUDIOSTREAM_H
 
 #include "common/ptr.h"
 #include "common/scummsys.h"

diff --git a/audio/decoders/aac.h b/audio/decoders/aac.h
@@ -26,8 +26,8 @@
  *  - groovie
  */
 
-#ifndef SOUND_AAC_H
-#define SOUND_AAC_H
+#ifndef AUDIO_AAC_H
+#define AUDIO_AAC_H
 
 #include "common/scummsys.h"
 #include "common/types.h"
@@ -59,4 +59,4 @@ Codec *makeAACDecoder(
 } // End of namespace Audio
 
 #endif // #ifdef USE_FAAD
-#endif // #ifndef SOUND_AAC_H
+#endif // #ifndef AUDIO_AAC_H
diff --git a/audio/decoders/adpcm.h b/audio/decoders/adpcm.h
@@ -31,8 +31,8 @@
  *  - tinsel
  */
 
-#ifndef SOUND_ADPCM_H
-#define SOUND_ADPCM_H
+#ifndef AUDIO_ADPCM_H
+#define AUDIO_ADPCM_H
 
 #include "common/scummsys.h"
 #include "common/types.h"

diff --git a/audio/decoders/adpcm_intern.h b/audio/decoders/adpcm_intern.h
@@ -28,8 +28,8 @@
  * ADPCM decoder implementations.
  */
 
-#ifndef SOUND_ADPCM_INTERN_H
-#define SOUND_ADPCM_INTERN_H
+#ifndef AUDIO_ADPCM_INTERN_H
+#define AUDIO_ADPCM_INTERN_H
 
 #include "audio/audiostream.h"
 #include "common/endian.h"
@@ -43,7 +43,7 @@ namespace Audio {
 class ADPCMStream : public RewindableAudioStream {
 protected:
 	Common::DisposablePtr<Common::SeekableReadStream> _stream;
-	const int32 _startpos;
+	int32 _startpos;
 	const int32 _endpos;
 	const int _channels;
 	const uint32 _blockAlign;
@@ -97,9 +97,7 @@ class Ima_ADPCMStream : public ADPCMStream {
 
 public:
 	Ima_ADPCMStream(Common::SeekableReadStream *stream, DisposeAfterUse::Flag disposeAfterUse, uint32 size, int rate, int channels, uint32 blockAlign)
-		: ADPCMStream(stream, disposeAfterUse, size, rate, channels, blockAlign) {
-		memset(&_status, 0, sizeof(_status));
-	}
+		: ADPCMStream(stream, disposeAfterUse, size, rate, channels, blockAlign) {}
 
 	/**
 	 * This table is used by decodeIMA.

diff --git a/audio/decoders/aiff.h b/audio/decoders/aiff.h
@@ -28,8 +28,8 @@
  *  - sword1
  */
 
-#ifndef SOUND_AIFF_H
-#define SOUND_AIFF_H
+#ifndef AUDIO_AIFF_H
+#define AUDIO_AIFF_H
 
 #include "common/scummsys.h"
 #include "common/types.h"