Merge remote branch 'upstream/master' into pegasus

Conflicts:
	AUTHORS

138 files changed, 3412 insertions, 3426 deletions

diff --git a/AUTHORS b/AUTHORS
index de78526302..2900d1ce51 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -6,8 +6,9 @@ ScummVM Team
 
   PR Office
   ---------
-     Arnaud Boutonne       - Public Relations Officer, Project Administrator
-     Eugene Sandulenko     - Project Leader
+     Arnaud Boutonne         - Public Relations Officer, Project
+                               Administrator
+     Eugene Sandulenko       - Project Leader
 
   Core Team
   ---------
@@ -18,29 +19,30 @@ ScummVM Team
   Retired Project Leaders
   -----------------------
      James Brown
-     Vincent Hamm          - ScummVM co-founder, Original Cruise/CinE author
+     Vincent Hamm            - ScummVM co-founder, Original Cruise/CinE
+                               author
      Max Horn
-     Ludvig Strigeus       - Original ScummVM and SimonVM author
+     Ludvig Strigeus         - Original ScummVM and SimonVM author
 
   Engine Teams
   ------------
     SCUMM:
        Torbjorn Andersson
-       James Brown           - (retired)
-       Jonathan Gray         - (retired)
-       Vincent Hamm          - (retired)
-       Max Horn              - (retired)
+       James Brown             - (retired)
+       Jonathan Gray           - (retired)
+       Vincent Hamm            - (retired)
+       Max Horn                - (retired)
        Travis Howell
-       Pawel Kolodziejski    - Codecs, iMUSE, Smush, etc.
-       Gregory Montoir       - (retired)
-       Eugene Sandulenko     - FT INSANE, MM NES, MM C64, game detection,
-                               Herc/CGA
-       Ludvig Strigeus       - (retired)
+       Pawel Kolodziejski      - Codecs, iMUSE, Smush, etc.
+       Gregory Montoir         - (retired)
+       Eugene Sandulenko       - FT INSANE, MM NES, MM C64, game detection,
+                                 Herc/CGA
+       Ludvig Strigeus         - (retired)
 
     HE:
-       Jonathan Gray         - (retired)
+       Jonathan Gray           - (retired)
        Travis Howell
-       Gregory Montoir       - (retired)
+       Gregory Montoir         - (retired)
        Eugene Sandulenko
 
     AGI:
@@ -48,26 +50,26 @@ ScummVM Team
        Matthew Hoops
        Filippos Karapetis
        Pawel Kolodziejski
-       Walter van Niftrik    - (retired)
+       Walter van Niftrik      - (retired)
        Kari Salminen
        Eugene Sandulenko
-       David Symonds         - (retired)
+       David Symonds           - (retired)
 
     AGOS:
        Torbjorn Andersson
        Paul Gilbert
        Travis Howell
-       Oliver Kiehl          - (retired)
-       Ludvig Strigeus       - (retired)
+       Oliver Kiehl            - (retired)
+       Ludvig Strigeus         - (retired)
 
     CGE:
        Arnaud Boutonne
        Paul Gilbert
 
     Cine:
-       Vincent Hamm          - (retired)
+       Vincent Hamm            - (retired)
        Pawel Kolodziejski
-       Gregory Montoir       - (retired)
+       Gregory Montoir         - (retired)
        Kari Salminen
        Eugene Sandulenko
 
@@ -76,7 +78,7 @@ ScummVM Team
 
     CruisE:
        Paul Gilbert
-       Vincent Hamm          - (retired)
+       Vincent Hamm            - (retired)
 
     Draci:
        Denis Kasak
@@ -90,7 +92,7 @@ ScummVM Team
        Torbjorn Andersson
        Bertrand Augereau
        Filippos Karapetis
-       Vladimir Menshakov    - (retired)
+       Vladimir Menshakov      - (retired)
        Willem Jan Palenstijn
 
     Gob:
@@ -110,10 +112,10 @@ ScummVM Team
        Eugene Sandulenko
 
     Kyra:
-       Torbjorn Andersson    - VQA Player
+       Torbjorn Andersson      - VQA Player
        Oystein Eftevaag
        Florian Kagerer
-       Gregory Montoir       - (retired)
+       Gregory Montoir         - (retired)
        Johannes Schickel
 
     Lastexpress:
@@ -143,14 +145,14 @@ ScummVM Team
        Matthew Hoops
 
     Queen:
-       David Eriksson        - (retired)
-       Gregory Montoir       - (retired)
+       David Eriksson          - (retired)
+       Gregory Montoir         - (retired)
        Joost Peters
 
     SAGA:
        Torbjorn Andersson
-       Daniel Balsom         - Original engine reimplementation author
-                               (retired)
+       Daniel Balsom           - Original engine reimplementation author
+                                 (retired)
        Filippos Karapetis
        Andrew Kurushin
        Eugene Sandulenko
@@ -158,46 +160,46 @@ ScummVM Team
     SCI:
        Greg Frieger
        Paul Gilbert
-       Max Horn              - (retired)
+       Max Horn                - (retired)
        Filippos Karapetis
        Martin Kiewitz
-       Walter van Niftrik    - (retired)
+       Walter van Niftrik      - (retired)
        Willem Jan Palenstijn
        Jordi Vilalta Prat
        Lars Skovlund
 
     Sky:
-       Robert Goeffringmann  - (retired)
-       Oliver Kiehl          - (retired)
+       Robert Goeffringmann    - (retired)
+       Oliver Kiehl            - (retired)
        Joost Peters
 
     Sword1:
-       Fabio Battaglia       - PSX version support
-       Thierry Crozat        - Mac version support
-       Robert Goeffringmann  - (retired)
+       Fabio Battaglia         - PSX version support
+       Thierry Crozat          - Mac version support
+       Robert Goeffringmann    - (retired)
 
     Sword2:
        Torbjorn Andersson
-       Fabio Battaglia       - PSX version support
-       Jonathan Gray         - (retired)
+       Fabio Battaglia         - PSX version support
+       Jonathan Gray           - (retired)
 
     Sword25:
        Torbjorn Andersson
        Paul Gilbert
-       Max Horn              - (retired)
+       Max Horn                - (retired)
        Filippos Karapetis
        Eugene Sandulenko
 
     TeenAgent:
-       Robert Megone         - Help with callback rewriting
-       Vladimir Menshakov    - (retired)
+       Robert Megone           - Help with callback rewriting
+       Vladimir Menshakov      - (retired)
 
     Tinsel:
        Torbjorn Andersson
-       Fabio Battaglia       - PSX version support
+       Fabio Battaglia         - PSX version support
        Paul Gilbert
        Sven Hesse
-       Max Horn              - (retired)
+       Max Horn                - (retired)
        Filippos Karapetis
        Joost Peters
 
@@ -205,14 +207,17 @@ ScummVM Team
        Sylvain Dupont
 
     Touche:
-       Gregory Montoir       - (retired)
+       Gregory Montoir         - (retired)
 
     TsAGE:
        Arnaud Boutonne
        Paul Gilbert
 
     Tucker:
-       Gregory Montoir       - (retired)
+       Gregory Montoir         - (retired)
+
+    Wintermute:
+       Einar Johan T. Somaaen
 
   Backend Teams
   -------------
@@ -236,26 +241,26 @@ ScummVM Team
        Lubomyr Lisen
 
     Maemo:
-       Frantisek Dufka       - (retired)
+       Frantisek Dufka         - (retired)
        Tarek Soliman
 
     Nintendo 64:
        Fabio Battaglia
 
     Nintendo DS:
-       Bertrand Augereau     - HQ software scaler
+       Bertrand Augereau       - HQ software scaler
        Neil Millstone
 
     OpenPandora:
        John Willis
 
     PocketPC / WinCE:
-       Nicolas Bacca         - (retired)
+       Nicolas Bacca           - (retired)
        Ismail Khatib
-       Kostas Nakos          - (retired)
+       Kostas Nakos            - (retired)
 
     PlayStation 2:
-       Robert Goeffringmann  - (retired)
+       Robert Goeffringmann    - (retired)
        Max Lingua
 
     PSP (PlayStation Portable):
@@ -263,8 +268,8 @@ ScummVM Team
        Joost Peters
 
     SDL (Win/Linux/OS X/etc.):
-       Max Horn              - (retired)
-       Eugene Sandulenko     - Asm routines, GFX layers
+       Max Horn                - (retired)
+       Eugene Sandulenko       - Asm routines, GFX layers
 
     SymbianOS:
        Jurgen Braam
@@ -279,8 +284,9 @@ ScummVM Team
   Other subsystems
   ----------------
     Infrastructure:
-       Max Horn              - Backend & Engine APIs, file API, sound mixer,
-                               audiostreams, data structures, etc. (retired)
+       Max Horn                - Backend & Engine APIs, file API, sound
+                                 mixer, audiostreams, data structures, etc.
+                                 (retired)
        Eugene Sandulenko
        Johannes Schickel
 
@@ -290,30 +296,31 @@ ScummVM Team
        Johannes Schickel
 
     Miscellaneous:
-       David Corrales-Lopez  - Filesystem access improvements (GSoC 2007
-                               task) (retired)
-       Jerome Fisher         - MT-32 emulator
-       Benjamin Haisch       - Heavily improved de-/encoder for DXA videos
-       Jochen Hoenicke       - Speaker & PCjr sound support, AdLib work
-                               (retired)
-       Chris Page            - Return to launcher, savestate improvements,
-                               leak fixes, ... (GSoC 2008 task) (retired)
-       Robin Watts           - ARM assembly routines for nice speedups on
-                               several ports; improvements to the sound mixer
+       David Corrales-Lopez    - Filesystem access improvements (GSoC 2007
+                                 task) (retired)
+       Jerome Fisher           - MT-32 emulator
+       Benjamin Haisch         - Heavily improved de-/encoder for DXA videos
+       Jochen Hoenicke         - Speaker & PCjr sound support, AdLib work
+                                 (retired)
+       Chris Page              - Return to launcher, savestate improvements,
+                                 leak fixes, ... (GSoC 2008 task) (retired)
+       Robin Watts             - ARM assembly routines for nice speedups on
+                                 several ports; improvements to the sound
+                                 mixer
 
   Website (code)
   --------------
-     Fredrik Wendel        - (retired)
+     Fredrik Wendel          - (retired)
 
   Website (maintenance)
   ---------------------
-     James Brown           - IRC Logs maintainer
-     Thierry Crozat        - Wiki maintainer
-     Andre Heider          - Buildbot maintainer
-     Joost Peters          - Doxygen Project Documentation maintainer
-     Jordi Vilalta Prat    - Wiki maintainer
-     Eugene Sandulenko     - Forum, IRC channel, Screen Shots and Mailing
-                             list maintainer
+     James Brown             - IRC Logs maintainer
+     Thierry Crozat          - Wiki maintainer
+     Andre Heider            - Buildbot maintainer
+     Joost Peters            - Doxygen Project Documentation maintainer
+     Jordi Vilalta Prat      - Wiki maintainer
+     Eugene Sandulenko       - Forum, IRC channel, Screen Shots and Mailing
+                               list maintainer
      John Willis
 
   Website (content)
@@ -322,31 +329,31 @@ ScummVM Team
 
   Documentation
   -------------
-     Thierry Crozat        - Numerous contributions to documentation
-     Joachim Eberhard      - Numerous contributions to documentation
-                             (retired)
-     Matthew Hoops         - Wiki editor
+     Thierry Crozat          - Numerous contributions to documentation
+     Joachim Eberhard        - Numerous contributions to documentation
+                               (retired)
+     Matthew Hoops           - Wiki editor
 
   Retired Team Members
   --------------------
-     Chris Apers           - Former PalmOS porter
-     Ralph Brorsen         - Help with GUI implementation
-     Jamieson Christian    - iMUSE, MIDI, all things musical
-     Felix Jakschitsch     - Zak256 reverse engineering
-     Mutwin Kraus          - Original MacOS porter
-     Peter Moraliyski      - Port: GP32
-     Jeremy Newman         - Former webmaster
-     Lionel Ulmer          - Port: X11
-     Won Star              - Former GP32 porter
+     Chris Apers             - Former PalmOS porter
+     Ralph Brorsen           - Help with GUI implementation
+     Jamieson Christian      - iMUSE, MIDI, all things musical
+     Felix Jakschitsch       - Zak256 reverse engineering
+     Mutwin Kraus            - Original MacOS porter
+     Peter Moraliyski        - Port: GP32
+     Jeremy Newman           - Former webmaster
+     Lionel Ulmer            - Port: X11
+     Won Star                - Former GP32 porter
 
 Other contributions
 *******************
   Packages
   --------
     AmigaOS 4:
-       Hans-Joerg Frieden    - (retired)
+       Hans-Joerg Frieden      - (retired)
        Hubert Maier
-       Juha Niemimaki        - (retired)
+       Juha Niemimaki          - (retired)
 
     Atari/FreeMiNT:
        Keith Scroggins
@@ -356,22 +363,22 @@ Other contributions
        Luc Schrijvers
 
     Debian GNU/Linux:
-       Tore Anderson         - (retired)
+       Tore Anderson           - (retired)
        David Weinehall
 
     Fedora / RedHat:
        Willem Jan Palenstijn
 
     Mac OS X:
-       Max Horn              - (retired)
+       Max Horn                - (retired)
        Oystein Eftevaag
 
     Mandriva:
-       Dominik Scherer       - (retired)
+       Dominik Scherer         - (retired)
 
     MorphOS:
        Fabien Coeurjoly
-       Ruediger Hanke        - (retired)
+       Ruediger Hanke          - (retired)
 
     OS/2:
        Paul Smedley
@@ -389,12 +396,12 @@ Other contributions
        Travis Howell
 
     Win64:
-       Chris Gray            - (retired)
+       Chris Gray              - (retired)
        Johannes Schickel
 
   Translations
   ------------
-     Thierry Crozat        - Translation Lead
+     Thierry Crozat          - Translation Lead
 
     Basque:
        Mikel Iturbe Urretxa
@@ -452,92 +459,95 @@ Other contributions
 
   Websites (design)
   -----------------
-     Dobo Balazs           - Website design
-     William Claydon       - Skins for doxygen, buildbot and wiki
-     Yaroslav Fedevych     - HTML/CSS for the website
-     Jean Marc Gimenez     - ScummVM logo
-     David Jensen          - SVG logo conversion
-     Raina                 - ScummVM forum buttons
+     Dobo Balazs             - Website design
+     William Claydon         - Skins for doxygen, buildbot and wiki
+     Yaroslav Fedevych       - HTML/CSS for the website
+     Jean Marc Gimenez       - ScummVM logo
+     David Jensen            - SVG logo conversion
+     Raina                   - ScummVM forum buttons
 
   Code contributions
   ------------------
-     Ori Avtalion          - Subtitle control options in the GUI; BASS GUI
-                             fixes
-     Stuart Caie           - Decoders for Amiga and AtariST data files (AGOS
-                             engine)
-     Paolo Costabel        - PSP port contributions
-     Martin Doucha         - CinE engine objectification
-     Thomas Fach-Pedersen  - ProTracker module player, Smacker video decoder
-     Tobias Gunkel         - Sound support for C64 version of MM/Zak, Loom
-                             PCE support
-     Janne Huttunen        - V3 actor mask support, Dig/FT SMUSH audio
-     Kovacs Endre Janos    - Several fixes for Simon1
-     Jeroen Janssen        - Numerous readability and bugfix patches
-     Andreas Karlsson      - Initial port for SymbianOS
-     Claudio Matsuoka      - Daily Linux builds
-     Thomas Mayer          - PSP port contributions
-     Sean Murray           - ScummVM tools GUI application (GSoC 2007 task)
-     n0p                   - Windows CE port aspect ratio correction scaler
-                             and right click input method
-     Mikesch Nepomuk       - MI1 VGA floppy patches
-     Nicolas Noble         - Config file and ALSA support
-     Tim Phillips          - Initial MI1 CD music support
-     Quietust              - Sound support for Amiga SCUMM V2/V3 games, MM
-                             NES support
-     Robert Crossfield     - Improved support for Apple II/C64 versions of MM
-     Andreas Roever        - Broken Sword I & II MPEG2 cutscene support
-     Edward Rudd           - Fixes for playing MP3 versions of MI1/Loom audio
-     Daniel Schepler       - Final MI1 CD music support, initial Ogg Vorbis
-                             support
-     Andre Souza           - SDL-based OpenGL renderer
-     Tom Frost             - WebOS port contributions
+     Ori Avtalion            - Subtitle control options in the GUI; BASS GUI
+                               fixes
+     Stuart Caie             - Decoders for Amiga and AtariST data files
+                               (AGOS engine)
+     Paolo Costabel          - PSP port contributions
+     Martin Doucha           - CinE engine objectification
+     Thomas Fach-Pedersen    - ProTracker module player, Smacker video
+                               decoder
+     Tobias Gunkel           - Sound support for C64 version of MM/Zak, Loom
+                               PCE support
+     Janne Huttunen          - V3 actor mask support, Dig/FT SMUSH audio
+     Kovacs Endre Janos      - Several fixes for Simon1
+     Jeroen Janssen          - Numerous readability and bugfix patches
+     Andreas Karlsson        - Initial port for SymbianOS
+     Claudio Matsuoka        - Daily Linux builds
+     Thomas Mayer            - PSP port contributions
+     Sean Murray             - ScummVM tools GUI application (GSoC 2007 task)
+     n0p                     - Windows CE port aspect ratio correction scaler
+                               and right click input method
+     Mikesch Nepomuk         - MI1 VGA floppy patches
+     Nicolas Noble           - Config file and ALSA support
+     Tim Phillips            - Initial MI1 CD music support
+     Quietust                - Sound support for Amiga SCUMM V2/V3 games, MM
+                               NES support
+     Robert Crossfield       - Improved support for Apple II/C64 versions of
+                               MM
+     Andreas Roever          - Broken Sword I & II MPEG2 cutscene support
+     Edward Rudd             - Fixes for playing MP3 versions of MI1/Loom
+                               audio
+     Daniel Schepler         - Final MI1 CD music support, initial Ogg Vorbis
+                               support
+     Andre Souza             - SDL-based OpenGL renderer
+     Tom Frost               - WebOS port contributions
 
   FreeSCI Contributors
   --------------------
-     Francois-R Boyer      - MT-32 information and mapping code
-     Rainer Canavan        - IRIX MIDI driver and bug fixes
+     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
-     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)
-     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
-     Lars Skovlund         - Project maintenance, most documentation,
-                             bugfixes, SCI1 support
-     Rink Springer         - Port to the DOS platform, several bug fixes
-     Rainer De Temple      - SCI research
+     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
+     Christopher T. Lansdown - 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)
+     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
+     Lars Skovlund           - Project maintenance, most documentation,
+                               bugfixes, SCI1 support
+     Rink Springer           - Port to the DOS platform, several bug fixes
+     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
+     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.
@@ -549,28 +559,27 @@ Other contributions
 
 Special thanks to
 *****************
-   Daniel Balsom    - For the original Reinherit (SAGA) code
-   Sander Buskens   - For his work on the initial reversing of Monkey2
-   Canadacow        - For the original MT-32 emulator
-   Kevin Carnes     - For Scumm16, the basis of ScummVM's older gfx codecs
-   Curt Coder       - For the original TrollVM (preAGI) code
-   Patrick Combet   - For the original Gobliiins ADL player
-   Ivan Dubrov      - For contributing the initial version of the Gobliiins
-                      engine
-   Henrik Engqvist  - For generously providing hosting for our buildbot, SVN
-                      repository, planet and doxygen sites as well as tons of
-                      HD space
-   DOSBox Team      - For their awesome OPL2 and OPL3 emulator
-   Till Kresslein   - For design of modern ScummVM GUI
-   Jezar            - For his freeverb filter implementation
-   Jim Leiterman    - Various info on his FM-TOWNS/Marty SCUMM ports
-   lloyd            - For deep tech details about C64 Zak & MM
-   Sarien Team      - Original AGI engine code
-   Jimmi Thogersen  - For ScummRev, and much obscure code/documentation
-   Tristan          - For additional work on the original MT-32 emulator
-   James Woodcock   - Soundtrack enhancements
-
-   Some icons by Yusuke Kamiyamane
+   Daniel Balsom     - For the original Reinherit (SAGA) code
+   Sander Buskens    - For his work on the initial reversing of Monkey2
+   Canadacow         - For the original MT-32 emulator
+   Kevin Carnes      - For Scumm16, the basis of ScummVM's older gfx codecs
+   Curt Coder        - For the original TrollVM (preAGI) code
+   Patrick Combet    - For the original Gobliiins ADL player
+   Ivan Dubrov       - For contributing the initial version of the Gobliiins
+                       engine
+   Henrik Engqvist   - For generously providing hosting for our buildbot, SVN
+                       repository, planet and doxygen sites as well as tons
+                       of HD space
+   DOSBox Team       - For their awesome OPL2 and OPL3 emulator
+   Yusuke Kamiyamane - For contributing some GUI icons 
+   Till Kresslein    - For design of modern ScummVM GUI
+   Jezar             - For his freeverb filter implementation
+   Jim Leiterman     - Various info on his FM-TOWNS/Marty SCUMM ports
+   lloyd             - For deep tech details about C64 Zak & MM
+   Sarien Team       - Original AGI engine code
+   Jimmi Thogersen   - For ScummRev, and much obscure code/documentation
+   Tristan           - For additional work on the original MT-32 emulator
+   James Woodcock    - Soundtrack enhancements
 
    Tony Warriner and everyone at Revolution Software Ltd. for sharing with us
    the source of some of their brilliant games, allowing us to release
@@ -609,9 +618,12 @@ Special thanks to
    of Dreamweb and for their tremendous support.
 
    Janusz Wisniewski and Miroslaw Liminowicz from Laboratorium Komputerowe
-   Avalon for providing full source code for Soltys and letting us to
+   Avalon for providing full source code for Soltys and letting us
    redistribute the game.
 
+   Jan Nedoma for providing the sources to the Wintermute-engine, and for his
+   support while porting the engine to ScummVM.
+
    Bob Bell, Michel Kripalani, Tommy Yune, from Presto Studios for providing
    the source code of The Journeyman Project: Pegasus Prime.
 
diff --git a/audio/midiparser.cpp b/audio/midiparser.cpp
index 943a6067a4..eec32c05d1 100644
--- a/audio/midiparser.cpp
+++ b/audio/midiparser.cpp
@@ -32,24 +32,24 @@
 //////////////////////////////////////////////////
 
 MidiParser::MidiParser() :
-_hanging_notes_count(0),
+_hangingNotesCount(0),
 _driver(0),
-_timer_rate(0x4A0000),
+_timerRate(0x4A0000),
 _ppqn(96),
 _tempo(500000),
-_psec_per_tick(5208), // 500000 / 96
+_psecPerTick(5208), // 500000 / 96
 _autoLoop(false),
 _smartJump(false),
 _centerPitchWheelOnUnload(false),
 _sendSustainOffOnNotesOff(false),
-_num_tracks(0),
-_active_track(255),
-_abort_parse(0) {
-	memset(_active_notes, 0, sizeof(_active_notes));
-	_next_event.start = NULL;
-	_next_event.delta = 0;
-	_next_event.event = 0;
-	_next_event.length = 0;
+_numTracks(0),
+_activeTrack(255),
+_abortParse(0) {
+	memset(_activeNotes, 0, sizeof(_activeNotes));
+	_nextEvent.start = NULL;
+	_nextEvent.delta = 0;
+	_nextEvent.event = 0;
+	_nextEvent.length = 0;
 }
 
 void MidiParser::property(int prop, int value) {
@@ -76,7 +76,7 @@ void MidiParser::sendToDriver(uint32 b) {
 void MidiParser::setTempo(uint32 tempo) {
 	_tempo = tempo;
 	if (_ppqn)
-		_psec_per_tick = (tempo + (_ppqn >> 2)) / _ppqn;
+		_psecPerTick = (tempo + (_ppqn >> 2)) / _ppqn;
 }
 
 // This is the conventional (i.e. SMF) variable length quantity
@@ -100,44 +100,44 @@ void MidiParser::activeNote(byte channel, byte note, bool active) {
 		return;
 
 	if (active)
-		_active_notes[note] |= (1 << channel);
+		_activeNotes[note] |= (1 << channel);
 	else
-		_active_notes[note] &= ~(1 << channel);
+		_activeNotes[note] &= ~(1 << channel);
 
 	// See if there are hanging notes that we can cancel
-	NoteTimer *ptr = _hanging_notes;
+	NoteTimer *ptr = _hangingNotes;
 	int i;
-	for (i = ARRAYSIZE(_hanging_notes); i; --i, ++ptr) {
-		if (ptr->channel == channel && ptr->note == note && ptr->time_left) {
-			ptr->time_left = 0;
-			--_hanging_notes_count;
+	for (i = ARRAYSIZE(_hangingNotes); i; --i, ++ptr) {
+		if (ptr->channel == channel && ptr->note == note && ptr->timeLeft) {
+			ptr->timeLeft = 0;
+			--_hangingNotesCount;
 			break;
 		}
 	}
 }
 
-void MidiParser::hangingNote(byte channel, byte note, uint32 time_left, bool recycle) {
+void MidiParser::hangingNote(byte channel, byte note, uint32 timeLeft, bool recycle) {
 	NoteTimer *best = 0;
-	NoteTimer *ptr = _hanging_notes;
+	NoteTimer *ptr = _hangingNotes;
 	int i;
 
-	if (_hanging_notes_count >= ARRAYSIZE(_hanging_notes)) {
+	if (_hangingNotesCount >= ARRAYSIZE(_hangingNotes)) {
 		warning("MidiParser::hangingNote(): Exceeded polyphony");
 		return;
 	}
 
-	for (i = ARRAYSIZE(_hanging_notes); i; --i, ++ptr) {
+	for (i = ARRAYSIZE(_hangingNotes); i; --i, ++ptr) {
 		if (ptr->channel == channel && ptr->note == note) {
-			if (ptr->time_left && ptr->time_left < time_left && recycle)
+			if (ptr->timeLeft && ptr->timeLeft < timeLeft && recycle)
 				return;
 			best = ptr;
-			if (ptr->time_left) {
+			if (ptr->timeLeft) {
 				if (recycle)
 					sendToDriver(0x80 | channel, note, 0);
-				--_hanging_notes_count;
+				--_hangingNotesCount;
 			}
 			break;
-		} else if (!best && ptr->time_left == 0) {
+		} else if (!best && ptr->timeLeft == 0) {
 			best = ptr;
 		}
 	}
@@ -146,14 +146,14 @@ void MidiParser::hangingNote(byte channel, byte note, uint32 time_left, bool rec
 	// length, if the note should be turned on and off in
 	// the same iteration. For now just set it to 1 and
 	// we'll turn it off in the next cycle.
-	if (!time_left || time_left & 0x80000000)
-		time_left = 1;
+	if (!timeLeft || timeLeft & 0x80000000)
+		timeLeft = 1;
 
 	if (best) {
 		best->channel = channel;
 		best->note = note;
-		best->time_left = time_left;
-		++_hanging_notes_count;
+		best->timeLeft = timeLeft;
+		++_hangingNotesCount;
 	} else {
 		// We checked this up top. We should never get here!
 		warning("MidiParser::hangingNote(): Internal error");
@@ -161,45 +161,45 @@ void MidiParser::hangingNote(byte channel, byte note, uint32 time_left, bool rec
 }
 
 void MidiParser::onTimer() {
-	uint32 end_time;
-	uint32 event_time;
+	uint32 endTime;
+	uint32 eventTime;
 
-	if (!_position._play_pos || !_driver)
+	if (!_position._playPos || !_driver)
 		return;
 
-	_abort_parse = false;
-	end_time = _position._play_time + _timer_rate;
+	_abortParse = false;
+	endTime = _position._playTime + _timerRate;
 
 	// Scan our hanging notes for any
 	// that should be turned off.
-	if (_hanging_notes_count) {
-		NoteTimer *ptr = &_hanging_notes[0];
+	if (_hangingNotesCount) {
+		NoteTimer *ptr = &_hangingNotes[0];
 		int i;
-		for (i = ARRAYSIZE(_hanging_notes); i; --i, ++ptr) {
-			if (ptr->time_left) {
-				if (ptr->time_left <= _timer_rate) {
+		for (i = ARRAYSIZE(_hangingNotes); i; --i, ++ptr) {
+			if (ptr->timeLeft) {
+				if (ptr->timeLeft <= _timerRate) {
 					sendToDriver(0x80 | ptr->channel, ptr->note, 0);
-					ptr->time_left = 0;
-					--_hanging_notes_count;
+					ptr->timeLeft = 0;
+					--_hangingNotesCount;
 				} else {
-					ptr->time_left -= _timer_rate;
+					ptr->timeLeft -= _timerRate;
 				}
 			}
 		}
 	}
 
-	while (!_abort_parse) {
-		EventInfo &info = _next_event;
+	while (!_abortParse) {
+		EventInfo &info = _nextEvent;
 
-		event_time = _position._last_event_time + info.delta * _psec_per_tick;
-		if (event_time > end_time)
+		eventTime = _position._lastEventTime + info.delta * _psecPerTick;
+		if (eventTime > endTime)
 			break;
 
 		// Process the next info.
-		_position._last_event_tick += info.delta;
+		_position._lastEventTick += info.delta;
 		if (info.event < 0x80) {
 			warning("Bad command or running status %02X", info.event);
-			_position._play_pos = 0;
+			_position._playPos = 0;
 			return;
 		}
 
@@ -217,7 +217,7 @@ void MidiParser::onTimer() {
 				// as well as sending it to the output device.
 				if (_autoLoop) {
 					jumpToTick(0);
-					parseNextEvent(_next_event);
+					parseNextEvent(_nextEvent);
 				} else {
 					stopPlaying();
 					_driver->metaEvent(info.ext.type, info.ext.data, (uint16)info.length);
@@ -234,7 +234,7 @@ void MidiParser::onTimer() {
 				activeNote(info.channel(), info.basic.param1, false);
 			} else if (info.command() == 0x9) {
 				if (info.length > 0)
-					hangingNote(info.channel(), info.basic.param1, info.length * _psec_per_tick - (end_time - event_time));
+					hangingNote(info.channel(), info.basic.param1, info.length * _psecPerTick - (endTime - eventTime));
 				else
 					activeNote(info.channel(), info.basic.param1, true);
 			}
@@ -242,15 +242,15 @@ void MidiParser::onTimer() {
 		}
 
 
-		if (!_abort_parse) {
-			_position._last_event_time = event_time;
-			parseNextEvent(_next_event);
+		if (!_abortParse) {
+			_position._lastEventTime = eventTime;
+			parseNextEvent(_nextEvent);
 		}
 	}
 
-	if (!_abort_parse) {
-		_position._play_time = end_time;
-		_position._play_tick = (_position._play_time - _position._last_event_time) / _psec_per_tick + _position._last_event_tick;
+	if (!_abortParse) {
+		_position._playTime = endTime;
+		_position._playTick = (_position._playTime - _position._lastEventTime) / _psecPerTick + _position._lastEventTick;
 	}
 }
 
@@ -263,20 +263,20 @@ void MidiParser::allNotesOff() {
 	// Turn off all active notes
 	for (i = 0; i < 128; ++i) {
 		for (j = 0; j < 16; ++j) {
-			if (_active_notes[i] & (1 << j)) {
+			if (_activeNotes[i] & (1 << j)) {
 				sendToDriver(0x80 | j, i, 0);
 			}
 		}
 	}
 
 	// Turn off all hanging notes
-	for (i = 0; i < ARRAYSIZE(_hanging_notes); i++) {
-		if (_hanging_notes[i].time_left) {
-			sendToDriver(0x80 | _hanging_notes[i].channel, _hanging_notes[i].note, 0);
-			_hanging_notes[i].time_left = 0;
+	for (i = 0; i < ARRAYSIZE(_hangingNotes); i++) {
+		if (_hangingNotes[i].timeLeft) {
+			sendToDriver(0x80 | _hangingNotes[i].channel, _hangingNotes[i].note, 0);
+			_hangingNotes[i].timeLeft = 0;
 		}
 	}
-	_hanging_notes_count = 0;
+	_hangingNotesCount = 0;
 
 	// To be sure, send an "All Note Off" event (but not all MIDI devices
 	// support this...).
@@ -287,7 +287,7 @@ void MidiParser::allNotesOff() {
 			sendToDriver(0xB0 | i, 0x40, 0); // Also send a sustain off event (bug #3116608)
 	}
 
-	memset(_active_notes, 0, sizeof(_active_notes));
+	memset(_activeNotes, 0, sizeof(_activeNotes));
 }
 
 void MidiParser::resetTracking() {
@@ -295,7 +295,7 @@ void MidiParser::resetTracking() {
 }
 
 bool MidiParser::setTrack(int track) {
-	if (track < 0 || track >= _num_tracks)
+	if (track < 0 || track >= _numTracks)
 		return false;
 	// We allow restarting the track via setTrack when
 	// it isn't playing anymore. This allows us to reuse
@@ -308,7 +308,7 @@ bool MidiParser::setTrack(int track) {
 	// TODO: Check if any engine has problem with this
 	// handling, if so we need to find a better way to handle
 	// track restarts. (KYRA relies on this working)
-	else if (track == _active_track && isPlaying())
+	else if (track == _activeTrack && isPlaying())
 		return true;
 
 	if (_smartJump)
@@ -317,10 +317,10 @@ bool MidiParser::setTrack(int track) {
 		allNotesOff();
 
 	resetTracking();
-	memset(_active_notes, 0, sizeof(_active_notes));
-	_active_track = track;
-	_position._play_pos = _tracks[track];
-	parseNextEvent(_next_event);
+	memset(_activeNotes, 0, sizeof(_activeNotes));
+	_activeTrack = track;
+	_position._playPos = _tracks[track];
+	parseNextEvent(_nextEvent);
 	return true;
 }
 
@@ -332,29 +332,29 @@ void MidiParser::stopPlaying() {
 void MidiParser::hangAllActiveNotes() {
 	// Search for note off events until we have
 	// accounted for every active note.
-	uint16 temp_active[128];
-	memcpy(temp_active, _active_notes, sizeof (temp_active));
+	uint16 tempActive[128];
+	memcpy(tempActive, _activeNotes, sizeof (tempActive));
 
-	uint32 advance_tick = _position._last_event_tick;
+	uint32 advanceTick = _position._lastEventTick;
 	while (true) {
 		int i;
 		for (i = 0; i < 128; ++i)
-			if (temp_active[i] != 0)
+			if (tempActive[i] != 0)
 				break;
 		if (i == 128)
 			break;
-		parseNextEvent(_next_event);
-		advance_tick += _next_event.delta;
-		if (_next_event.command() == 0x8) {
-			if (temp_active[_next_event.basic.param1] & (1 << _next_event.channel())) {
-				hangingNote(_next_event.channel(), _next_event.basic.param1, (advance_tick - _position._last_event_tick) * _psec_per_tick, false);
-				temp_active[_next_event.basic.param1] &= ~(1 << _next_event.channel());
+		parseNextEvent(_nextEvent);
+		advanceTick += _nextEvent.delta;
+		if (_nextEvent.command() == 0x8) {
+			if (tempActive[_nextEvent.basic.param1] & (1 << _nextEvent.channel())) {
+				hangingNote(_nextEvent.channel(), _nextEvent.basic.param1, (advanceTick - _position._lastEventTick) * _psecPerTick, false);
+				tempActive[_nextEvent.basic.param1] &= ~(1 << _nextEvent.channel());
 			}
-		} else if (_next_event.event == 0xFF && _next_event.ext.type == 0x2F) {
+		} else if (_nextEvent.event == 0xFF && _nextEvent.ext.type == 0x2F) {
 			// warning("MidiParser::hangAllActiveNotes(): Hit End of Track with active notes left");
 			for (i = 0; i < 128; ++i) {
 				for (int j = 0; j < 16; ++j) {
-					if (temp_active[i] & (1 << j)) {
+					if (tempActive[i] & (1 << j)) {
 						activeNote(j, i, false);
 						sendToDriver(0x80 | j, i, 0);
 					}
@@ -366,33 +366,33 @@ void MidiParser::hangAllActiveNotes() {
 }
 
 bool MidiParser::jumpToTick(uint32 tick, bool fireEvents, bool stopNotes, bool dontSendNoteOn) {
-	if (_active_track >= _num_tracks)
+	if (_activeTrack >= _numTracks)
 		return false;
 
 	Tracker currentPos(_position);
-	EventInfo currentEvent(_next_event);
+	EventInfo currentEvent(_nextEvent);
 
 	resetTracking();
-	_position._play_pos = _tracks[_active_track];
-	parseNextEvent(_next_event);
+	_position._playPos = _tracks[_activeTrack];
+	parseNextEvent(_nextEvent);
 	if (tick > 0) {
 		while (true) {
-			EventInfo &info = _next_event;
-			if (_position._last_event_tick + info.delta >= tick) {
-				_position._play_time += (tick - _position._last_event_tick) * _psec_per_tick;
-				_position._play_tick = tick;
+			EventInfo &info = _nextEvent;
+			if (_position._lastEventTick + info.delta >= tick) {
+				_position._playTime += (tick - _position._lastEventTick) * _psecPerTick;
+				_position._playTick = tick;
 				break;
 			}
 
-			_position._last_event_tick += info.delta;
-			_position._last_event_time += info.delta * _psec_per_tick;
-			_position._play_tick = _position._last_event_tick;
-			_position._play_time = _position._last_event_time;
+			_position._lastEventTick += info.delta;
+			_position._lastEventTime += info.delta * _psecPerTick;
+			_position._playTick = _position._lastEventTick;
+			_position._playTime = _position._lastEventTime;
 
 			if (info.event == 0xFF) {
 				if (info.ext.type == 0x2F) { // End of track
 					_position = currentPos;
-					_next_event = currentEvent;
+					_nextEvent = currentEvent;
 					return false;
 				} else {
 					if (info.ext.type == 0x51 && info.length >= 3) // Tempo
@@ -419,36 +419,36 @@ bool MidiParser::jumpToTick(uint32 tick, bool fireEvents, bool stopNotes, bool d
 				}
 			}
 
-			parseNextEvent(_next_event);
+			parseNextEvent(_nextEvent);
 		}
 	}
 
 	if (stopNotes) {
-		if (!_smartJump || !currentPos._play_pos) {
+		if (!_smartJump || !currentPos._playPos) {
 			allNotesOff();
 		} else {
-			EventInfo targetEvent(_next_event);
+			EventInfo targetEvent(_nextEvent);
 			Tracker targetPosition(_position);
 
 			_position = currentPos;
-			_next_event = currentEvent;
+			_nextEvent = currentEvent;
 			hangAllActiveNotes();
 
-			_next_event = targetEvent;
+			_nextEvent = targetEvent;
 			_position = targetPosition;
 		}
 	}
 
-	_abort_parse = true;
+	_abortParse = true;
 	return true;
 }
 
 void MidiParser::unloadMusic() {
 	resetTracking();
 	allNotesOff();
-	_num_tracks = 0;
-	_active_track = 255;
-	_abort_parse = true;
+	_numTracks = 0;
+	_activeTrack = 255;
+	_abortParse = true;
 
 	if (_centerPitchWheelOnUnload) {
 		// Center the pitch wheels in preparation for the next piece of
diff --git a/audio/midiparser.h b/audio/midiparser.h
index c935969e72..a4dbf174e1 100644
--- a/audio/midiparser.h
+++ b/audio/midiparser.h
@@ -49,33 +49,33 @@ class MidiDriver_BASE;
  * each Tracker location.
  */
 struct Tracker {
-	byte * _play_pos;        ///< A pointer to the next event to be parsed
-	uint32 _play_time;       ///< Current time in microseconds; may be in between event times
-	uint32 _play_tick;       ///< Current MIDI tick; may be in between event ticks
-	uint32 _last_event_time; ///< The time, in microseconds, of the last event that was parsed
-	uint32 _last_event_tick; ///< The tick at which the last parsed event occurs
-	byte   _running_status;  ///< Cached MIDI command, for MIDI streams that rely on implied event codes
+	byte * _playPos;        ///< A pointer to the next event to be parsed
+	uint32 _playTime;       ///< Current time in microseconds; may be in between event times
+	uint32 _playTick;       ///< Current MIDI tick; may be in between event ticks
+	uint32 _lastEventTime; ///< The time, in microseconds, of the last event that was parsed
+	uint32 _lastEventTick; ///< The tick at which the last parsed event occurs
+	byte   _runningStatus;  ///< Cached MIDI command, for MIDI streams that rely on implied event codes
 
 	Tracker() { clear(); }
 
 	/// Copy constructor for each duplication of Tracker information.
 	Tracker(const Tracker &copy) :
-	_play_pos(copy._play_pos),
-	_play_time(copy._play_time),
-	_play_tick(copy._play_tick),
-	_last_event_time(copy._last_event_time),
-	_last_event_tick(copy._last_event_tick),
-	_running_status(copy._running_status)
+	_playPos(copy._playPos),
+	_playTime(copy._playTime),
+	_playTick(copy._playTick),
+	_lastEventTime(copy._lastEventTime),
+	_lastEventTick(copy._lastEventTick),
+	_runningStatus(copy._runningStatus)
 	{ }
 
 	/// Clears all data; used by the constructor for initialization.
 	void clear() {
-		_play_pos = 0;
-		_play_time = 0;
-		_play_tick = 0;
-		_last_event_time = 0;
-		_last_event_tick = 0;
-		_running_status = 0;
+		_playPos = 0;
+		_playTime = 0;
+		_playTick = 0;
+		_lastEventTime = 0;
+		_lastEventTick = 0;
+		_runningStatus = 0;
 	}
 };
 
@@ -119,8 +119,8 @@ struct EventInfo {
 struct NoteTimer {
 	byte channel;     ///< The MIDI channel on which the note was played
 	byte note;        ///< The note number for the active note
-	uint32 time_left; ///< The time, in microseconds, remaining before the note should be turned off
-	NoteTimer() : channel(0), note(0), time_left(0) {}
+	uint32 timeLeft; ///< The time, in microseconds, remaining before the note should be turned off
+	NoteTimer() : channel(0), note(0), timeLeft(0) {}
 };
 
 
@@ -264,29 +264,29 @@ struct NoteTimer {
  */
 class MidiParser {
 protected:
-	uint16    _active_notes[128];   ///< Each uint16 is a bit mask for channels that have that note on.
-	NoteTimer _hanging_notes[32];   ///< Maintains expiration info for up to 32 notes.
+	uint16    _activeNotes[128];   ///< Each uint16 is a bit mask for channels that have that note on.
+	NoteTimer _hangingNotes[32];   ///< Maintains expiration info for up to 32 notes.
 	                                ///< Used for "Smart Jump" and MIDI formats that do not include explicit Note Off events.
-	byte      _hanging_notes_count; ///< Count of hanging notes, used to optimize expiration.
+	byte      _hangingNotesCount; ///< Count of hanging notes, used to optimize expiration.
 
 	MidiDriver_BASE *_driver;    ///< The device to which all events will be transmitted.
-	uint32 _timer_rate;     ///< The time in microseconds between onTimer() calls. Obtained from the MidiDriver.
+	uint32 _timerRate;     ///< The time in microseconds between onTimer() calls. Obtained from the MidiDriver.
 	uint32 _ppqn;           ///< Pulses Per Quarter Note. (We refer to "pulses" as "ticks".)
 	uint32 _tempo;          ///< Microseconds per quarter note.
-	uint32 _psec_per_tick;  ///< Microseconds per tick (_tempo / _ppqn).
+	uint32 _psecPerTick;  ///< Microseconds per tick (_tempo / _ppqn).
 	bool   _autoLoop;       ///< For lightweight clients that don't provide their own flow control.
 	bool   _smartJump;      ///< Support smart expiration of hanging notes when jumping
 	bool   _centerPitchWheelOnUnload;  ///< Center the pitch wheels when unloading a song
 	bool   _sendSustainOffOnNotesOff;   ///< Send a sustain off on a notes off event, stopping hanging notes
 	byte  *_tracks[120];    ///< Multi-track MIDI formats are supported, up to 120 tracks.
-	byte   _num_tracks;     ///< Count of total tracks for multi-track MIDI formats. 1 for single-track formats.
-	byte   _active_track;   ///< Keeps track of the currently active track, in multi-track formats.
+	byte   _numTracks;     ///< Count of total tracks for multi-track MIDI formats. 1 for single-track formats.
+	byte   _activeTrack;   ///< Keeps track of the currently active track, in multi-track formats.
 
 	Tracker _position;      ///< The current time/position in the active track.
-	EventInfo _next_event;  ///< The next event to transmit. Events are preparsed
+	EventInfo _nextEvent;  ///< The next event to transmit. Events are preparsed
 	                        ///< so each event is parsed only once; this permits
 	                        ///< simulated events in certain formats.
-	bool   _abort_parse;    ///< If a jump or other operation interrupts parsing, flag to abort.
+	bool   _abortParse;    ///< If a jump or other operation interrupts parsing, flag to abort.
 
 protected:
 	static uint32 readVLQ(byte * &data);
@@ -295,7 +295,7 @@ protected:
 	virtual void parseNextEvent(EventInfo &info) = 0;
 
 	void activeNote(byte channel, byte note, bool active);
-	void hangingNote(byte channel, byte note, uint32 ticks_left, bool recycle = true);
+	void hangingNote(byte channel, byte note, uint32 ticksLeft, bool recycle = true);
 	void hangAllActiveNotes();
 
 	virtual void sendToDriver(uint32 b);
@@ -377,18 +377,18 @@ public:
 	virtual void property(int prop, int value);
 
 	void setMidiDriver(MidiDriver_BASE *driver) { _driver = driver; }
-	void setTimerRate(uint32 rate) { _timer_rate = rate; }
+	void setTimerRate(uint32 rate) { _timerRate = rate; }
 	void setTempo(uint32 tempo);
 	void onTimer();
 
-	bool isPlaying() const { return (_position._play_pos != 0); }
+	bool isPlaying() const { return (_position._playPos != 0); }
 	void stopPlaying();
 
 	bool setTrack(int track);
 	bool jumpToTick(uint32 tick, bool fireEvents = false, bool stopNotes = true, bool dontSendNoteOn = false);
 
 	uint32 getPPQN() { return _ppqn; }
-	virtual uint32 getTick() { return _position._play_tick; }
+	virtual uint32 getTick() { return _position._playTick; }
 
 	static void defaultXMidiCallback(byte eventData, void *refCon);
 
diff --git a/audio/midiparser_smf.cpp b/audio/midiparser_smf.cpp
index e883471b54..4b0913cbfe 100644
--- a/audio/midiparser_smf.cpp
+++ b/audio/midiparser_smf.cpp
@@ -45,8 +45,8 @@ public:
 };
 
 
-static const byte command_lengths[8] = { 3, 3, 3, 3, 2, 2, 3, 0 };
-static const byte special_lengths[16] = { 0, 2, 3, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0 };
+static const byte commandLengths[8] = { 3, 3, 3, 3, 2, 2, 3, 0 };
+static const byte specialLengths[16] = { 0, 2, 3, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0 };
 
 MidiParser_SMF::~MidiParser_SMF() {
 	free(_buffer);
@@ -62,8 +62,8 @@ void MidiParser_SMF::property(int prop, int value) {
 }
 
 void MidiParser_SMF::parseNextEvent(EventInfo &info) {
-	info.start = _position._play_pos;
-	info.delta = readVLQ(_position._play_pos);
+	info.start = _position._playPos;
+	info.delta = readVLQ(_position._playPos);
 
 	// Process the next info. If mpMalformedPitchBends
 	// was set, we must skip over any pitch bend events
@@ -71,19 +71,19 @@ void MidiParser_SMF::parseNextEvent(EventInfo &info) {
 	// real pitch bend events, they're just two-byte
 	// prefixes before the real info.
 	do {
-		if ((_position._play_pos[0] & 0xF0) >= 0x80)
-			info.event = *(_position._play_pos++);
+		if ((_position._playPos[0] & 0xF0) >= 0x80)
+			info.event = *(_position._playPos++);
 		else
-			info.event = _position._running_status;
-	} while (_malformedPitchBends && (info.event & 0xF0) == 0xE0 && _position._play_pos++);
+			info.event = _position._runningStatus;
+	} while (_malformedPitchBends && (info.event & 0xF0) == 0xE0 && _position._playPos++);
 	if (info.event < 0x80)
 		return;
 
-	_position._running_status = info.event;
+	_position._runningStatus = info.event;
 	switch (info.command()) {
 	case 0x9: // Note On
-		info.basic.param1 = *(_position._play_pos++);
-		info.basic.param2 = *(_position._play_pos++);
+		info.basic.param1 = *(_position._playPos++);
+		info.basic.param2 = *(_position._playPos++);
 		if (info.basic.param2 == 0)
 			info.event = info.channel() | 0x80;
 		info.length = 0;
@@ -91,7 +91,7 @@ void MidiParser_SMF::parseNextEvent(EventInfo &info) {
 
 	case 0xC:
 	case 0xD:
-		info.basic.param1 = *(_position._play_pos++);
+		info.basic.param1 = *(_position._playPos++);
 		info.basic.param2 = 0;
 		break;
 
@@ -99,20 +99,20 @@ void MidiParser_SMF::parseNextEvent(EventInfo &info) {
 	case 0xA:
 	case 0xB:
 	case 0xE:
-		info.basic.param1 = *(_position._play_pos++);
-		info.basic.param2 = *(_position._play_pos++);
+		info.basic.param1 = *(_position._playPos++);
+		info.basic.param2 = *(_position._playPos++);
 		info.length = 0;
 		break;
 
 	case 0xF: // System Common, Meta or SysEx event
 		switch (info.event & 0x0F) {
 		case 0x2: // Song Position Pointer
-			info.basic.param1 = *(_position._play_pos++);
-			info.basic.param2 = *(_position._play_pos++);
+			info.basic.param1 = *(_position._playPos++);
+			info.basic.param2 = *(_position._playPos++);
 			break;
 
 		case 0x3: // Song Select
-			info.basic.param1 = *(_position._play_pos++);
+			info.basic.param1 = *(_position._playPos++);
 			info.basic.param2 = 0;
 			break;
 
@@ -126,16 +126,16 @@ void MidiParser_SMF::parseNextEvent(EventInfo &info) {
 			break;
 
 		case 0x0: // SysEx
-			info.length = readVLQ(_position._play_pos);
-			info.ext.data = _position._play_pos;
-			_position._play_pos += info.length;
+			info.length = readVLQ(_position._playPos);
+			info.ext.data = _position._playPos;
+			_position._playPos += info.length;
 			break;
 
 		case 0xF: // META event
-			info.ext.type = *(_position._play_pos++);
-			info.length = readVLQ(_position._play_pos);
-			info.ext.data = _position._play_pos;
-			_position._play_pos += info.length;
+			info.ext.type = *(_position._playPos++);
+			info.length = readVLQ(_position._playPos);
+			info.ext.data = _position._playPos;
+			_position._playPos += info.length;
 			break;
 
 		default:
@@ -146,8 +146,8 @@ void MidiParser_SMF::parseNextEvent(EventInfo &info) {
 
 bool MidiParser_SMF::loadMusic(byte *data, uint32 size) {
 	uint32 len;
-	byte midi_type;
-	uint32 total_size;
+	byte midiType;
+	uint32 totalSize;
 	bool isGMF;
 
 	unloadMusic();
@@ -171,10 +171,10 @@ bool MidiParser_SMF::loadMusic(byte *data, uint32 size) {
 		// Verify that this MIDI either is a Type 2
 		// or has only 1 track. We do not support
 		// multitrack Type 1 files.
-		_num_tracks = pos[2] << 8 | pos[3];
-		midi_type = pos[1];
-		if (midi_type > 2 /*|| (midi_type < 2 && _num_tracks > 1)*/) {
-			warning("No support for a Type %d MIDI with %d tracks", (int)midi_type, (int)_num_tracks);
+		_numTracks = pos[2] << 8 | pos[3];
+		midiType = pos[1];
+		if (midiType > 2 /*|| (midiType < 2 && _numTracks > 1)*/) {
+			warning("No support for a Type %d MIDI with %d tracks", (int)midiType, (int)_numTracks);
 			return false;
 		}
 		_ppqn = pos[4] << 8 | pos[5];
@@ -183,8 +183,8 @@ bool MidiParser_SMF::loadMusic(byte *data, uint32 size) {
 		// Older GMD/MUS file with no header info.
 		// Assume 1 track, 192 PPQN, and no MTrk headers.
 		isGMF = true;
-		midi_type = 0;
-		_num_tracks = 1;
+		midiType = 0;
+		_numTracks = 1;
 		_ppqn = 192;
 		pos += 7; // 'GMD\x1' + 3 bytes of useless (translate: unknown) information
 	} else {
@@ -193,14 +193,14 @@ bool MidiParser_SMF::loadMusic(byte *data, uint32 size) {
 	}
 
 	// Now we identify and store the location for each track.
-	if (_num_tracks > ARRAYSIZE(_tracks)) {
-		warning("Can only handle %d tracks but was handed %d", (int)ARRAYSIZE(_tracks), (int)_num_tracks);
+	if (_numTracks > ARRAYSIZE(_tracks)) {
+		warning("Can only handle %d tracks but was handed %d", (int)ARRAYSIZE(_tracks), (int)_numTracks);
 		return false;
 	}
 
-	total_size = 0;
-	int tracks_read = 0;
-	while (tracks_read < _num_tracks) {
+	totalSize = 0;
+	int tracksRead = 0;
+	while (tracksRead < _numTracks) {
 		if (memcmp(pos, "MTrk", 4) && !isGMF) {
 			warning("Position: %p ('%c')", pos, *pos);
 			warning("Hit invalid block '%c%c%c%c' while scanning for track locations", pos[0], pos[1], pos[2], pos[3]);
@@ -208,11 +208,11 @@ bool MidiParser_SMF::loadMusic(byte *data, uint32 size) {
 		}
 
 		// If needed, skip the MTrk and length bytes
-		_tracks[tracks_read] = pos + (isGMF ? 0 : 8);
+		_tracks[tracksRead] = pos + (isGMF ? 0 : 8);
 		if (!isGMF) {
 			pos += 4;
 			len = read4high(pos);
-			total_size += len;
+			totalSize += len;
 			pos += len;
 		} else {
 			// An SMF End of Track meta event must be placed
@@ -222,7 +222,7 @@ bool MidiParser_SMF::loadMusic(byte *data, uint32 size) {
 			data[size++] = 0x00;
 			data[size++] = 0x00;
 		}
-		++tracks_read;
+		++tracksRead;
 	}
 
 	// If this is a Type 1 MIDI, we need to now compress
@@ -230,13 +230,13 @@ bool MidiParser_SMF::loadMusic(byte *data, uint32 size) {
 	free(_buffer);
 	_buffer = 0;
 
-	if (midi_type == 1) {
+	if (midiType == 1) {
 		// FIXME: Doubled the buffer size to prevent crashes with the
 		// Inherit the Earth MIDIs. Jamieson630 said something about a
 		// better fix, but this will have to do in the meantime.
 		_buffer = (byte *)malloc(size * 2);
 		compressToType0();
-		_num_tracks = 1;
+		_numTracks = 1;
 		_tracks[0] = _buffer;
 	}
 
@@ -253,48 +253,48 @@ void MidiParser_SMF::compressToType0() {
 	// We assume that _buffer has been allocated
 	// to sufficient size for this operation.
 
-	// using 0xFF since it could write track_pos[0 to _num_tracks] here
+	// using 0xFF since it could write trackPos[0 to _numTracks] here
 	// this would cause some illegal writes and could lead to segfaults
 	// (it crashed for some midis for me, they're not used in any game
 	// scummvm supports though). *Maybe* handle this in another way,
 	// it's at the moment only to be sure, that nothing goes wrong.
-	byte *track_pos[0xFF];
-	byte running_status[0xFF];
-	uint32 track_timer[0xFF];
+	byte *trackPos[0xFF];
+	byte runningStatus[0xFF];
+	uint32 trackTimer[0xFF];
 	uint32 delta;
 	int i;
 
-	for (i = 0; i < _num_tracks; ++i) {
-		running_status[i] = 0;
-		track_pos[i] = _tracks[i];
-		track_timer[i] = readVLQ(track_pos[i]);
-		running_status[i] = 0;
+	for (i = 0; i < _numTracks; ++i) {
+		runningStatus[i] = 0;
+		trackPos[i] = _tracks[i];
+		trackTimer[i] = readVLQ(trackPos[i]);
+		runningStatus[i] = 0;
 	}
 
-	int best_i;
+	int bestTrack;
 	uint32 length;
 	byte *output = _buffer;
 	byte *pos, *pos2;
 	byte event;
-	uint32 copy_bytes;
+	uint32 copyBytes;
 	bool write;
-	byte active_tracks = (byte)_num_tracks;
+	byte activeTracks = (byte)_numTracks;
 
-	while (active_tracks) {
+	while (activeTracks) {
 		write = true;
-		best_i = 255;
-		for (i = 0; i < _num_tracks; ++i) {
-			if (track_pos[i] && (best_i == 255 || track_timer[i] < track_timer[best_i]))
-				best_i = i;
+		bestTrack = 255;
+		for (i = 0; i < _numTracks; ++i) {
+			if (trackPos[i] && (bestTrack == 255 || trackTimer[i] < trackTimer[bestTrack]))
+				bestTrack = i;
 		}
-		if (best_i == 255) {
+		if (bestTrack == 255) {
 			warning("Premature end of tracks");
 			break;
 		}
 
 		// Initial VLQ delta computation
 		delta = 0;
-		length = track_timer[best_i];
+		length = trackTimer[bestTrack];
 		for (i = 0; length; ++i) {
 			delta = (delta << 8) | (length & 0x7F) | (i ? 0x80 : 0);
 			length >>= 7;
@@ -302,55 +302,55 @@ void MidiParser_SMF::compressToType0() {
 
 		// Process MIDI event.
 		bool implicitEvent = false;
-		copy_bytes = 0;
-		pos = track_pos[best_i];
+		copyBytes = 0;
+		pos = trackPos[bestTrack];
 		do {
 			event = *(pos++);
 			if (event < 0x80) {
-				event = running_status[best_i];
+				event = runningStatus[bestTrack];
 				implicitEvent = true;
 			}
 		} while (_malformedPitchBends && (event & 0xF0) == 0xE0 && pos++);
-		running_status[best_i] = event;
+		runningStatus[bestTrack] = event;
 
-		if (command_lengths[(event >> 4) - 8] > 0) {
-			copy_bytes = command_lengths[(event >> 4) - 8];
-		} else if (special_lengths[(event & 0x0F)] > 0) {
-			copy_bytes = special_lengths[(event & 0x0F)];
+		if (commandLengths[(event >> 4) - 8] > 0) {
+			copyBytes = commandLengths[(event >> 4) - 8];
+		} else if (specialLengths[(event & 0x0F)] > 0) {
+			copyBytes = specialLengths[(event & 0x0F)];
 		} else if (event == 0xF0) {
 			// SysEx
 			pos2 = pos;
 			length = readVLQ(pos);
-			copy_bytes = 1 + (pos - pos2) + length;
+			copyBytes = 1 + (pos - pos2) + length;
 		} else if (event == 0xFF) {
 			// META
 			event = *(pos++);
-			if (event == 0x2F && active_tracks > 1) {
-				track_pos[best_i] = 0;
+			if (event == 0x2F && activeTracks > 1) {
+				trackPos[bestTrack] = 0;
 				write = false;
 			} else {
 				pos2 = pos;
 				length = readVLQ(pos);
-				copy_bytes = 2 + (pos - pos2) + length;
+				copyBytes = 2 + (pos - pos2) + length;
 			}
 			if (event == 0x2F)
-				--active_tracks;
+				--activeTracks;
 		} else {
 			warning("Bad MIDI command %02X", (int)event);
-			track_pos[best_i] = 0;
+			trackPos[bestTrack] = 0;
 		}
 
 		// Update all tracks' deltas
 		if (write) {
-			for (i = 0; i < _num_tracks; ++i) {
-				if (track_pos[i] && i != best_i)
-					track_timer[i] -= track_timer[best_i];
+			for (i = 0; i < _numTracks; ++i) {
+				if (trackPos[i] && i != bestTrack)
+					trackTimer[i] -= trackTimer[bestTrack];
 			}
 		}
 
-		if (track_pos[best_i]) {
+		if (trackPos[bestTrack]) {
 			if (write) {
-				track_timer[best_i] = 0;
+				trackTimer[bestTrack] = 0;
 
 				// Write VLQ delta
 				while (delta & 0x80) {
@@ -361,17 +361,17 @@ void MidiParser_SMF::compressToType0() {
 
 				// Write MIDI data
 				if (!implicitEvent)
-					++track_pos[best_i];
-				--copy_bytes;
-				*output++ = running_status[best_i];
-				memcpy(output, track_pos[best_i], copy_bytes);
-				output += copy_bytes;
+					++trackPos[bestTrack];
+				--copyBytes;
+				*output++ = runningStatus[bestTrack];
+				memcpy(output, trackPos[bestTrack], copyBytes);
+				output += copyBytes;
 			}
 
 			// Fetch new VLQ delta for winning track
-			track_pos[best_i] += copy_bytes;
-			if (active_tracks)
-				track_timer[best_i] += readVLQ(track_pos[best_i]);
+			trackPos[bestTrack] += copyBytes;
+			if (activeTracks)
+				trackTimer[bestTrack] += readVLQ(trackPos[bestTrack]);
 		}
 	}
 
diff --git a/audio/midiparser_xmidi.cpp b/audio/midiparser_xmidi.cpp
index 85491faaf8..11690b0214 100644
--- a/audio/midiparser_xmidi.cpp
+++ b/audio/midiparser_xmidi.cpp
@@ -32,9 +32,6 @@
  */
 class MidiParser_XMIDI : public MidiParser {
 protected:
-	NoteTimer _notes_cache[32];
-	uint32 _inserted_delta; // Track simulated deltas for note-off events
-
 	struct Loop {
 		byte *pos;
 		byte repeat;
@@ -48,11 +45,10 @@ protected:
 
 protected:
 	uint32 readVLQ2(byte * &data);
-	void resetTracking();
 	void parseNextEvent(EventInfo &info);
 
 public:
-	MidiParser_XMIDI(XMidiCallbackProc proc, void *data) : _inserted_delta(0), _callbackProc(proc), _callbackData(data) {}
+	MidiParser_XMIDI(XMidiCallbackProc proc, void *data) : _callbackProc(proc), _callbackData(data) {}
 	~MidiParser_XMIDI() { }
 
 	bool loadMusic(byte *data, uint32 size);
@@ -69,17 +65,16 @@ uint32 MidiParser_XMIDI::readVLQ2(byte * &pos) {
 }
 
 void MidiParser_XMIDI::parseNextEvent(EventInfo &info) {
-	info.start = _position._play_pos;
-	info.delta = readVLQ2(_position._play_pos) - _inserted_delta;
+	info.start = _position._playPos;
+	info.delta = readVLQ2(_position._playPos);
 
 	// Process the next event.
-	_inserted_delta = 0;
-	info.event = *(_position._play_pos++);
+	info.event = *(_position._playPos++);
 	switch (info.event >> 4) {
 	case 0x9: // Note On
-		info.basic.param1 = *(_position._play_pos++);
-		info.basic.param2 = *(_position._play_pos++);
-		info.length = readVLQ(_position._play_pos);
+		info.basic.param1 = *(_position._playPos++);
+		info.basic.param2 = *(_position._playPos++);
+		info.length = readVLQ(_position._playPos);
 		if (info.basic.param2 == 0) {
 			info.event = info.channel() | 0x80;
 			info.length = 0;
@@ -88,20 +83,20 @@ void MidiParser_XMIDI::parseNextEvent(EventInfo &info) {
 
 	case 0xC:
 	case 0xD:
-		info.basic.param1 = *(_position._play_pos++);
+		info.basic.param1 = *(_position._playPos++);
 		info.basic.param2 = 0;
 		break;
 
 	case 0x8:
 	case 0xA:
 	case 0xE:
-		info.basic.param1 = *(_position._play_pos++);
-		info.basic.param2 = *(_position._play_pos++);
+		info.basic.param1 = *(_position._playPos++);
+		info.basic.param2 = *(_position._playPos++);
 		break;
 
 	case 0xB:
-		info.basic.param1 = *(_position._play_pos++);
-		info.basic.param2 = *(_position._play_pos++);
+		info.basic.param1 = *(_position._playPos++);
+		info.basic.param2 = *(_position._playPos++);
 
 		// This isn't a full XMIDI implementation, but it should
 		// hopefully be "good enough" for most things.
@@ -109,7 +104,7 @@ void MidiParser_XMIDI::parseNextEvent(EventInfo &info) {
 		switch (info.basic.param1) {
 		// Simplified XMIDI looping.
 		case 0x74: {	// XMIDI_CONTROLLER_FOR_LOOP
-				byte *pos = _position._play_pos;
+				byte *pos = _position._playPos;
 				if (_loopCount < ARRAYSIZE(_loop) - 1)
 					_loopCount++;
 				else
@@ -131,9 +126,9 @@ void MidiParser_XMIDI::parseNextEvent(EventInfo &info) {
 						if (--_loop[_loopCount].repeat == 0)
 							_loopCount--;
 						else
-							_position._play_pos = _loop[_loopCount].pos;
+							_position._playPos = _loop[_loopCount].pos;
 					} else {
-						_position._play_pos = _loop[_loopCount].pos;
+						_position._playPos = _loop[_loopCount].pos;
 					}
 				}
 			}
@@ -169,12 +164,12 @@ void MidiParser_XMIDI::parseNextEvent(EventInfo &info) {
 	case 0xF: // Meta or SysEx event
 		switch (info.event & 0x0F) {
 		case 0x2: // Song Position Pointer
-			info.basic.param1 = *(_position._play_pos++);
-			info.basic.param2 = *(_position._play_pos++);
+			info.basic.param1 = *(_position._playPos++);
+			info.basic.param2 = *(_position._playPos++);
 			break;
 
 		case 0x3: // Song Select
-			info.basic.param1 = *(_position._play_pos++);
+			info.basic.param1 = *(_position._playPos++);
 			info.basic.param2 = 0;
 			break;
 
@@ -188,16 +183,16 @@ void MidiParser_XMIDI::parseNextEvent(EventInfo &info) {
 			break;
 
 		case 0x0: // SysEx
-			info.length = readVLQ(_position._play_pos);
-			info.ext.data = _position._play_pos;
-			_position._play_pos += info.length;
+			info.length = readVLQ(_position._playPos);
+			info.ext.data = _position._playPos;
+			_position._playPos += info.length;
 			break;
 
 		case 0xF: // META event
-			info.ext.type = *(_position._play_pos++);
-			info.length = readVLQ(_position._play_pos);
-			info.ext.data = _position._play_pos;
-			_position._play_pos += info.length;
+			info.ext.type = *(_position._playPos++);
+			info.length = readVLQ(_position._playPos);
+			info.ext.data = _position._playPos;
+			_position._playPos += info.length;
 			if (info.ext.type == 0x51 && info.length == 3) {
 				// Tempo event. We want to make these constant 500,000.
 				info.ext.data[0] = 0x07;
@@ -216,7 +211,7 @@ bool MidiParser_XMIDI::loadMusic(byte *data, uint32 size) {
 	uint32 i = 0;
 	byte *start;
 	uint32 len;
-	uint32 chunk_len;
+	uint32 chunkLen;
 	char buf[32];
 
 	_loopCount = -1;
@@ -235,7 +230,7 @@ bool MidiParser_XMIDI::loadMusic(byte *data, uint32 size) {
 		if (!memcmp(pos, "XMID", 4)) {
 			warning("XMIDI doesn't have XDIR");
 			pos += 4;
-			_num_tracks = 1;
+			_numTracks = 1;
 		} else if (memcmp(pos, "XDIR", 4)) {
 			// Not an XMIDI that we recognize
 			warning("Expected 'XDIR' but found '%c%c%c%c'", pos[0], pos[1], pos[2], pos[3]);
@@ -243,7 +238,7 @@ bool MidiParser_XMIDI::loadMusic(byte *data, uint32 size) {
 		} else {
 			// Seems Valid
 			pos += 4;
-			_num_tracks = 0;
+			_numTracks = 0;
 
 			for (i = 4; i < len; i++) {
 				// Read 4 bytes of type
@@ -251,34 +246,34 @@ bool MidiParser_XMIDI::loadMusic(byte *data, uint32 size) {
 				pos += 4;
 
 				// Read length of chunk
-				chunk_len = read4high(pos);
+				chunkLen = read4high(pos);
 
 				// Add eight bytes
 				i += 8;
 
 				if (memcmp(buf, "INFO", 4) == 0) {
 					// Must be at least 2 bytes long
-					if (chunk_len < 2) {
-						warning("Invalid chunk length %d for 'INFO' block", (int)chunk_len);
+					if (chunkLen < 2) {
+						warning("Invalid chunk length %d for 'INFO' block", (int)chunkLen);
 						return false;
 					}
 
-					_num_tracks = (byte)read2low(pos);
+					_numTracks = (byte)read2low(pos);
 
-					if (chunk_len > 2) {
-						warning("Chunk length %d is greater than 2", (int)chunk_len);
-						//pos += chunk_len - 2;
+					if (chunkLen > 2) {
+						warning("Chunk length %d is greater than 2", (int)chunkLen);
+						//pos += chunkLen - 2;
 					}
 					break;
 				}
 
 				// Must align
-				pos += (chunk_len + 1) & ~1;
-				i += (chunk_len + 1) & ~1;
+				pos += (chunkLen + 1) & ~1;
+				i += (chunkLen + 1) & ~1;
 			}
 
 			// Didn't get to fill the header
-			if (_num_tracks == 0) {
+			if (_numTracks == 0) {
 				warning("Didn't find a valid track count");
 				return false;
 			}
@@ -308,13 +303,13 @@ bool MidiParser_XMIDI::loadMusic(byte *data, uint32 size) {
 
 		// Ok it's an XMIDI.
 		// We're going to identify and store the location for each track.
-		if (_num_tracks > ARRAYSIZE(_tracks)) {
-			warning("Can only handle %d tracks but was handed %d", (int)ARRAYSIZE(_tracks), (int)_num_tracks);
+		if (_numTracks > ARRAYSIZE(_tracks)) {
+			warning("Can only handle %d tracks but was handed %d", (int)ARRAYSIZE(_tracks), (int)_numTracks);
 			return false;
 		}
 
-		int tracks_read = 0;
-		while (tracks_read < _num_tracks) {
+		int tracksRead = 0;
+		while (tracksRead < _numTracks) {
 			if (!memcmp(pos, "FORM", 4)) {
 				// Skip this plus the 4 bytes after it.
 				pos += 8;
@@ -330,11 +325,11 @@ bool MidiParser_XMIDI::loadMusic(byte *data, uint32 size) {
 				pos += (len + 1) & ~1;
 			} else if (!memcmp(pos, "EVNT", 4)) {
 				// Ahh! What we're looking for at last.
-				_tracks[tracks_read] = pos + 8; // Skip the EVNT and length bytes
+				_tracks[tracksRead] = pos + 8; // Skip the EVNT and length bytes
 				pos += 4;
 				len = read4high(pos);
 				pos += (len + 1) & ~1;
-				++tracks_read;
+				++tracksRead;
 			} else {
 				warning("Hit invalid block '%c%c%c%c' while scanning for track locations", pos[0], pos[1], pos[2], pos[3]);
 				return false;
@@ -349,7 +344,6 @@ bool MidiParser_XMIDI::loadMusic(byte *data, uint32 size) {
 		_ppqn = 60;
 		resetTracking();
 		setTempo(500000);
-		_inserted_delta = 0;
 		setTrack(0);
 		return true;
 	}
@@ -357,11 +351,6 @@ bool MidiParser_XMIDI::loadMusic(byte *data, uint32 size) {
 	return false;
 }
 
-void MidiParser_XMIDI::resetTracking() {
-	MidiParser::resetTracking();
-	_inserted_delta = 0;
-}
-
 void MidiParser::defaultXMidiCallback(byte eventData, void *data) {
 	warning("MidiParser: defaultXMidiCallback(%d)", eventData);
 }
diff --git a/audio/softsynth/mt32/TVA.cpp b/audio/softsynth/mt32/TVA.cpp
index c3be6db591..f3e3f7bbc7 100644
--- a/audio/softsynth/mt32/TVA.cpp
+++ b/audio/softsynth/mt32/TVA.cpp
@@ -274,7 +274,7 @@ void TVA::nextPhase() {
 	}
 
 	int newTarget;
-	int newIncrement;
+	int newIncrement = 0;
 	int envPointIndex = phase;
 
 	if (!allLevelsZeroFromNowOn) {
diff --git a/backends/platform/maemo/debian/rules b/backends/platform/maemo/debian/rules
index 43a34399a3..c713403876 100755
--- a/backends/platform/maemo/debian/rules
+++ b/backends/platform/maemo/debian/rules
@@ -47,7 +47,7 @@ install: build
 	install -m0644 gui/themes/scummclassic.zip  gui/themes/scummmodern.zip debian/scummvm/opt/scummvm/share
 	install -m0644 backends/vkeybd/packs/vkeybd_default.zip debian/scummvm/opt/scummvm/share
 # for optified version we can also add engine datafiles
-	install -m0644 dists/engine-data/drascula.dat dists/engine-data/hugo.dat dists/engine-data/kyra.dat dists/engine-data/lure.dat dists/engine-data/queen.tbl dists/engine-data/sky.cpt dists/engine-data/teenagent.dat dists/engine-data/toon.dat debian/scummvm/opt/scummvm/share
+	install -m0644 dists/engine-data/drascula.dat dists/engine-data/hugo.dat dists/engine-data/kyra.dat dists/engine-data/lure.dat dists/engine-data/queen.tbl dists/engine-data/sky.cpt dists/engine-data/teenagent.dat dists/engine-data/tony.dat dists/engine-data/toon.dat debian/scummvm/opt/scummvm/share
 
 	install -m0644 -d debian/scummvm/usr/share/doc/scummvm
 	install -m0644 AUTHORS COPYING COPYING.BSD COPYING.FREEFONT COPYING.LGPL COPYRIGHT NEWS README debian/scummvm/usr/share/doc/scummvm
diff --git a/configure b/configure
index df2c2107c8..008593927f 100755
--- a/configure
+++ b/configure
@@ -72,9 +72,11 @@ add_engine() {
 	set_var _engine_${1}_build "${3}"
 	set_var _engine_${1}_build_default "${3}"
 	set_var _engine_${1}_subengines "${4}"
-	set_var _engine_${1}_deps "${5}"
+	set_var _engine_${1}_base "${5}"
+	set_var _engine_${1}_deps "${6}"
 	for sub in ${4}; do
 		set_var _engine_${sub}_sub "yes"
+		set_var _engine_${sub}_parent "${1}"
 	done
 }
 
@@ -94,7 +96,7 @@ _srcdir=`dirname $0`
 #
 # Default settings
 #
-# Default lib behaviour yes/no/auto
+# Default lib behavior yes/no/auto
 _vorbis=auto
 _tremor=auto
 _tremolo=no
@@ -117,7 +119,7 @@ _freetype2=auto
 _taskbar=yes
 _updates=no
 _libunity=auto
-# Default option behaviour yes/no
+# Default option behavior yes/no
 _debug_build=auto
 _release_build=auto
 _optimizations=auto
@@ -509,6 +511,11 @@ get_engine_dependencies() {
 	get_var _engine_$1_deps
 }
 
+# Get the base engine game support description
+get_engine_base() {
+	get_var _engine_$1_base
+}
+
 # Ask if this is a subengine
 get_engine_sub() {
 	sub=`get_var _engine_$1_sub`
@@ -518,6 +525,11 @@ get_engine_sub() {
 	echo $sub
 }
 
+# Get a subengine's parent (undefined for non-subengines)
+get_subengine_parent() {
+	get_var _engine_$1_parent
+}
+
 # Enable *all* engines
 engine_enable_all() {
 	for engine in $_engines; do
@@ -545,9 +557,15 @@ engine_enable() {
 	engine=`echo $eng | sed 's/-/_/g'`
 
 	# Filter the parameter for the subengines
-	if test "`get_engine_sub ${engine}`" != "no" -a "$opt" != "yes" ; then
-		subengine_option_error ${engine}
-		return
+	if test "`get_engine_sub ${engine}`" != "no" ; then
+		if test "$opt" != "yes" ; then
+			subengine_option_error ${engine}
+			return
+		fi
+		parent=`get_subengine_parent ${engine}`
+		if test `get_engine_build ${parent}` = "no" ; then
+			set_var _engine_${parent}_build "yes"
+		fi		
 	fi
 
 	if test "$opt" = "static" -o "$opt" = "dynamic" -o "$opt" = "yes" ; then
@@ -583,7 +601,7 @@ check_engine_deps() {
 	unmet_deps=""
 
 	# Check whether the engine is enabled
-	if test `get_engine_build $1` = yes ; then
+	if test `get_engine_build $1` != "no" ; then
 		# Collect unmet dependencies
 		for dep in `get_engine_dependencies $1`; do
 			if test `get_feature_state $dep` = "no"; then
@@ -642,27 +660,37 @@ prepare_engine_build_strings() {
 
 # Get the string about building an engine
 get_engine_build_string() {
+	engine=$1
+	request_status=$2
 	engine_string=""
 	engine_build=`get_engine_build $1`
-	engine_build_default=`get_engine_build_default $1`
+	engine_build_default=`get_engine_build_default $engine`
 	show=no
 
+	# Convert static/dynamic to yes to ease the check of subengines
+	if test $engine_build = no; then
+		subengine_filter=no
+	else
+		subengine_filter=yes
+	fi
+
 	# Check if the current engine should be shown for the current status
-	if test $engine_build = $2 ; then
+	if test $engine_build = $request_status ; then
 		show=yes
 	else
 		# Test for disabled sub-engines
-		if test $2 = no ; then
-			for subeng in `get_engine_subengines $1` ; do
+		if test $request_status = no ; then
+			for subeng in `get_engine_subengines $engine` ; do
 				if test `get_engine_build $subeng` = no ; then
-					engine_build=no
+					# In this case we to display _disabled_ subengines
+					subengine_filter=no
 					show=yes
 				fi
 			done
 		fi
 		# Test for enabled wip sub-engines
-		if test $2 = wip ; then
-			for subeng in `get_engine_subengines $1` ; do
+		if test $request_status = wip ; then
+			for subeng in `get_engine_subengines $engine` ; do
 				if test `get_engine_build $subeng` != no -a `get_engine_build_default $subeng` = no ; then
 					show=yes
 				fi
@@ -670,85 +698,82 @@ get_engine_build_string() {
 		fi
 	fi
 
-	# Convert static/dynamic to yes to ease the check of subengines
-	if test $engine_build != no ; then
-		engine_build=yes
-	fi
 
 	# Check if it is a wip engine
-	if test "$2" = "wip" -a "$engine_build" != "no" -a  "$engine_build_default" = no; then
+	if test "$request_status" = "wip" -a "$engine_build" != "no" -a  "$engine_build_default" = no; then
 		show=yes
 	fi
 
 	# The engine should be shown, build the string
 	if test $show = yes ; then
-		build_string_func=get_${1}_build_string
-		if ( type $build_string_func | grep function ) 2> /dev/null > /dev/null ; then
-			engine_string=`$build_string_func $1 $engine_build $2`
-		else
-			engine_string=`get_subengines_build_string $1 $engine_build "" $2`
-		fi
-
-		engine_string="`get_engine_name $1` $engine_string"
+		engine_string=`get_subengines_build_string $engine $subengine_filter $request_status`
+		engine_string="`get_engine_name $engine` $engine_string"
 	fi
 
-	echo $engine_string
+	echo "$engine_string"
 }
 
 # Get the string about building subengines
 get_subengines_build_string() {
-	all=yes
 	parent_engine=$1
-	subengine_string=$3
-	parent_status=$4
+	subengine_filter=$2
+	request_status=$3
 	parent_engine_build_default=`get_engine_build_default $parent_engine`
+	subengine_string=""
 
-	for subeng in `get_engine_subengines $parent_engine` ; do
-		subengine_build=`get_engine_build $subeng`
-		subengine_build_default=`get_engine_build_default $subeng`
-		if test \( $subengine_build = $2 -a "$parent_status" != wip \) -o \( "$parent_status" = wip -a $subengine_build != no -a "$subengine_build_default" = no \) ; then
-			subengine_string="$subengine_string [`get_engine_name $subeng`]"
-		else
-			all=no
-		fi
+	# If the base engine isn't built at all, no need to list subengines
+	# in any of the possible categories.
+	if test `get_engine_build $parent_engine` = no; then
+		return
+	fi
 
-		# handle engines that are on by default and have a single subengine that is off by default
-		if test "$parent_status" = wip ; then
-			if test $parent_engine_build_default = yes -a subengine ; then
-				all=no
-			fi
+	all=yes
+	# If there are no subengines, never display "[all games]" (for brevity).
+	if test -z "`get_engine_subengines $parent_engine`"; then
+		all=no
+	fi
+	# If the base engine does not fit the category we're displaying here
+	# (WIP or Skipped), we should never show "[all games]"
+	if test "$request_status" = wip; then
+		if test $parent_engine_build_default = yes; then
+			all=no
 		fi
+	fi
+	if test "$request_status" = no; then
+		# If we're here, the parent engine is built, so no need to check that.
+		all=no
+	fi
 
-	done
 
-	if test $2 != no ; then
-		if test -n "$subengine_string" ; then
-			if test $all = yes ; then
-				subengine_string="[all games]"
-			fi
-		fi
+	# In the static/dynamic categories, also display the engine's base games.
+	if test -n "`get_engine_subengines $parent_engine`" -a $request_status != no -a $request_status != wip; then
+		subengine_string="[`get_engine_base $parent_engine`]"
 	fi
 
-	echo $subengine_string
-}
+	for subeng in `get_engine_subengines $parent_engine` ; do
+		subengine_build=`get_engine_build $subeng`
+		subengine_build_default=`get_engine_build_default $subeng`
 
-# Engine specific build strings
-get_scumm_build_string() {
-	if test `get_engine_build $1` != no ; then
-		if test $2 != no -a "$3" != wip ; then
-			base="[v0-v6 games]"
+		# Display this subengine if it matches the filter, unless it is
+		# a stable subengine in the WIP request.
+		if test $subengine_build = $subengine_filter -a \! \( "$request_status" = wip -a "$subengine_build_default" = yes \) ; then
+			s="[`get_engine_name $subeng`]"
+			if test -n "$subengine_string"; then
+				subengine_string="$subengine_string $s"
+			else
+				subengine_string="$s"
+			fi
+		else
+			all=no
 		fi
-		get_subengines_build_string $1 $2 "$base" $3
-	fi
-}
+	done
 
-get_saga_build_string() {
-	if test `get_engine_build $1` != no ; then
-		if test $2 != no -a "$3" != wip; then
-			base="[ITE]"
-		fi
-		get_subengines_build_string $1 $2 "$base" $3
+	# Summarize the full list, where applicable
+	if test $all = yes ; then
+		subengine_string="[all games]"
 	fi
+
+	echo "$subengine_string"
 }
 
 #
@@ -4004,28 +4029,28 @@ fi
 echo
 if test -n "$_engines_built_static" ; then
 	echo "Engines (builtin):"
-	echo $_engines_built_static | sed 's/@/\
+	echo "$_engines_built_static" | sed 's/@/\
 /g
 s/#/    /g'
 fi
 
 if test -n "$_engines_built_dynamic" ; then
 	echo "Engines (plugins):"
-	echo $_engines_built_dynamic | sed 's/@/\
+	echo "$_engines_built_dynamic" | sed 's/@/\
 /g
 s/#/    /g'
 fi
 
 if test -n "$_engines_skipped" ; then
 	echo "Engines Skipped:"
-	echo $_engines_skipped | sed 's/@/\
+	echo "$_engines_skipped" | sed 's/@/\
 /g
 s/#/    /g'
 fi
 
 if test -n "$_engines_built_wip" ; then
 	echo "WARNING: This ScummVM build contains the following UNSTABLE engines:"
-	echo $_engines_built_wip | sed 's/@/\
+	echo "$_engines_built_wip" | sed 's/@/\
 /g
 s/#/    /g'
 fi
diff --git a/devtools/create_project/config.h b/devtools/create_project/config.h
index 20c1391cef..de4703a47d 100644
--- a/devtools/create_project/config.h
+++ b/devtools/create_project/config.h
@@ -28,7 +28,10 @@
 #define LIBS_DEFINE "SCUMMVM_LIBS"       // Name of the include environment variable
 #define REVISION_DEFINE "SCUMMVM_INTERNAL_REVISION"
 
-//#define ADDITIONAL_LIBRARY ""
-#define NEEDS_RTTI 0
+#define ENABLE_LANGUAGE_EXTENSIONS ""    // Comma separated list of projects that need language extensions
+#define DISABLE_EDIT_AND_CONTINUE "tinsel,tony"     // Comma separated list of projects that need Edit&Continue to be disabled for co-routine support (the main project is automatically added)
+
+//#define ADDITIONAL_LIBRARY ""            // Add a single library to the list of externally linked libraries
+#define NEEDS_RTTI 0                     // Enable RTTI globally
 
 #endif // TOOLS_CREATE_PROJECT_CONFIG_H
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 8499fec400..a8e09ff5eb 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -97,30 +97,6 @@ struct FSNode {
 };
 
 typedef std::list<FSNode> FileList;
-
-typedef StringList TokenList;
-
-/**
- * Takes a given input line and creates a list of tokens out of it.
- *
- * A token in this context is separated by whitespaces. A special case
- * are quotation marks though. A string inside quotation marks is treated
- * as single token, even when it contains whitespaces.
- *
- * Thus for example the input:
- * foo bar "1 2 3 4" ScummVM
- * will create a list with the following entries:
- * "foo", "bar", "1 2 3 4", "ScummVM"
- * As you can see the quotation marks will get *removed* too.
- *
- * You can also use this with non-whitespace by passing another separator
- * character (e.g. ',').
- *
- * @param input The text to be tokenized.
- * @param separator The token separator.
- * @return A list of tokens.
- */
-TokenList tokenize(const std::string &input, char separator = ' ');
 } // End of anonymous namespace
 
 enum ProjectType {
@@ -526,7 +502,7 @@ int main(int argc, char *argv[]) {
 		projectWarnings["agos"].push_back("4511");
 
 		projectWarnings["dreamweb"].push_back("4355");
-		
+
 		projectWarnings["lure"].push_back("4189");
 		projectWarnings["lure"].push_back("4355");
 
@@ -787,6 +763,7 @@ bool parseEngine(const std::string &line, EngineDesc &engine) {
 
 	return true;
 }
+} // End of anonymous namespace
 
 TokenList tokenize(const std::string &input, char separator) {
 	TokenList result;
@@ -819,7 +796,6 @@ TokenList tokenize(const std::string &input, char separator) {
 
 	return result;
 }
-} // End of anonymous namespace
 
 namespace {
 const Feature s_features[] = {
diff --git a/devtools/create_project/create_project.h b/devtools/create_project/create_project.h
index b4eda8f8d2..de77793ee7 100644
--- a/devtools/create_project/create_project.h
+++ b/devtools/create_project/create_project.h
@@ -31,6 +31,30 @@
 
 typedef std::list<std::string> StringList;
 
+typedef StringList TokenList;
+
+/**
+ * Takes a given input line and creates a list of tokens out of it.
+ *
+ * A token in this context is separated by whitespaces. A special case
+ * are quotation marks though. A string inside quotation marks is treated
+ * as single token, even when it contains whitespaces.
+ *
+ * Thus for example the input:
+ * foo bar "1 2 3 4" ScummVM
+ * will create a list with the following entries:
+ * "foo", "bar", "1 2 3 4", "ScummVM"
+ * As you can see the quotation marks will get *removed* too.
+ *
+ * You can also use this with non-whitespace by passing another separator
+ * character (e.g. ',').
+ *
+ * @param input The text to be tokenized.
+ * @param separator The token separator.
+ * @return A list of tokens.
+ */
+TokenList tokenize(const std::string &input, char separator = ' ');
+
 /**
  * Structure to describe a game engine to be built into ScummVM.
  *
diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp
index c797770955..0f77d91852 100644
--- a/devtools/create_project/msbuild.cpp
+++ b/devtools/create_project/msbuild.cpp
@@ -241,9 +241,11 @@ void MSBuildProvider::outputProjectSettings(std::ofstream &project, const std::s
 
 	// Check for project-specific warnings:
 	std::map<std::string, StringList>::iterator warningsIterator = _projectWarnings.find(name);
+	bool enableLanguageExtensions = find(_enableLanguageExtensions.begin(), _enableLanguageExtensions.end(), name) != _enableLanguageExtensions.end();
+	bool disableEditAndContinue = find(_disableEditAndContinue.begin(), _disableEditAndContinue.end(), name) != _disableEditAndContinue.end();
 
 	// Nothing to add here, move along!
-	if (!setup.devTools && name != setup.projectName && name != "sword25" && name != "scummvm" && name != "grim" && warningsIterator == _projectWarnings.end())
+	if (!setup.devTools && name != setup.projectName && !enableLanguageExtensions && !disableEditAndContinue && warningsIterator == _projectWarnings.end())
 		return;
 
 	std::string warnings = "";
@@ -254,16 +256,17 @@ void MSBuildProvider::outputProjectSettings(std::ofstream &project, const std::s
 	project << "\t<ItemDefinitionGroup Condition=\"'$(Configuration)|$(Platform)'=='" << configuration << "|" << (isWin32 ? "Win32" : "x64") << "'\">\n"
 	           "\t\t<ClCompile>\n";
 
-	// Compile configuration
-	if (setup.devTools || name == setup.projectName || name == "sword25" || name == "grim") {
+	// Language Extensions
+	if (setup.devTools || name == setup.projectName || enableLanguageExtensions)
 		project << "\t\t\t<DisableLanguageExtensions>false</DisableLanguageExtensions>\n";
 
-		if (name == setup.projectName && !isRelease)
-			project << "\t\t\t<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\n";
-	} else {
-				if (warningsIterator != _projectWarnings.end())
-			project << "\t\t\t<DisableSpecificWarnings>" << warnings << ";%(DisableSpecificWarnings)</DisableSpecificWarnings>\n";
-	}
+	// Edit and Continue
+	if ((name == setup.projectName || disableEditAndContinue) && !isRelease)
+		project << "\t\t\t<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\n";
+
+	// Warnings
+	if (warningsIterator != _projectWarnings.end())
+		project << "\t\t\t<DisableSpecificWarnings>" << warnings << ";%(DisableSpecificWarnings)</DisableSpecificWarnings>\n";
 
 	project << "\t\t</ClCompile>\n";
 
diff --git a/devtools/create_project/msvc.cpp b/devtools/create_project/msvc.cpp
index 96eaf643d1..b8d2401af9 100644
--- a/devtools/create_project/msvc.cpp
+++ b/devtools/create_project/msvc.cpp
@@ -33,6 +33,9 @@ namespace CreateProjectTool {
 //////////////////////////////////////////////////////////////////////////
 MSVCProvider::MSVCProvider(StringList &global_warnings, std::map<std::string, StringList> &project_warnings, const int version)
 	: ProjectProvider(global_warnings, project_warnings, version) {
+
+	_enableLanguageExtensions = tokenize(ENABLE_LANGUAGE_EXTENSIONS, ',');
+	_disableEditAndContinue   = tokenize(DISABLE_EDIT_AND_CONTINUE, ',');
 }
 
 void MSVCProvider::createWorkspace(const BuildSetup &setup) {
@@ -75,10 +78,10 @@ void MSVCProvider::createWorkspace(const BuildSetup &setup) {
 	solution << "Global\n"
 	            "\tGlobalSection(SolutionConfigurationPlatforms) = preSolution\n"
 	            "\t\tDebug|Win32 = Debug|Win32\n"
-				"\t\tAnalysis|Win32 = Analysis|Win32\n"
+	            "\t\tAnalysis|Win32 = Analysis|Win32\n"
 	            "\t\tRelease|Win32 = Release|Win32\n"
 	            "\t\tDebug|x64 = Debug|x64\n"
-				"\t\tAnalysis|x64 = Analysis|x64\n"
+	            "\t\tAnalysis|x64 = Analysis|x64\n"
 	            "\t\tRelease|x64 = Release|x64\n"
 	            "\tEndGlobalSection\n"
 	            "\tGlobalSection(ProjectConfigurationPlatforms) = postSolution\n";
@@ -86,14 +89,14 @@ void MSVCProvider::createWorkspace(const BuildSetup &setup) {
 	for (UUIDMap::const_iterator i = _uuidMap.begin(); i != _uuidMap.end(); ++i) {
 		solution << "\t\t{" << i->second << "}.Debug|Win32.ActiveCfg = Debug|Win32\n"
 		            "\t\t{" << i->second << "}.Debug|Win32.Build.0 = Debug|Win32\n"
-					"\t\t{" << i->second << "}.Analysis|Win32.ActiveCfg = Analysis|Win32\n"
-					"\t\t{" << i->second << "}.Analysis|Win32.Build.0 = Analysis|Win32\n"
+		            "\t\t{" << i->second << "}.Analysis|Win32.ActiveCfg = Analysis|Win32\n"
+		            "\t\t{" << i->second << "}.Analysis|Win32.Build.0 = Analysis|Win32\n"
 		            "\t\t{" << i->second << "}.Release|Win32.ActiveCfg = Release|Win32\n"
 		            "\t\t{" << i->second << "}.Release|Win32.Build.0 = Release|Win32\n"
 		            "\t\t{" << i->second << "}.Debug|x64.ActiveCfg = Debug|x64\n"
 		            "\t\t{" << i->second << "}.Debug|x64.Build.0 = Debug|x64\n"
-					"\t\t{" << i->second << "}.Analysis|x64.ActiveCfg = Analysis|x64\n"
-					"\t\t{" << i->second << "}.Analysis|x64.Build.0 = Analysis|x64\n"
+		            "\t\t{" << i->second << "}.Analysis|x64.ActiveCfg = Analysis|x64\n"
+		            "\t\t{" << i->second << "}.Analysis|x64.Build.0 = Analysis|x64\n"
 		            "\t\t{" << i->second << "}.Release|x64.ActiveCfg = Release|x64\n"
 		            "\t\t{" << i->second << "}.Release|x64.Build.0 = Release|x64\n";
 	}
@@ -139,7 +142,7 @@ void MSVCProvider::createGlobalProp(const BuildSetup &setup) {
 	StringList x64EngineDefines = getEngineDefines(setup.engines);
 	x64Defines.splice(x64Defines.end(), x64EngineDefines);
 
-	// HACK: This definitly should not be here, but otherwise we would not define SDL_BACKEND for x64.
+	// HACK: This definitely should not be here, but otherwise we would not define SDL_BACKEND for x64.
 	x64Defines.push_back("WIN32");
 	x64Defines.push_back("SDL_BACKEND");
 
@@ -168,7 +171,7 @@ std::string MSVCProvider::getPostBuildEvent(bool isWin32, bool createInstaller)
 
 	cmdLine += (isWin32) ? "x86" : "x64";
 
-	cmdLine += " %SCUMMVM_LIBS% ";
+	cmdLine += " %" LIBS_DEFINE "% ";
 
 	// Specify if installer needs to be built or not
 	cmdLine += (createInstaller ? "1" : "0");
diff --git a/devtools/create_project/msvc.h b/devtools/create_project/msvc.h
index 0a994667fa..5a854b596a 100644
--- a/devtools/create_project/msvc.h
+++ b/devtools/create_project/msvc.h
@@ -32,6 +32,8 @@ public:
 	MSVCProvider(StringList &global_warnings, std::map<std::string, StringList> &project_warnings, const int version);
 
 protected:
+	StringList _enableLanguageExtensions;
+	StringList _disableEditAndContinue;
 
 	void createWorkspace(const BuildSetup &setup);
 
diff --git a/devtools/create_project/scripts/postbuild.cmd b/devtools/create_project/scripts/postbuild.cmd
index d78119d058..8b70ec3dd8 100644
--- a/devtools/create_project/scripts/postbuild.cmd
+++ b/devtools/create_project/scripts/postbuild.cmd
@@ -24,8 +24,10 @@ echo Copying data files
 echo.

 

 xcopy /F /Y "%~4/lib/%~3/SDL.dll"                          "%~2" 1>NUL 2>&1

-xcopy /F /Y "%~4/lib/%~3/freetype6.dll"                    "%~2" 1>NUL 2>&1
+xcopy /F /Y "%~4/lib/%~3/freetype6.dll"                    "%~2" 1>NUL 2>&1

 xcopy /F /Y "%~1/backends/vkeybd/packs/vkeybd_default.zip" "%~2" 1>NUL 2>&1

+xcopy /F /Y "%~1/gui/themes/translations.dat"               "%~2" 1>NUL 2>&1

+

 

 if "%~5"=="0" goto done

 

diff --git a/devtools/create_project/visualstudio.cpp b/devtools/create_project/visualstudio.cpp
index c301e78ad1..de2df96d78 100644
--- a/devtools/create_project/visualstudio.cpp
+++ b/devtools/create_project/visualstudio.cpp
@@ -103,6 +103,9 @@ void VisualStudioProvider::createProjectFile(const std::string &name, const std:
 		outputConfiguration(project, setup, libraries, "Release", "x64", "64", false);
 
 	} else {
+		bool enableLanguageExtensions = find(_enableLanguageExtensions.begin(), _enableLanguageExtensions.end(), name) != _enableLanguageExtensions.end();
+		bool disableEditAndContinue = find(_disableEditAndContinue.begin(), _disableEditAndContinue.end(), name) != _disableEditAndContinue.end();
+
 		std::string warnings = "";
 		if (warningsIterator != _projectWarnings.end())
 			for (StringList::const_iterator i = warningsIterator->second.begin(); i != warningsIterator->second.end(); ++i)
@@ -110,9 +113,8 @@ void VisualStudioProvider::createProjectFile(const std::string &name, const std:
 
 		std::string toolConfig;
 		toolConfig  = (!warnings.empty() ? "DisableSpecificWarnings=\"" + warnings + "\"" : "");
-		toolConfig += (name == setup.projectName ? "DebugInformationFormat=\"3\" " : "");
-		toolConfig += (name == "sword25" ? "DisableLanguageExtensions=\"false\" " : "");
-		toolConfig += (name == "grim" ? "DisableLanguageExtensions=\"false\" " : "");
+		toolConfig += (disableEditAndContinue   ? "DebugInformationFormat=\"3\" " : "");
+		toolConfig += (enableLanguageExtensions ? "DisableLanguageExtensions=\"false\" " : "");
 
 		// Win32
 		outputConfiguration(setup, project, toolConfig, "Debug", "Win32", "");
diff --git a/devtools/credits.pl b/devtools/credits.pl
index 1ff051af73..7e1985f03d 100755
--- a/devtools/credits.pl
+++ b/devtools/credits.pl
@@ -48,7 +48,7 @@ if ($mode eq "") {
 $Text::Wrap::unexpand = 0;
 if ($mode eq "TEXT") {
 	$Text::Wrap::columns = 78;
-	$max_name_width = 21; # The maximal width of a name.
+	$max_name_width = 23; # The maximal width of a name.
 } elsif ($mode eq "CPP") {
 	$Text::Wrap::columns = 48;	# Approx.
 }
@@ -359,6 +359,9 @@ sub add_person {
 		my $min_name_width = length $desc > 0 ? $max_name_width : 0;
 		$name = $nick if $name eq "";
 		$name = html_entities_to_ascii($name);
+		if (length $name > $max_name_width) {
+			print STDERR "Warning: max_name_width is too small (" . $max_name_width . " < " . (length $name) . " for \"" . $name. "\")\n";
+		}
 		$desc = html_entities_to_ascii($desc);
 
 		$tab = " " x ($section_level * 2 + 1);
@@ -701,6 +704,10 @@ begin_credits("Credits");
 				add_person("Gregory Montoir", "cyx", "(retired)");
 			end_section();
 
+			begin_section("Wintermute");
+				add_person("Einar Johan T. S&oslash;m&aring;en", "somaen", "");
+			end_section();
+
 		end_section();
 
 
@@ -1071,7 +1078,7 @@ begin_credits("Credits");
 
 
 	# HACK!
-	$max_name_width = 16;
+	$max_name_width = 17;
 
 	begin_section("Special thanks to");
 		begin_persons();
@@ -1084,6 +1091,7 @@ begin_credits("Credits");
 			add_person("Ivan Dubrov", "", "For contributing the initial version of the Gobliiins engine");
 			add_person("Henrik Engqvist", "qvist", "For generously providing hosting for our buildbot, SVN repository, planet and doxygen sites as well as tons of HD space");
 			add_person("DOSBox Team", "", "For their awesome OPL2 and OPL3 emulator");
+			add_person("Yusuke Kamiyamane", "", "For contributing some GUI icons ");
 			add_person("Till Kresslein", "Krest", "For design of modern ScummVM GUI");
 			add_person("", "Jezar", "For his freeverb filter implementation");
 			add_person("Jim Leiterman", "", "Various info on his FM-TOWNS/Marty SCUMM ports");
@@ -1094,8 +1102,6 @@ begin_credits("Credits");
 			add_person("James Woodcock", "", "Soundtrack enhancements");
 		end_persons();
 
-	add_paragraph("Some icons by Yusuke Kamiyamane");
-
 	add_paragraph(
     "Tony Warriner and everyone at Revolution Software Ltd. for sharing ".
     "with us the source of some of their brilliant games, allowing us to ".
@@ -1145,7 +1151,11 @@ begin_credits("Credits");
 
 	add_paragraph(
     "Janusz Wi&#347;niewski and Miroslaw Liminowicz from Laboratorium Komputerowe Avalon ".
-    "for providing full source code for So&#322;tys and letting us to redistribute the game.");
+    "for providing full source code for So&#322;tys and letting us redistribute the game.");
+
+	add_paragraph(
+    "Jan Nedoma for providing the sources to the Wintermute-engine, and for his ".
+    "support while porting the engine to ScummVM.");
 
 	add_paragraph(
     "Bob Bell, Michel Kripalani, Tommy Yune, from Presto Studios for ".
diff --git a/dists/engine-data/README b/dists/engine-data/README
index ce74d590d9..c9c4bd4817 100644
--- a/dists/engine-data/README
+++ b/dists/engine-data/README
@@ -1,6 +1,9 @@
 engine-data README
 -------------------------------------------------------------------------------
 
+drascula.dat
+TODO
+
 hugo.dat:
 This file contains all the hardcoded logic, strings and fonts used by Hugo
 engine. Those information were stored in the original executables.
@@ -10,6 +13,9 @@ The 'kyra.dat' file is created by extracting hardcoded data, like the
 roomtable, inventory names, various strings, tables for shapes and sequence
 scripts, from.
 
+lure.dat
+TODO
+
 queen.tbl:
 'queen.tbl' contains a list of filenames, filesizes and offsets for the
 individual files saved in QUEEN.1. This data was originally included in the
@@ -20,5 +26,11 @@ mp3/ogg/flac encoded need the datafile.
 sky.cpt:
 TODO
 
+teenagent.dat
+TODO
+
+tony.dat:
+This file contains the font table used by the different versions of the game.
+
 toon.dat:
 'toon.dat' contains all the strings hardcoded in the original executables.
diff --git a/dists/scummvm.rc b/dists/scummvm.rc
index 4a67100f9f..8527c668c8 100644
--- a/dists/scummvm.rc
+++ b/dists/scummvm.rc
@@ -44,6 +44,9 @@ teenagent.dat          FILE    "dists/engine-data/teenagent.dat"
 #if ENABLE_TOON      == STATIC_PLUGIN
 toon.dat               FILE    "dists/engine-data/toon.dat"
 #endif
+#if ENABLE_TONY      == STATIC_PLUGIN
+tony.dat               FILE    "dists/engine-data/tony.dat"
+#endif
 #if ENABLE_AGI       == STATIC_PLUGIN
 pred.dic               FILE    "dists/pred.dic"
 #endif
diff --git a/engines/agos/midiparser_s1d.cpp b/engines/agos/midiparser_s1d.cpp
index 9ca87436fc..54f0e9e03b 100644
--- a/engines/agos/midiparser_s1d.cpp
+++ b/engines/agos/midiparser_s1d.cpp
@@ -35,7 +35,7 @@ namespace AGOS {
 class MidiParser_S1D : public MidiParser {
 private:
 	byte *_data;
-	bool _no_delta;
+	bool _noDelta;
 
 	struct Loop {
 		uint16 timer;
@@ -49,7 +49,7 @@ protected:
 	void resetTracking();
 
 public:
-	MidiParser_S1D() : _data(0), _no_delta(false) {}
+	MidiParser_S1D() : _data(0), _noDelta(false) {}
 
 	bool loadMusic(byte *data, uint32 size);
 };
@@ -75,14 +75,14 @@ void MidiParser_S1D::chainEvent(EventInfo &info) {
 }
 
 void MidiParser_S1D::parseNextEvent(EventInfo &info) {
-	info.start = _position._play_pos;
+	info.start = _position._playPos;
 	info.length = 0;
-	info.delta = _no_delta ? 0 : readVLQ2(_position._play_pos);
-	_no_delta = false;
+	info.delta = _noDelta ? 0 : readVLQ2(_position._playPos);
+	_noDelta = false;
 
-	info.event = *_position._play_pos++;
+	info.event = *_position._playPos++;
 	if (!(info.event & 0x80)) {
-		_no_delta = true;
+		_noDelta = true;
 		info.event |= 0x80;
 	}
 
@@ -94,34 +94,34 @@ void MidiParser_S1D::parseNextEvent(EventInfo &info) {
 	} else {
 		switch (info.command()) {
 		case 0x8: // note off
-			info.basic.param1 = *_position._play_pos++;
+			info.basic.param1 = *_position._playPos++;
 			info.basic.param2 = 0;
 			break;
 
 		case 0x9: // note on
-			info.basic.param1 = *_position._play_pos++;
-			info.basic.param2 = *_position._play_pos++;
+			info.basic.param1 = *_position._playPos++;
+			info.basic.param2 = *_position._playPos++;
 			break;
 
 		case 0xA: { // loop control
 			// In case the stop mode(?) is set to 0x80 this will stop the
 			// track over here.
 
-			const int16 loopIterations = int8(*_position._play_pos++);
+			const int16 loopIterations = int8(*_position._playPos++);
 			if (!loopIterations) {
-				_loops[info.channel()].start = _position._play_pos;
+				_loops[info.channel()].start = _position._playPos;
 			} else {
 				if (!_loops[info.channel()].timer) {
 					if (_loops[info.channel()].start) {
 						_loops[info.channel()].timer = uint16(loopIterations);
-						_loops[info.channel()].end = _position._play_pos;
+						_loops[info.channel()].end = _position._playPos;
 
 						// Go to the start of the loop
-						_position._play_pos = _loops[info.channel()].start;
+						_position._playPos = _loops[info.channel()].start;
 					}
 				} else {
 					if (_loops[info.channel()].timer)
-						_position._play_pos = _loops[info.channel()].start;
+						_position._playPos = _loops[info.channel()].start;
 					--_loops[info.channel()].timer;
 				}
 			}
@@ -141,13 +141,13 @@ void MidiParser_S1D::parseNextEvent(EventInfo &info) {
 			break;
 
 		case 0xC: // program change
-			info.basic.param1 = *_position._play_pos++;
+			info.basic.param1 = *_position._playPos++;
 			info.basic.param2 = 0;
 			break;
 
 		case 0xD: // jump to loop end
 			if (_loops[info.channel()].end)
-				_position._play_pos = _loops[info.channel()].end;
+				_position._playPos = _loops[info.channel()].end;
 
 			// We need to read the next midi event here. Since we can not
 			// safely pass this event to the MIDI event processing.
@@ -178,7 +178,7 @@ bool MidiParser_S1D::loadMusic(byte *data, uint32 size) {
 	pos += 1;
 
 	// And now we're at the actual data. Only one track.
-	_num_tracks = 1;
+	_numTracks = 1;
 	_data = pos;
 	_tracks[0] = pos;
 
@@ -194,7 +194,7 @@ bool MidiParser_S1D::loadMusic(byte *data, uint32 size) {
 void MidiParser_S1D::resetTracking() {
 	MidiParser::resetTracking();
 	// The first event never contains any delta.
-	_no_delta = true;
+	_noDelta = true;
 	memset(_loops, 0, sizeof(_loops));
 }
 
diff --git a/engines/cine/anim.cpp b/engines/cine/anim.cpp
index 60168831a1..075a59cfb6 100644
--- a/engines/cine/anim.cpp
+++ b/engines/cine/anim.cpp
@@ -202,13 +202,13 @@ AnimData::AnimData(const AnimData &src) : _width(src._width),
 	if (src._data) {
 		_data = new byte[_size];
 		assert(_data);
-		memcpy(_data, src._data, _size*sizeof(byte));
+		memcpy(_data, src._data, _size * sizeof(byte));
 	}
 
 	if (src._mask) {
 		_mask = new byte[_size];
 		assert(_mask);
-		memcpy(_mask, src._mask, _size*sizeof(byte));
+		memcpy(_mask, src._mask, _size * sizeof(byte));
 	}
 
 	memset(_name, 0, sizeof(_name));
@@ -272,8 +272,7 @@ byte AnimData::getColor(int x, int y) {
  * @param transparent Transparent color (for ANIM_MASKSPRITE)
  */
 void AnimData::load(byte *d, int type, uint16 w, uint16 h, int16 file,
-	int16 frame, const char *n, byte transparent) {
-
+                    int16 frame, const char *n, byte transparent) {
 	assert(d);
 
 	if (_data) {
@@ -299,7 +298,7 @@ void AnimData::load(byte *d, int type, uint16 w, uint16 h, int16 file,
 		_size = w * h;
 		_data = new byte[_size];
 		assert(_data);
-		memcpy(_data, d, _size*sizeof(byte));
+		memcpy(_data, d, _size * sizeof(byte));
 		break;
 
 	case ANIM_MASK:
@@ -536,7 +535,7 @@ int loadSpl(const char *resourceName, int16 idx) {
 
 	entry = idx < 0 ? emptyAnimSpace() : idx;
 	assert(entry >= 0);
-	g_cine->_animDataTable[entry].load(dataPtr, ANIM_RAW, g_cine->_partBuffer[foundFileIdx].unpackedSize, 1, foundFileIdx, 0, currentPartName);
+	g_cine->_animDataTable[entry].load(dataPtr + 0x16, ANIM_RAW, g_cine->_partBuffer[foundFileIdx].unpackedSize - 0x16, 1, foundFileIdx, 0, currentPartName);
 
 	free(dataPtr);
 	return entry + 1;
@@ -546,9 +545,10 @@ int loadSpl(const char *resourceName, int16 idx) {
  * Load 1bpp mask
  * @param resourceName Mask filename
  * @param idx Target index in animDataTable (-1 if any empty space will do)
+ * @param frameIndex frame of animation to load (-1 for all frames)
  * @return The number of the animDataTable entry after the loaded mask (-1 if error)
  */
-int loadMsk(const char *resourceName, int16 idx) {
+int loadMsk(const char *resourceName, int16 idx, int16 frameIndex) {
 	int16 foundFileIdx = findFileInBundle(resourceName);
 	if (foundFileIdx < 0) {
 		return -1;
@@ -563,9 +563,18 @@ int loadMsk(const char *resourceName, int16 idx) {
 	loadAnimHeader(animHeader, readS);
 	ptr = dataPtr + 0x16;
 
+	int16 startFrame = 0;
+	int16 endFrame = animHeader.numFrames;
+
+	if (frameIndex >= 0) {
+		startFrame = frameIndex;
+		endFrame = frameIndex + 1;
+		ptr += frameIndex * animHeader.frameWidth * animHeader.frameHeight;
+	}
+
 	entry = idx < 0 ? emptyAnimSpace() : idx;
 	assert(entry >= 0);
-	for (int16 i = 0; i < animHeader.numFrames; i++, entry++) {
+	for (int16 i = startFrame; i < endFrame; i++, entry++) {
 		g_cine->_animDataTable[entry].load(ptr, ANIM_MASK, animHeader.frameWidth, animHeader.frameHeight, foundFileIdx, i, currentPartName);
 		ptr += animHeader.frameWidth * animHeader.frameHeight;
 	}
@@ -578,9 +587,10 @@ int loadMsk(const char *resourceName, int16 idx) {
  * Load animation
  * @param resourceName Animation filename
  * @param idx Target index in animDataTable (-1 if any empty space will do)
+ * @param frameIndex frame of animation to load (-1 for all frames)
  * @return The number of the animDataTable entry after the loaded animation (-1 if error)
  */
-int loadAni(const char *resourceName, int16 idx) {
+int loadAni(const char *resourceName, int16 idx, int16 frameIndex) {
 	int16 foundFileIdx = findFileInBundle(resourceName);
 	if (foundFileIdx < 0) {
 		return -1;
@@ -596,6 +606,15 @@ int loadAni(const char *resourceName, int16 idx) {
 	loadAnimHeader(animHeader, readS);
 	ptr = dataPtr + 0x16;
 
+	int16 startFrame = 0;
+	int16 endFrame = animHeader.numFrames;
+
+	if (frameIndex >= 0) {
+		startFrame = frameIndex;
+		endFrame = frameIndex + 1;
+		ptr += frameIndex * animHeader.frameWidth * animHeader.frameHeight;
+	}
+
 	transparentColor = getAnimTransparentColor(resourceName);
 
 	// TODO: Merge this special case hack into getAnimTransparentColor somehow.
@@ -609,7 +628,7 @@ int loadAni(const char *resourceName, int16 idx) {
 	entry = idx < 0 ? emptyAnimSpace() : idx;
 	assert(entry >= 0);
 
-	for (int16 i = 0; i < animHeader.numFrames; i++, entry++) {
+	for (int16 i = startFrame; i < endFrame; i++, entry++) {
 		// special case transparency handling
 		if (!strcmp(resourceName, "L2202.ANI")) {
 			transparentColor = i < 2 ? 0 : 7;
@@ -669,13 +688,13 @@ void convert8BBP2(byte *dest, byte *source, int16 width, int16 height) {
 					*(source + k) <<= 1;
 					if (k > 0 + m)
 						color <<= 1;
-				}	// end k
+				} // end k
 				*(dest++) = color;
-			}	// end i
-		}	// end m
+			} // end i
+		} // end m
 
 		source += 0x10;
-	}	// end j
+	} // end j
 }
 
 /**
@@ -685,7 +704,7 @@ void convert8BBP2(byte *dest, byte *source, int16 width, int16 height) {
  * @param frameIndex frame of animation to load (-1 for all frames)
  * @return The number of the animDataTable entry after the loaded image set (-1 if error)
  */
-int loadSet(const char *resourceName, int16 idx, int16 frameIndex =-1 ) {
+int loadSet(const char *resourceName, int16 idx, int16 frameIndex = -1) {
 	AnimHeader2Struct header2;
 	uint16 numSpriteInAnim;
 	int16 foundFileIdx = findFileInBundle(resourceName);
@@ -712,10 +731,9 @@ int loadSet(const char *resourceName, int16 idx, int16 frameIndex =-1 ) {
 	int16 startFrame = 0;
 	int16 endFrame = numSpriteInAnim;
 
-	if(frameIndex>=0)
-	{
+	if (frameIndex >= 0) {
 		startFrame = frameIndex;
-		endFrame = frameIndex+1;
+		endFrame = frameIndex + 1;
 		ptr += 0x10 * frameIndex;
 	}
 
@@ -766,7 +784,7 @@ int loadSeq(const char *resourceName, int16 idx) {
 	byte *dataPtr = readBundleFile(foundFileIdx);
 	int entry = idx < 0 ? emptyAnimSpace() : idx;
 
-	g_cine->_animDataTable[entry].load(dataPtr+0x16, ANIM_RAW, g_cine->_partBuffer[foundFileIdx].unpackedSize-0x16, 1, foundFileIdx, 0, currentPartName);
+	g_cine->_animDataTable[entry].load(dataPtr + 0x16, ANIM_RAW, g_cine->_partBuffer[foundFileIdx].unpackedSize - 0x16, 1, foundFileIdx, 0, currentPartName);
 	free(dataPtr);
 	return entry + 1;
 }
@@ -783,11 +801,11 @@ int loadResource(const char *resourceName, int16 idx, int16 frameIndex) {
 	if (strstr(resourceName, ".SPL")) {
 		result = loadSpl(resourceName, idx);
 	} else if (strstr(resourceName, ".MSK")) {
-		result = loadMsk(resourceName, idx);
+		result = loadMsk(resourceName, idx, frameIndex);
 	} else if (strstr(resourceName, ".ANI")) {
-		result = loadAni(resourceName, idx);
+		result = loadAni(resourceName, idx, frameIndex);
 	} else if (strstr(resourceName, ".ANM")) {
-		result = loadAni(resourceName, idx);
+		result = loadAni(resourceName, idx, frameIndex);
 	} else if (strstr(resourceName, ".SET")) {
 		result = loadSet(resourceName, idx, frameIndex);
 	} else if (strstr(resourceName, ".SEQ")) {
diff --git a/engines/cine/cine.cpp b/engines/cine/cine.cpp
index bbe2cd4896..aa7221f733 100644
--- a/engines/cine/cine.cpp
+++ b/engines/cine/cine.cpp
@@ -189,7 +189,18 @@ void CineEngine::initialize() {
 	g_cine->_messageTable.clear();
 	resetObjectTable();
 
-	disableSystemMenu = 1;
+	if (getGameType() == Cine::GType_OS) {
+		disableSystemMenu = 1;
+	} else {
+		// WORKAROUND: We do not save this variable in FW's savegames.
+		// Initializing this to 1, like we do it in the OS case, will
+		// cause the menu disabled when loading from the launcher or
+		// command line.
+		// A proper fix here would be to save this variable in FW's saves.
+		// Since it seems these are unversioned so far, there would be need
+		// to properly add versioning to them first.
+		disableSystemMenu = 0;
+	}
 
 	var8 = 0;
 
diff --git a/engines/cine/cine.h b/engines/cine/cine.h
index 55376dce29..47edf51c30 100644
--- a/engines/cine/cine.h
+++ b/engines/cine/cine.h
@@ -159,7 +159,7 @@ private:
 	bool _preLoad;
 	int _timerDelayMultiplier;
 
- public:
+public:
 	// TODO: These are pseudo-global vars
 	// They better belong to appropriate classes
 	Common::Array<AnimData> _animDataTable;
diff --git a/engines/cine/console.cpp b/engines/cine/console.cpp
index 0a24b2408a..4af28592e7 100644
--- a/engines/cine/console.cpp
+++ b/engines/cine/console.cpp
@@ -28,7 +28,7 @@ namespace Cine {
 bool labyrinthCheat;
 
 CineConsole::CineConsole(CineEngine *vm) : GUI::Debugger(), _vm(vm) {
-	DCmd_Register("labyrinthCheat",	WRAP_METHOD(CineConsole, Cmd_LabyrinthCheat));
+	DCmd_Register("labyrinthCheat", WRAP_METHOD(CineConsole, Cmd_LabyrinthCheat));
 
 	labyrinthCheat = false;
 }
diff --git a/engines/cine/gfx.cpp b/engines/cine/gfx.cpp
index 7a988227f6..636c0cf8d9 100644
--- a/engines/cine/gfx.cpp
+++ b/engines/cine/gfx.cpp
@@ -113,7 +113,7 @@ FWRenderer::FWRenderer() : _background(NULL), _backupPal(), _cmd(""),
 	assert(_backBuffer);
 
 	memset(_backBuffer, 0, _screenSize);
-	memset(_bgName, 0, sizeof (_bgName));
+	memset(_bgName, 0, sizeof(_bgName));
 }
 
 
@@ -249,7 +249,7 @@ void FWRenderer::drawCommand() {
 	unsigned int i;
 	int x = 10, y = _cmdY;
 
-	if(disableSystemMenu == 0) {
+	if (disableSystemMenu == 0) {
 		drawPlainBox(x, y, 301, 11, 0);
 		drawBorder(x - 1, y - 1, 302, 12, 2);
 
@@ -307,7 +307,7 @@ void FWRenderer::drawMessage(const char *str, int x, int y, int width, int color
 				i++;
 			line = fitLine(str + i, tw, words, cw);
 
-			if ( str[i + line] != '\0' && str[i + line] != 0x7C && words) {
+			if (str[i + line] != '\0' && str[i + line] != 0x7C && words) {
 				space = (tw - cw) / words;
 				extraSpace = (tw - cw) % words;
 			} else {
@@ -471,6 +471,41 @@ int FWRenderer::drawChar(char character, int x, int y) {
 	return x;
 }
 
+/**
+ * Clears the character glyph to black
+ * This function is called "undrawChar", because the original only applies
+ * this drawing after the original glyph has been drawn.
+ * Possible TODO: Find a better name.
+ * @param character Character to undraw
+ * @param x Character coordinate
+ * @param y Character coordinate
+ */
+int FWRenderer::undrawChar(char character, int x, int y) {
+	int width, idx;
+
+	if (character == ' ') {
+		x += 5;
+	} else if ((width = g_cine->_textHandler.fontParamTable[(unsigned char)character].characterWidth)) {
+		idx = g_cine->_textHandler.fontParamTable[(unsigned char)character].characterIdx;
+		const byte *sprite = g_cine->_textHandler.textTable[idx][FONT_DATA];
+		for (uint i = 0; i < FONT_HEIGHT; ++i) {
+			byte *dst = _backBuffer + (y + i) * 320 + x;
+			for (uint j = 0; j < FONT_WIDTH; ++j, ++dst) {
+				// The original does this based on whether bit 1 of the pixel
+				// is set. Since that's the only bit ever set in (FW) this
+				// check should be fine.
+				// TODO: Check how Operation Stealth Amiga works
+				if (*sprite++) {
+					*dst = 0;
+				}
+			}
+		}
+		x += width + 1;
+	}
+
+	return x;
+}
+
 int FWRenderer::getStringWidth(const char *str) {
 	const char *p = str;
 	int width = 0;
@@ -969,20 +1004,29 @@ void SelectionMenu::drawMenu(FWRenderer &r, bool top) {
 		charX = x + 4;
 
 		if (i == _selection) {
+			int color;
+
 			if (isAmiga) {
-				// The original Amiga version is using a different highlight color here,
-				// but with our current code it is not possible to change the text color,
-				// thus we can not use the Amiga's color, since otherwise the text
-				// wouldn't be visible anymore.
-				r.drawPlainBox(charX, lineY, _width - 8, FONT_HEIGHT, top ? r._messageBg/*2*/ : 18);
+				if (top) {
+					color = 2;
+				} else {
+					color = 18;
+				}
 			} else {
-				r.drawPlainBox(charX, lineY, _width - 8, 9, 0);
+				color = 0;
 			}
+
+			r.drawPlainBox(x + 2, lineY - 1, _width - 3, 9, color);
 		}
 
 		const int size = _elements[i].size();
-		for (int j = 0; j < size; ++j)
-			charX = r.drawChar(_elements[i][j], charX, lineY);
+		for (int j = 0; j < size; ++j) {
+			if (isAmiga && i == _selection) {
+				charX = r.undrawChar(_elements[i][j], charX, lineY);
+			} else {
+				charX = r.drawChar(_elements[i][j], charX, lineY);
+			}
+		}
 	}
 }
 
@@ -1244,6 +1288,7 @@ void OSRenderer::renderOverlay(const Common::List<overlay>::iterator &it) {
 		sprite = &g_cine->_animDataTable[g_cine->_objectTable[it->objIdx].frame];
 		drawSprite(&(*it), sprite->data(), sprite->_realWidth, sprite->_height, _backBuffer, g_cine->_objectTable[it->objIdx].x, g_cine->_objectTable[it->objIdx].y, g_cine->_objectTable[it->objIdx].part, sprite->_bpp);
 		break;
+
 	// game message
 	case 2:
 		if (it->objIdx >= g_cine->_messageTable.size()) {
@@ -1300,7 +1345,7 @@ void OSRenderer::renderOverlay(const Common::List<overlay>::iterator &it) {
 		height = obj->costume;
 		drawPlainBox(obj->x, obj->y, width, height, color);
 		debug(5, "renderOverlay: type=%d, x=%d, y=%d, width=%d, height=%d, color=%d",
-			it->type, obj->x, obj->y, width, height, color);
+			  it->type, obj->x, obj->y, width, height, color);
 		break;
 
 	// something else
@@ -1424,7 +1469,7 @@ void OSRenderer::selectBg(unsigned int idx) {
 
 	if (_bgTable[idx].bg) {
 		assert(_bgTable[idx].pal.isValid() && !(_bgTable[idx].pal.empty()));
-	_currentBg = idx;
+		_currentBg = idx;
 	} else
 		warning("OSRenderer::selectBg(%d) - attempt to select null background", idx);
 	reloadPalette();
@@ -1750,23 +1795,23 @@ void OSRenderer::drawSprite(overlay *overlayPtr, const byte *spritePtr, int16 wi
 
 	// draw the mask based on next objects in the list
 	Common::List<overlay>::iterator it;
-	for (it = g_cine->_overlayList.begin(); it != g_cine->_overlayList.end(); ++it)	{
-		if(&(*it) == overlayPtr) {
+	for (it = g_cine->_overlayList.begin(); it != g_cine->_overlayList.end(); ++it) {
+		if (&(*it) == overlayPtr) {
 			break;
 		}
 	}
 
-	while(it != g_cine->_overlayList.end())	{
+	while (it != g_cine->_overlayList.end()) {
 		overlay *pCurrentOverlay = &(*it);
 		if ((pCurrentOverlay->type == 5) || ((pCurrentOverlay->type == 21) && (pCurrentOverlay->x == overlayPtr->objIdx))) {
 			AnimData *sprite = &g_cine->_animDataTable[g_cine->_objectTable[it->objIdx].frame];
 
 			if (pMask == NULL) {
-				pMask = new byte[width*height];
+				pMask = new byte[width * height];
 
 				for (int i = 0; i < height; i++) {
 					for (int j = 0; j < width; j++) {
-						byte spriteColor= spritePtr[width * i + j];
+						byte spriteColor = spritePtr[width * i + j];
 						pMask[width * i + j] = spriteColor;
 					}
 				}
@@ -1777,7 +1822,7 @@ void OSRenderer::drawSprite(overlay *overlayPtr, const byte *spritePtr, int16 wi
 					int inMaskX = (g_cine->_objectTable[it->objIdx].x + i) - x;
 					int inMaskY = (g_cine->_objectTable[it->objIdx].y + j) - y;
 
-					if (inMaskX >=0 && inMaskX < width) {
+					if (inMaskX >= 0 && inMaskX < width) {
 						if (inMaskY >= 0 && inMaskY < height) {
 							if (sprite->_bpp == 1) {
 								if (!sprite->getColor(i, j)) {
@@ -1793,7 +1838,7 @@ void OSRenderer::drawSprite(overlay *overlayPtr, const byte *spritePtr, int16 wi
 	}
 
 	// now, draw with the mask we created
-	if(pMask) {
+	if (pMask) {
 		spritePtr = pMask;
 	}
 
@@ -1808,7 +1853,7 @@ void OSRenderer::drawSprite(overlay *overlayPtr, const byte *spritePtr, int16 wi
 			destPtr += i * 320;
 
 			for (int j = 0; j < width; j++) {
-				byte color= *(spritePtr++);
+				byte color = *(spritePtr++);
 				if ((transparentColor != color) && x + j >= 0 && x + j < 320 && i + y >= 0 && i + y < 200) {
 					*(destPtr++) = color;
 				} else {
diff --git a/engines/cine/gfx.h b/engines/cine/gfx.h
index 3434cf9fc2..8b8843fd72 100644
--- a/engines/cine/gfx.h
+++ b/engines/cine/gfx.h
@@ -152,6 +152,7 @@ protected:
 	void drawBorder(int x, int y, int width, int height, byte color);
 	void drawDoubleBorder(int x, int y, int width, int height, byte color);
 	virtual int drawChar(char character, int x, int y);
+	virtual int undrawChar(char character, int x, int y);
 	void drawLine(int x, int y, int width, int height, byte color);
 	void remaskSprite(byte *mask, Common::List<overlay>::iterator it);
 	virtual void drawBackground();
@@ -287,7 +288,7 @@ byte gfxGetColor(int16 x, int16 y, const byte *ptr, int16 width);
 
 void gfxResetRawPage(byte *pageRaw);
 void gfxConvertSpriteToRaw(byte *dst, const byte *src, uint16 w, uint16 h);
-void gfxCopyRawPage(byte *source, byte * dest);
+void gfxCopyRawPage(byte *source, byte *dest);
 void gfxFlipRawPage(byte *frontBuffer);
 void drawSpriteRaw(const byte *spritePtr, const byte *maskPtr, int16 width, int16 height, byte *page, int16 x, int16 y);
 void gfxDrawPlainBoxRaw(int16 x1, int16 y1, int16 x2, int16 y2, byte color, byte *page);
diff --git a/engines/cine/main_loop.cpp b/engines/cine/main_loop.cpp
index f13f38a45e..c822f1cabd 100644
--- a/engines/cine/main_loop.cpp
+++ b/engines/cine/main_loop.cpp
@@ -180,19 +180,19 @@ static void processEvent(Common::Event &event) {
 		case Common::KEYCODE_F11:
 			renderer->showCollisionPage(false);
 			break;
-		case Common::KEYCODE_KP5:	// Emulated left mouse button click
-		case Common::KEYCODE_LEFT:	// Left
-		case Common::KEYCODE_KP4:	// Left
+		case Common::KEYCODE_KP5:   // Emulated left mouse button click
+		case Common::KEYCODE_LEFT:  // Left
+		case Common::KEYCODE_KP4:   // Left
 		case Common::KEYCODE_RIGHT: // Right
-		case Common::KEYCODE_KP6:	// Right
-		case Common::KEYCODE_UP:	// Up
-		case Common::KEYCODE_KP8:	// Up
-		case Common::KEYCODE_DOWN:	// Down
-		case Common::KEYCODE_KP2:	// Down
-		case Common::KEYCODE_KP9:	// Up & Right
-		case Common::KEYCODE_KP7:	// Up & Left
-		case Common::KEYCODE_KP1:	// Down & Left
-		case Common::KEYCODE_KP3:	// Down & Right
+		case Common::KEYCODE_KP6:   // Right
+		case Common::KEYCODE_UP:    // Up
+		case Common::KEYCODE_KP8:   // Up
+		case Common::KEYCODE_DOWN:  // Down
+		case Common::KEYCODE_KP2:   // Down
+		case Common::KEYCODE_KP9:   // Up & Right
+		case Common::KEYCODE_KP7:   // Up & Left
+		case Common::KEYCODE_KP1:   // Down & Left
+		case Common::KEYCODE_KP3:   // Down & Right
 			// Stop ego movement made with keyboard when releasing a known key
 			moveUsingKeyboard(0, 0);
 			break;
@@ -217,7 +217,6 @@ void manageEvents() {
 		g_system->delayMillis(20);
 	} while (g_system->getMillis() < nextFrame);
 
-	g_sound->update();
 	mouseData.left = mouseLeft;
 	mouseData.right = mouseRight;
 }
@@ -434,9 +433,9 @@ void CineEngine::mainLoop(int bootScriptIdx) {
 
 	hideMouse();
 	g_sound->stopMusic();
-	// if (g_cine->getGameType() == Cine::GType_OS) {
+	//if (g_cine->getGameType() == Cine::GType_OS) {
 	//	freeUnkList();
-	// }
+	//}
 	closePart();
 }
 
diff --git a/engines/cine/object.cpp b/engines/cine/object.cpp
index afd95c04b0..a75828abb1 100644
--- a/engines/cine/object.cpp
+++ b/engines/cine/object.cpp
@@ -59,7 +59,7 @@ void loadObject(char *pObjectName) {
 	assert(numEntry <= NUM_MAX_OBJECT);
 
 	for (i = 0; i < numEntry; i++) {
-		if (g_cine->_objectTable[i].costume != -2 && g_cine->_objectTable[i].costume != -3) {	// flag is keep ?
+		if (g_cine->_objectTable[i].costume != -2 && g_cine->_objectTable[i].costume != -3) { // flag is keep?
 			Common::MemoryReadStream readS(ptr, entrySize);
 
 			g_cine->_objectTable[i].x = readS.readSint16BE();
diff --git a/engines/cine/pal.cpp b/engines/cine/pal.cpp
index 779c279ea1..10077ecdc9 100644
--- a/engines/cine/pal.cpp
+++ b/engines/cine/pal.cpp
@@ -92,7 +92,8 @@ void loadRelatedPalette(const char *fileName) {
 	paletteIndex = findPaletteFromName(localName);
 
 	if (paletteIndex == -1) {
-		for (i = 0; i < 16; i++) {	// generate default palette
+		// generate default palette
+		for (i = 0; i < 16; i++) {
 			paletteBuffer1[i] = paletteBuffer2[i] = (i << 4) + i;
 		}
 	} else {
diff --git a/engines/cine/part.cpp b/engines/cine/part.cpp
index 03cb743b46..813cbe50af 100644
--- a/engines/cine/part.cpp
+++ b/engines/cine/part.cpp
@@ -263,7 +263,7 @@ byte *readBundleSoundFile(const char *entryName, uint32 *size) {
 /** Rotate byte value to the left by n bits */
 byte rolByte(byte value, uint n) {
 	n %= 8;
-	return (byte) ((value << n) | (value >> (8 - n)));
+	return (byte)((value << n) | (value >> (8 - n)));
 }
 
 byte *readFile(const char *filename, bool crypted) {
diff --git a/engines/cine/saveload.cpp b/engines/cine/saveload.cpp
index 20952eea52..51d2c1f6be 100644
--- a/engines/cine/saveload.cpp
+++ b/engines/cine/saveload.cpp
@@ -1002,7 +1002,7 @@ void loadResourcesFromSave(Common::SeekableReadStream &fHandle, enum CineSaveGam
 	const int entrySize = ((saveGameFormat == ANIMSIZE_23) ? 23 : 30);
 	const int fileStartPos = fHandle.pos();
 
-	for(int resourceIndex=0; resourceIndex<NUM_MAX_ANIMDATA; resourceIndex++) {
+	for (int resourceIndex = 0; resourceIndex < NUM_MAX_ANIMDATA; resourceIndex++) {
 		// Seek to the start of the current animation's entry
 		fHandle.seek(fileStartPos + resourceIndex * entrySize);
 		// Read in the current animation entry
diff --git a/engines/cine/saveload.h b/engines/cine/saveload.h
index 49c9c0cef7..fd661904af 100644
--- a/engines/cine/saveload.h
+++ b/engines/cine/saveload.h
@@ -68,7 +68,7 @@ enum CineSaveGameFormat {
 };
 
 /** Identifier for the temporary Operation Stealth savegame format. */
-static const uint32 TEMP_OS_FORMAT_ID = MKTAG('T','E','M','P');
+static const uint32 TEMP_OS_FORMAT_ID = MKTAG('T', 'E', 'M', 'P');
 
 /** The current version number of Operation Stealth's savegame format. */
 static const uint32 CURRENT_OS_SAVE_VER = 1;
diff --git a/engines/cine/script.h b/engines/cine/script.h
index 3fc86c585b..a07c8d6cfc 100644
--- a/engines/cine/script.h
+++ b/engines/cine/script.h
@@ -227,6 +227,7 @@ protected:
 	int o1_op72();
 	int o1_op73();
 	int o1_playSample();
+	int o1_playSampleSwapped();
 	int o1_disableSystemMenu();
 	int o1_loadMask5();
 	int o1_unloadMask5();
diff --git a/engines/cine/script_fw.cpp b/engines/cine/script_fw.cpp
index 9cbe3c3fab..b4fe68c343 100644
--- a/engines/cine/script_fw.cpp
+++ b/engines/cine/script_fw.cpp
@@ -196,7 +196,7 @@ void FWScript::setupTable() {
 		{ 0, 0 },
 		{ &FWScript::o1_playSample, "bbwbww" },
 		/* 78 */
-		{ &FWScript::o1_playSample, "bbwbww" },
+		{ &FWScript::o1_playSampleSwapped, "bbwbww" },
 		{ &FWScript::o1_disableSystemMenu, "b" },
 		{ &FWScript::o1_loadMask5, "b" },
 		{ &FWScript::o1_unloadMask5, "b" }
@@ -352,7 +352,7 @@ void ScriptVars::load(Common::SeekableReadStream &fHandle, unsigned int len) {
  * Reset all values to 0
  */
 void ScriptVars::reset() {
-	memset( _vars, 0, _size * sizeof(int16));
+	memset(_vars, 0, _size * sizeof(int16));
 }
 
 /**
@@ -380,10 +380,10 @@ RawScript::RawScript(const FWScriptInfo &info, const byte *data, uint16 s) :
  * Copy constructor
  */
 RawScript::RawScript(const RawScript &src) : _size(src._size),
-	_data(new byte[_size+1]), _labels(src._labels) {
+	_data(new byte[_size + 1]), _labels(src._labels) {
 
 	assert(_data);
-	memcpy(_data, src._data, _size+1);
+	memcpy(_data, src._data, _size + 1);
 }
 
 /**
@@ -398,7 +398,7 @@ RawScript::~RawScript() {
  */
 RawScript &RawScript::operator=(const RawScript &src) {
 	assert(src._data);
-	byte *tmp = new byte[src._size+1];
+	byte *tmp = new byte[src._size + 1];
 
 	assert(tmp);
 	_labels = src._labels;
@@ -443,14 +443,14 @@ int RawScript::getNextLabel(const FWScriptInfo &info, int offset) const {
 				pos += 2;
 				break;
 			case 'c': { // byte != 0 ? byte : word
-					uint8 test = _data[pos];
+				uint8 test = _data[pos];
+				pos++;
+				if (test) {
 					pos++;
-					if (test) {
-						pos++;
-					} else {
-						pos += 2;
-					}
+				} else {
+					pos += 2;
 				}
+			}
 				break;
 			case 'l': // label
 				return pos;
@@ -459,7 +459,7 @@ int RawScript::getNextLabel(const FWScriptInfo &info, int offset) const {
 					;
 				break;
 			case 'x': // exit script
-				return -pos-1;
+				return -pos - 1;
 			}
 		}
 	}
@@ -498,9 +498,7 @@ void RawScript::computeLabels(const FWScriptInfo &info) {
  *
  * computeScriptStackFromScript replacement
  */
-uint16 RawScript::getLabel(const FWScriptInfo &info, byte index, uint16 offset)
-	const {
-
+uint16 RawScript::getLabel(const FWScriptInfo &info, byte index, uint16 offset) const {
 	assert(_data);
 	int pos = offset;
 
@@ -519,7 +517,7 @@ uint16 RawScript::getLabel(const FWScriptInfo &info, byte index, uint16 offset)
  */
 void RawScript::setData(const FWScriptInfo &info, const byte *data) {
 	assert(!_data); // this function should be called only once per instance
-	_data = new byte[_size+1];
+	_data = new byte[_size + 1];
 
 	assert(data && _data);
 	memcpy(_data, data, _size * sizeof(byte));
@@ -553,7 +551,7 @@ byte RawScript::getByte(unsigned int pos) const {
  * @return Word of bytecode
  */
 uint16 RawScript::getWord(unsigned int pos) const {
-	assert(_data && pos+1 < _size);
+	assert(_data && pos + 1 < _size);
 
 	return READ_BE_UINT16(_data + pos);
 }
@@ -566,7 +564,7 @@ uint16 RawScript::getWord(unsigned int pos) const {
 const char *RawScript::getString(unsigned int pos) const {
 	assert(_data && pos < _size);
 
-	return (const char*)(_data+pos);
+	return (const char *)(_data + pos);
 }
 
 /**
@@ -580,8 +578,8 @@ const char *RawScript::getString(unsigned int pos) const {
  * instance can be used. It leaves the instance in partially invalid state.
  */
 RawObjectScript::RawObjectScript(uint16 s, uint16 p1, uint16 p2, uint16 p3)
-	: RawScript(s), _runCount(0), _param1(p1), _param2(p2), _param3(p3)
-{ }
+	: RawScript(s), _runCount(0), _param1(p1), _param2(p2), _param3(p3) {
+}
 
 /**
  * Complete constructor
@@ -592,8 +590,9 @@ RawObjectScript::RawObjectScript(uint16 s, uint16 p1, uint16 p2, uint16 p3)
  * @param p3 Third object script parameter
  */
 RawObjectScript::RawObjectScript(const FWScriptInfo &info, const byte *data,
-	uint16 s, uint16 p1, uint16 p2, uint16 p3) : RawScript(info, data, s),
-	_runCount(0), _param1(p1), _param2(p2), _param3(p3) { }
+                                 uint16 s, uint16 p1, uint16 p2, uint16 p3)
+	: RawScript(info, data, s), _runCount(0), _param1(p1), _param2(p2), _param3(p3) {
+}
 
 /**
  * Contructor for global scripts
@@ -603,7 +602,8 @@ RawObjectScript::RawObjectScript(const FWScriptInfo &info, const byte *data,
 FWScript::FWScript(const RawScript &script, int16 idx) : _script(script),
 	_pos(0), _line(0), _compare(0), _index(idx),
 	_labels(script.labels()), _localVars(LOCAL_VARS_SIZE),
-	_globalVars(g_cine->_globalVars), _info(new FWScriptInfo) { }
+	_globalVars(g_cine->_globalVars), _info(new FWScriptInfo) {
+}
 
 /**
  * Copy constructor
@@ -611,25 +611,27 @@ FWScript::FWScript(const RawScript &script, int16 idx) : _script(script),
 FWScript::FWScript(const FWScript &src) : _script(src._script), _pos(src._pos),
 	_line(src._line), _compare(src._compare), _index(src._index),
 	_labels(src._labels), _localVars(src._localVars),
-	_globalVars(src._globalVars), _info(new FWScriptInfo) { }
+	_globalVars(src._globalVars), _info(new FWScriptInfo) {
+}
 
 /**
  * Contructor for global scripts in derived classes
  * @param script Script bytecode reference
  * @param idx Script bytecode index
  */
-FWScript::FWScript(const RawScript &script, int16 idx, FWScriptInfo *info) :
-	_script(script), _pos(0), _line(0), _compare(0), _index(idx),
+FWScript::FWScript(const RawScript &script, int16 idx, FWScriptInfo *info)
+	: _script(script), _pos(0), _line(0), _compare(0), _index(idx),
 	_labels(script.labels()), _localVars(LOCAL_VARS_SIZE),
-	_globalVars(g_cine->_globalVars), _info(info) { }
+	_globalVars(g_cine->_globalVars), _info(info) {
+}
 
 /**
  * Constructor for object scripts in derived classes
  * @param script Script bytecode reference
  * @param idx Script bytecode index
  */
-FWScript::FWScript(RawObjectScript &script, int16 idx, FWScriptInfo *info) :
-	_script(script), _pos(0), _line(0), _compare(0), _index(idx),
+FWScript::FWScript(RawObjectScript &script, int16 idx, FWScriptInfo *info)
+	: _script(script), _pos(0), _line(0), _compare(0), _index(idx),
 	_labels(script.labels()), _localVars(LOCAL_VARS_SIZE),
 	_globalVars(g_cine->_globalVars), _info(info) {
 
@@ -639,8 +641,8 @@ FWScript::FWScript(RawObjectScript &script, int16 idx, FWScriptInfo *info) :
 /**
  * Copy constructor for derived classes
  */
-FWScript::FWScript(const FWScript &src, FWScriptInfo *info) :
-	_script(src._script), _pos(src._pos), _line(src._line),
+FWScript::FWScript(const FWScript &src, FWScriptInfo *info)
+	: _script(src._script), _pos(src._pos), _line(src._line),
 	_compare(src._compare), _index(src._index), _labels(src._labels),
 	_localVars(src._localVars), _globalVars(src._globalVars), _info(info) { }
 
@@ -704,7 +706,7 @@ void FWScript::load(const ScriptVars &labels, const ScriptVars &local, uint16 co
 int FWScript::execute() {
 	int ret = 0;
 
-	if(_script._size) {
+	if (_script._size) {
 		while (!ret) {
 			_line = _pos;
 			byte opcode = getNextByte();
@@ -1816,6 +1818,9 @@ int FWScript::o1_playSample() {
 	if (g_cine->getPlatform() == Common::kPlatformAmiga || g_cine->getPlatform() == Common::kPlatformAtariST) {
 		if (size == 0xFFFF) {
 			size = g_cine->_animDataTable[anim]._width * g_cine->_animDataTable[anim]._height;
+		} else if (size > g_cine->_animDataTable[anim]._width * g_cine->_animDataTable[anim]._height) {
+			warning("o1_playSample: Got invalid sample size %d for sample %d", size, anim);
+			size = g_cine->_animDataTable[anim]._width * g_cine->_animDataTable[anim]._height;
 		}
 		if (channel < 10) { // || _currentOpcode == 0x78
 			int channel1, channel2;
@@ -1823,8 +1828,8 @@ int FWScript::o1_playSample() {
 				channel1 = 0;
 				channel2 = 1;
 			} else {
-				channel1 = 2;
-				channel2 = 3;
+				channel1 = 3;
+				channel2 = 2;
 			}
 			g_sound->playSound(channel1, freq, data, size, -1, volume, 63, repeat);
 			g_sound->playSound(channel2, freq, data, size,  1, volume,  0, repeat);
@@ -1858,6 +1863,53 @@ int FWScript::o1_playSample() {
 	return 0;
 }
 
+int FWScript::o1_playSampleSwapped() {
+	// TODO: The DOS version probably does not have any stereo support here
+	// since the only stereo output it supports should be the Roland MT-32.
+	// So it probably does the same as o1_playSample here. Checking this will
+	// be a good idea never the less.
+	if (g_cine->getPlatform() == Common::kPlatformPC) {
+		return o1_playSample();
+	}
+
+	debugC(5, kCineDebugScript, "Line: %d: playSampleInversed()", _line);
+
+	byte anim = getNextByte();
+	byte channel = getNextByte();
+
+	uint16 freq = getNextWord();
+	byte repeat = getNextByte();
+
+	int16 volume = getNextWord();
+	uint16 size = getNextWord();
+
+	const byte *data = g_cine->_animDataTable[anim].data();
+
+	if (!data) {
+		return 0;
+	}
+
+	if (size == 0xFFFF) {
+		size = g_cine->_animDataTable[anim]._width * g_cine->_animDataTable[anim]._height;
+	} else if (size > g_cine->_animDataTable[anim]._width * g_cine->_animDataTable[anim]._height) {
+		warning("o1_playSampleSwapped: Got invalid sample size %d for sample %d", size, anim);
+		size = g_cine->_animDataTable[anim]._width * g_cine->_animDataTable[anim]._height;
+	}
+
+	int channel1, channel2;
+	if (channel == 0) {
+		channel1 = 1;
+		channel2 = 0;
+	} else {
+		channel1 = 2;
+		channel2 = 3;
+	}
+
+	g_sound->playSound(channel1, freq, data, size, -1, volume, 63, repeat);
+	g_sound->playSound(channel2, freq, data, size,  1, volume,  0, repeat);
+	return 0;
+}
+
 int FWScript::o1_disableSystemMenu() {
 	byte param = getNextByte();
 
@@ -2074,1034 +2126,970 @@ void decompileScript(const byte *scriptPtr, uint16 scriptSize, uint16 scriptIdx)
 		strcpy(lineBuffer, "");
 
 		switch (opcode - 1) {
-		case -1:
-			{
-				break;
-			}
-		case 0x0:
-			{
-				byte param1;
-				byte param2;
-				int16 param3;
+		case -1: {
+			break;
+		}
+		case 0x0: {
+			byte param1;
+			byte param2;
+			int16 param3;
 
-				param1 = *(localScriptPtr + position);
-				position++;
+			param1 = *(localScriptPtr + position);
+			position++;
 
-				param2 = *(localScriptPtr + position);
-				position++;
+			param2 = *(localScriptPtr + position);
+			position++;
 
-				param3 = READ_BE_UINT16(localScriptPtr + position);
-				position += 2;
+			param3 = READ_BE_UINT16(localScriptPtr + position);
+			position += 2;
 
-				sprintf(lineBuffer, "obj[%d]%s = %d\n", param1, getObjPramName(param2), param3);
+			sprintf(lineBuffer, "obj[%d]%s = %d\n", param1, getObjPramName(param2), param3);
 
-				break;
-			}
-		case 0x1:
-			{
-				byte param1;
-				byte param2;
-				byte param3;
+			break;
+		}
+		case 0x1: {
+			byte param1;
+			byte param2;
+			byte param3;
 
-				param1 = *(localScriptPtr + position);
-				position++;
+			param1 = *(localScriptPtr + position);
+			position++;
 
-				param2 = *(localScriptPtr + position);
-				position++;
+			param2 = *(localScriptPtr + position);
+			position++;
 
-				param3 = *(localScriptPtr + position);
-				position++;
+			param3 = *(localScriptPtr + position);
+			position++;
 
-				sprintf(lineBuffer, "var[%d]=obj[%d]%s\n", param3, param1, getObjPramName(param2));
-				break;
-			}
+			sprintf(lineBuffer, "var[%d]=obj[%d]%s\n", param3, param1, getObjPramName(param2));
+			break;
+		}
 		case 0x2:
 		case 0x3:
 		case 0x4:
 		case 0x5:
-		case 0x6:
-			{
-				byte param1;
-				byte param2;
-				int16 param3;
-
-				param1 = *(localScriptPtr + position);
-				position++;
-
-				param2 = *(localScriptPtr + position);
-				position++;
-
-				param3 = READ_BE_UINT16(localScriptPtr + position);
-				position += 2;
-
-				if (opcode - 1 == 0x2) {
-					sprintf(lineBuffer, "obj[%d]%s+=%d\n", param1, getObjPramName(param2), param3);
-				} else if (opcode - 1 == 0x3) {
-					sprintf(lineBuffer, "obj[%d]%s-=%d\n", param1, getObjPramName(param2), param3);
-				} else if (opcode - 1 == 0x4) {
-					sprintf(lineBuffer, "obj[%d]%s+=obj[%d]%s\n", param1, getObjPramName(param2), param3, getObjPramName(param2));
-				} else if (opcode - 1 == 0x5) {
-					sprintf(lineBuffer, "obj[%d]%s-=obj[%d]%s\n", param1, getObjPramName(param2), param3, getObjPramName(param2));
-				} else if (opcode - 1 == 0x6) {
-					sprintf(compareString1, "obj[%d]%s", param1, getObjPramName(param2));
-					sprintf(compareString2, "%d", param3);
-				}
-				break;
+		case 0x6: {
+			byte param1;
+			byte param2;
+			int16 param3;
+
+			param1 = *(localScriptPtr + position);
+			position++;
+
+			param2 = *(localScriptPtr + position);
+			position++;
+
+			param3 = READ_BE_UINT16(localScriptPtr + position);
+			position += 2;
+
+			if (opcode - 1 == 0x2) {
+				sprintf(lineBuffer, "obj[%d]%s+=%d\n", param1, getObjPramName(param2), param3);
+			} else if (opcode - 1 == 0x3) {
+				sprintf(lineBuffer, "obj[%d]%s-=%d\n", param1, getObjPramName(param2), param3);
+			} else if (opcode - 1 == 0x4) {
+				sprintf(lineBuffer, "obj[%d]%s+=obj[%d]%s\n", param1, getObjPramName(param2), param3, getObjPramName(param2));
+			} else if (opcode - 1 == 0x5) {
+				sprintf(lineBuffer, "obj[%d]%s-=obj[%d]%s\n", param1, getObjPramName(param2), param3, getObjPramName(param2));
+			} else if (opcode - 1 == 0x6) {
+				sprintf(compareString1, "obj[%d]%s", param1, getObjPramName(param2));
+				sprintf(compareString2, "%d", param3);
 			}
+			break;
+		}
 		case 0x7:
-		case 0x8:
-			{
-				byte param1;
-				int16 param2;
-				int16 param3;
-				int16 param4;
-				int16 param5;
+		case 0x8: {
+			byte param1;
+			int16 param2;
+			int16 param3;
+			int16 param4;
+			int16 param5;
 
-				param1 = *(localScriptPtr + position);
-				position++;
+			param1 = *(localScriptPtr + position);
+			position++;
 
-				param2 = READ_BE_UINT16(localScriptPtr + position);
-				position += 2;
+			param2 = READ_BE_UINT16(localScriptPtr + position);
+			position += 2;
 
-				param3 = READ_BE_UINT16(localScriptPtr + position);
-				position += 2;
+			param3 = READ_BE_UINT16(localScriptPtr + position);
+			position += 2;
 
-				param4 = READ_BE_UINT16(localScriptPtr + position);
-				position += 2;
+			param4 = READ_BE_UINT16(localScriptPtr + position);
+			position += 2;
 
-				param5 = READ_BE_UINT16(localScriptPtr + position);
-				position += 2;
+			param5 = READ_BE_UINT16(localScriptPtr + position);
+			position += 2;
 
-				if (opcode - 1 == 0x7) {
-					sprintf(lineBuffer, "setupObject(Idx:%d,X:%d,Y:%d,mask:%d,frame:%d)\n", param1, param2, param3, param4, param5);
-				} else if (opcode - 1 == 0x8) {
-					sprintf(lineBuffer, "checkCollision(%d,%d,%d,%d,%d)\n", param1, param2, param3, param4, param5);
-				}
-				break;
+			if (opcode - 1 == 0x7) {
+				sprintf(lineBuffer, "setupObject(Idx:%d,X:%d,Y:%d,mask:%d,frame:%d)\n", param1, param2, param3, param4, param5);
+			} else if (opcode - 1 == 0x8) {
+				sprintf(lineBuffer, "checkCollision(%d,%d,%d,%d,%d)\n", param1, param2, param3, param4, param5);
 			}
-		case 0x9:
-			{
-				byte param1;
-				int16 param2;
+			break;
+		}
+		case 0x9: {
+			byte param1;
+			int16 param2;
 
-				param1 = *(localScriptPtr + position);
-				position++;
+			param1 = *(localScriptPtr + position);
+			position++;
 
-				param2 = *(localScriptPtr + position);
-				position++;
+			param2 = *(localScriptPtr + position);
+			position++;
 
-				if (param2) {
-					byte param3;
-
-					param3 = *(localScriptPtr + position);
-					position++;
-
-					if (param2 == 1) {
-						sprintf(lineBuffer, "var[%d]=var[%d]\n", param1, param3);
-					} else if (param2 == 2) {
-						sprintf(lineBuffer, "var[%d]=globalVar[%d]\n", param1, param3);
-					} else if (param2 == 3) {
-						sprintf(lineBuffer, "var[%d]=mouse.X\n", param1);
-					} else if (param2 == 4) {
-						sprintf(lineBuffer, "var[%d]=mouse.Y\n", param1);
-					} else if (param2 == 5) {
-						sprintf(lineBuffer, "var[%d]=rand() mod %d\n", param1, param3);
-					} else if (param2 == 8) {
-						sprintf(lineBuffer, "var[%d]=file[%d].packedSize\n", param1, param3);
-					} else if (param2 == 9) {
-						sprintf(lineBuffer, "var[%d]=file[%d].unpackedSize\n", param1, param3);
-					} else {
-						error("decompileScript: 0x09: param2 = %d", param2);
-					}
-				} else {
-					int16 param3;
+			if (param2) {
+				byte param3;
 
-					param3 = READ_BE_UINT16(localScriptPtr + position);
-					position += 2;
+				param3 = *(localScriptPtr + position);
+				position++;
 
-					sprintf(lineBuffer, "var[%d]=%d\n", param1, param3);
+				if (param2 == 1) {
+					sprintf(lineBuffer, "var[%d]=var[%d]\n", param1, param3);
+				} else if (param2 == 2) {
+					sprintf(lineBuffer, "var[%d]=globalVar[%d]\n", param1, param3);
+				} else if (param2 == 3) {
+					sprintf(lineBuffer, "var[%d]=mouse.X\n", param1);
+				} else if (param2 == 4) {
+					sprintf(lineBuffer, "var[%d]=mouse.Y\n", param1);
+				} else if (param2 == 5) {
+					sprintf(lineBuffer, "var[%d]=rand() mod %d\n", param1, param3);
+				} else if (param2 == 8) {
+					sprintf(lineBuffer, "var[%d]=file[%d].packedSize\n", param1, param3);
+				} else if (param2 == 9) {
+					sprintf(lineBuffer, "var[%d]=file[%d].unpackedSize\n", param1, param3);
+				} else {
+					error("decompileScript: 0x09: param2 = %d", param2);
 				}
+			} else {
+				int16 param3;
 
-				break;
+				param3 = READ_BE_UINT16(localScriptPtr + position);
+				position += 2;
+
+				sprintf(lineBuffer, "var[%d]=%d\n", param1, param3);
 			}
+
+			break;
+		}
 		case 0xA:
 		case 0xB:
 		case 0xC:
-		case 0xD:
-			{
-				byte param1;
-				byte param2;
+		case 0xD: {
+			byte param1;
+			byte param2;
 
-				param1 = *(localScriptPtr + position);
-				position++;
+			param1 = *(localScriptPtr + position);
+			position++;
 
-				param2 = *(localScriptPtr + position);
+			param2 = *(localScriptPtr + position);
+			position++;
+
+			if (param2) {
+				byte param3;
+
+				param3 = *(localScriptPtr + position);
 				position++;
 
-				if (param2) {
-					byte param3;
+				if (opcode - 1 == 0xA) {
+					sprintf(lineBuffer, "var[%d]+=var[%d]\n", param1, param3);
+				} else if (opcode - 1 == 0xB) {
+					sprintf(lineBuffer, "var[%d]-=var[%d]\n", param1, param3);
+				} else if (opcode - 1 == 0xC) {
+					sprintf(lineBuffer, "var[%d]*=var[%d]\n", param1, param3);
+				} else if (opcode - 1 == 0xD) {
+					sprintf(lineBuffer, "var[%d]/=var[%d]\n", param1, param3);
+				}
+			} else {
+				int16 param3;
 
-					param3 = *(localScriptPtr + position);
-					position++;
+				param3 = READ_BE_UINT16(localScriptPtr +  position);
+				position += 2;
 
-					if (opcode - 1 == 0xA) {
-						sprintf(lineBuffer, "var[%d]+=var[%d]\n", param1, param3);
-					} else if (opcode - 1 == 0xB) {
-						sprintf(lineBuffer, "var[%d]-=var[%d]\n", param1, param3);
-					} else if (opcode - 1 == 0xC) {
-						sprintf(lineBuffer, "var[%d]*=var[%d]\n", param1, param3);
-					} else if (opcode - 1 == 0xD) {
-						sprintf(lineBuffer, "var[%d]/=var[%d]\n", param1, param3);
-					}
-				} else {
-					int16 param3;
-
-					param3 = READ_BE_UINT16(localScriptPtr +  position);
-					position += 2;
-
-					if (opcode - 1 == 0xA) {
-						sprintf(lineBuffer, "var[%d]+=%d\n", param1, param3);
-					} else if (opcode - 1 == 0xB) {
-						sprintf(lineBuffer, "var[%d]-=%d\n", param1, param3);
-					} else if (opcode - 1 == 0xC) {
-						sprintf(lineBuffer, "var[%d]*=%d\n", param1, param3);
-					} else if (opcode - 1 == 0xD) {
-						sprintf(lineBuffer, "var[%d]/=%d\n", param1, param3);
-					}
+				if (opcode - 1 == 0xA) {
+					sprintf(lineBuffer, "var[%d]+=%d\n", param1, param3);
+				} else if (opcode - 1 == 0xB) {
+					sprintf(lineBuffer, "var[%d]-=%d\n", param1, param3);
+				} else if (opcode - 1 == 0xC) {
+					sprintf(lineBuffer, "var[%d]*=%d\n", param1, param3);
+				} else if (opcode - 1 == 0xD) {
+					sprintf(lineBuffer, "var[%d]/=%d\n", param1, param3);
 				}
-				break;
 			}
-		case 0xE:
-			{
-				byte param1;
-				byte param2;
+			break;
+		}
+		case 0xE: {
+			byte param1;
+			byte param2;
 
-				param1 = *(localScriptPtr + position);
-				position++;
+			param1 = *(localScriptPtr + position);
+			position++;
 
-				param2 = *(localScriptPtr + position);
-				position++;
+			param2 = *(localScriptPtr + position);
+			position++;
 
-				if (param2) {
-					byte param3;
+			if (param2) {
+				byte param3;
 
-					param3 = *(localScriptPtr + position);
-					position++;
+				param3 = *(localScriptPtr + position);
+				position++;
 
-					if (param2 == 1) {
-						sprintf(compareString1, "var[%d]", param1);
-						sprintf(compareString2, "var[%d]", param3);
+				if (param2 == 1) {
+					sprintf(compareString1, "var[%d]", param1);
+					sprintf(compareString2, "var[%d]", param3);
 
-					} else if (param2 == 2) {
-						sprintf(compareString1, "var[%d]", param1);
-						sprintf(compareString2, "globalVar[%d]", param3);
-					} else {
-						error("decompileScript: 0x0E: param2 = %d", param2);
-					}
+				} else if (param2 == 2) {
+					sprintf(compareString1, "var[%d]", param1);
+					sprintf(compareString2, "globalVar[%d]", param3);
 				} else {
-					int16 param3;
+					error("decompileScript: 0x0E: param2 = %d", param2);
+				}
+			} else {
+				int16 param3;
 
-					param3 = READ_BE_UINT16(localScriptPtr + position);
-					position += 2;
+				param3 = READ_BE_UINT16(localScriptPtr + position);
+				position += 2;
 
-					sprintf(compareString1, "var[%d]", param1);
-					sprintf(compareString2, "%d", param3);
-				}
-				break;
+				sprintf(compareString1, "var[%d]", param1);
+				sprintf(compareString2, "%d", param3);
 			}
-		case 0xF:
-			{
-				byte param1;
-				byte param2;
-				byte param3;
+			break;
+		}
+		case 0xF: {
+			byte param1;
+			byte param2;
+			byte param3;
 
-				param1 = *(localScriptPtr + position);
-				position++;
+			param1 = *(localScriptPtr + position);
+			position++;
 
-				param2 = *(localScriptPtr + position);
-				position++;
+			param2 = *(localScriptPtr + position);
+			position++;
 
-				param3 = *(localScriptPtr + position);
-				position++;
+			param3 = *(localScriptPtr + position);
+			position++;
 
-				sprintf(lineBuffer, "obj[%d]%s=var[%d]\n", param1, getObjPramName(param2), param3);
+			sprintf(lineBuffer, "obj[%d]%s=var[%d]\n", param1, getObjPramName(param2), param3);
 
-				break;
-			}
+			break;
+		}
 		case 0x13:
 		case 0x14:
 		case 0x15:
 		case 0x16:
 		case 0x17:
 		case 0x18:
-		case 0x19:
-			{
-				byte param;
-
-				param = *(localScriptPtr + position);
-				position++;
-
-				if (opcode - 1 == 0x13) {
-					sprintf(lineBuffer, "loadMask0(%d)\n", param);
-				} else if (opcode - 1 == 0x14) {
-					sprintf(lineBuffer, "unloadMask0(%d)\n", param);
-				} else if (opcode - 1 == 0x15) {
-					sprintf(lineBuffer, "OP_15(%d)\n", param);
-				} else if (opcode - 1 == 0x16) {
-					sprintf(lineBuffer, "loadMask1(%d)\n", param);
-				} else if (opcode - 1 == 0x17) {
-					sprintf(lineBuffer, "unloadMask0(%d)\n", param);
-				} else if (opcode - 1 == 0x18) {
-					sprintf(lineBuffer, "loadMask4(%d)\n", param);
-				} else if (opcode - 1 == 0x19) {
-					sprintf(lineBuffer, "unloadMask4(%d)\n", param);
-				}
-				break;
+		case 0x19: {
+			byte param;
+
+			param = *(localScriptPtr + position);
+			position++;
+
+			if (opcode - 1 == 0x13) {
+				sprintf(lineBuffer, "loadMask0(%d)\n", param);
+			} else if (opcode - 1 == 0x14) {
+				sprintf(lineBuffer, "unloadMask0(%d)\n", param);
+			} else if (opcode - 1 == 0x15) {
+				sprintf(lineBuffer, "OP_15(%d)\n", param);
+			} else if (opcode - 1 == 0x16) {
+				sprintf(lineBuffer, "loadMask1(%d)\n", param);
+			} else if (opcode - 1 == 0x17) {
+				sprintf(lineBuffer, "unloadMask0(%d)\n", param);
+			} else if (opcode - 1 == 0x18) {
+				sprintf(lineBuffer, "loadMask4(%d)\n", param);
+			} else if (opcode - 1 == 0x19) {
+				sprintf(lineBuffer, "unloadMask4(%d)\n", param);
 			}
-		case 0x1A:
-			{
-				byte param;
+			break;
+		}
+		case 0x1A: {
+			byte param;
 
-				param = *(localScriptPtr + position);
-				position++;
+			param = *(localScriptPtr + position);
+			position++;
 
-				sprintf(lineBuffer, "OP_1A(%d)\n", param);
+			sprintf(lineBuffer, "OP_1A(%d)\n", param);
 
-				break;
-			}
-		case 0x1B:
-			{
-				sprintf(lineBuffer, "bgIncrustList.clear()\n");
-				break;
-			}
-		case 0x1D:
-			{
-				byte param;
+			break;
+		}
+		case 0x1B: {
+			sprintf(lineBuffer, "bgIncrustList.clear()\n");
+			break;
+		}
+		case 0x1D: {
+			byte param;
 
-				param = *(localScriptPtr + position);
-				position++;
+			param = *(localScriptPtr + position);
+			position++;
 
-				sprintf(lineBuffer, "label(%d)\n", param);
+			sprintf(lineBuffer, "label(%d)\n", param);
 
-				break;
-			}
-		case 0x1E:
-			{
-				byte param;
+			break;
+		}
+		case 0x1E: {
+			byte param;
 
-				param = *(localScriptPtr + position);
-				position++;
+			param = *(localScriptPtr + position);
+			position++;
 
-				sprintf(lineBuffer, "goto(%d)\n", param);
+			sprintf(lineBuffer, "goto(%d)\n", param);
 
-				break;
-			}
+			break;
+		}
 		// If cases
 		case 0x1F:
 		case 0x20:
 		case 0x21:
 		case 0x22:
 		case 0x23:
-		case 0x24:
-			{
-				byte param;
-
-				param = *(localScriptPtr + position);
-				position++;
-
-				if (opcode - 1 == 0x1F) {
-					sprintf(lineBuffer, "if(%s>%s) goto(%d)\n", compareString1, compareString2, param);
-				} else if (opcode - 1 == 0x20) {
-					sprintf(lineBuffer, "if(%s>=%s) goto(%d)\n", compareString1, compareString2, param);
-				} else if (opcode - 1 == 0x21) {
-					sprintf(lineBuffer, "if(%s<%s) goto(%d)\n", compareString1, compareString2, param);
-				} else if (opcode - 1 == 0x22) {
-					sprintf(lineBuffer, "if(%s<=%s) goto(%d)\n", compareString1, compareString2, param);
-				} else if (opcode - 1 == 0x23) {
-					sprintf(lineBuffer, "if(%s==%s) goto(%d)\n", compareString1, compareString2, param);
-				} else if (opcode - 1 == 0x24) {
-					sprintf(lineBuffer, "if(%s!=%s) goto(%d)\n", compareString1, compareString2, param);
-				}
-				break;
+		case 0x24: {
+			byte param;
+
+			param = *(localScriptPtr + position);
+			position++;
+
+			if (opcode - 1 == 0x1F) {
+				sprintf(lineBuffer, "if(%s>%s) goto(%d)\n", compareString1, compareString2, param);
+			} else if (opcode - 1 == 0x20) {
+				sprintf(lineBuffer, "if(%s>=%s) goto(%d)\n", compareString1, compareString2, param);
+			} else if (opcode - 1 == 0x21) {
+				sprintf(lineBuffer, "if(%s<%s) goto(%d)\n", compareString1, compareString2, param);
+			} else if (opcode - 1 == 0x22) {
+				sprintf(lineBuffer, "if(%s<=%s) goto(%d)\n", compareString1, compareString2, param);
+			} else if (opcode - 1 == 0x23) {
+				sprintf(lineBuffer, "if(%s==%s) goto(%d)\n", compareString1, compareString2, param);
+			} else if (opcode - 1 == 0x24) {
+				sprintf(lineBuffer, "if(%s!=%s) goto(%d)\n", compareString1, compareString2, param);
 			}
-		case 0x25:
-			{
-				byte param;
+			break;
+		}
+		case 0x25: {
+			byte param;
 
-				param = *(localScriptPtr + position);
-				position++;
+			param = *(localScriptPtr + position);
+			position++;
 
-				sprintf(lineBuffer, "removeLabel(%d)\n", param);
+			sprintf(lineBuffer, "removeLabel(%d)\n", param);
 
-				break;
-			}
-		case 0x26:
-			{
-				byte param1;
-				byte param2;
+			break;
+		}
+		case 0x26: {
+			byte param1;
+			byte param2;
 
-				param1 = *(localScriptPtr + position);
-				position++;
-				param2 = *(localScriptPtr + position);
-				position++;
+			param1 = *(localScriptPtr + position);
+			position++;
+			param2 = *(localScriptPtr + position);
+			position++;
 
-				sprintf(lineBuffer, "loop(--var[%d]) -> label(%d)\n", param1, param2);
+			sprintf(lineBuffer, "loop(--var[%d]) -> label(%d)\n", param1, param2);
 
-				break;
-			}
+			break;
+		}
 		case 0x31:
-		case 0x32:
-			{
-				byte param;
+		case 0x32: {
+			byte param;
 
-				param = *(localScriptPtr + position);
-				position++;
+			param = *(localScriptPtr + position);
+			position++;
 
-				if (opcode - 1 == 0x31) {
-					sprintf(lineBuffer, "startGlobalScript(%d)\n", param);
-				} else if (opcode - 1 == 0x32) {
-					sprintf(lineBuffer, "endGlobalScript(%d)\n", param);
-				}
-				break;
+			if (opcode - 1 == 0x31) {
+				sprintf(lineBuffer, "startGlobalScript(%d)\n", param);
+			} else if (opcode - 1 == 0x32) {
+				sprintf(lineBuffer, "endGlobalScript(%d)\n", param);
 			}
+			break;
+		}
 		case 0x3B:
 		case 0x3C:
 		case 0x3D:
-		case OP_loadPart:
-			{
-				if (opcode - 1 == 0x3B) {
-					sprintf(lineBuffer, "loadResource(%s)\n", localScriptPtr + position);
-				} else if (opcode - 1 == 0x3C) {
-					sprintf(lineBuffer, "loadBg(%s)\n",	localScriptPtr + position);
-				} else if (opcode - 1 == 0x3D) {
-					sprintf(lineBuffer, "loadCt(%s)\n", localScriptPtr + position);
-				} else if (opcode - 1 == OP_loadPart) {
-					sprintf(lineBuffer, "loadPart(%s)\n", localScriptPtr + position);
-				}
-
-				position += strlen((const char *)localScriptPtr + position) + 1;
-				break;
-			}
-		case 0x40:
-			{
-				sprintf(lineBuffer, "closePart()\n");
-				break;
-			}
-		case OP_loadNewPrcName:
-			{
-				byte param;
+		case OP_loadPart: {
+			if (opcode - 1 == 0x3B) {
+				sprintf(lineBuffer, "loadResource(%s)\n", localScriptPtr + position);
+			} else if (opcode - 1 == 0x3C) {
+				sprintf(lineBuffer, "loadBg(%s)\n", localScriptPtr + position);
+			} else if (opcode - 1 == 0x3D) {
+				sprintf(lineBuffer, "loadCt(%s)\n", localScriptPtr + position);
+			} else if (opcode - 1 == OP_loadPart) {
+				sprintf(lineBuffer, "loadPart(%s)\n", localScriptPtr + position);
+			}
+
+			position += strlen((const char *)localScriptPtr + position) + 1;
+			break;
+		}
+		case 0x40: {
+			sprintf(lineBuffer, "closePart()\n");
+			break;
+		}
+		case OP_loadNewPrcName: {
+			byte param;
 
-				param = *(localScriptPtr + position);
-				position++;
+			param = *(localScriptPtr + position);
+			position++;
 
-				sprintf(lineBuffer, "loadPrc(%d,%s)\n", param, localScriptPtr + position);
+			sprintf(lineBuffer, "loadPrc(%d,%s)\n", param, localScriptPtr + position);
 
-				position += strlen((const char *)localScriptPtr + position) + 1;
-				break;
-			}
-		case OP_requestCheckPendingDataLoad:	// nop
-			{
-				sprintf(lineBuffer, "requestCheckPendingDataLoad()\n");
-				break;
-			}
-		case 0x45:
-			{
-				sprintf(lineBuffer, "blitAndFade()\n");
-				break;
-			}
-		case 0x46:
-			{
-				sprintf(lineBuffer, "fadeToBlack()\n");
-				break;
-			}
-		case 0x47:
-			{
-				byte param1;
-				byte param2;
-				int16 param3;
-				int16 param4;
-				int16 param5;
+			position += strlen((const char *)localScriptPtr + position) + 1;
+			break;
+		}
+		case OP_requestCheckPendingDataLoad: {  // nop
+			sprintf(lineBuffer, "requestCheckPendingDataLoad()\n");
+			break;
+		}
+		case 0x45: {
+			sprintf(lineBuffer, "blitAndFade()\n");
+			break;
+		}
+		case 0x46: {
+			sprintf(lineBuffer, "fadeToBlack()\n");
+			break;
+		}
+		case 0x47: {
+			byte param1;
+			byte param2;
+			int16 param3;
+			int16 param4;
+			int16 param5;
 
-				param1 = *(localScriptPtr + position);
-				position++;
+			param1 = *(localScriptPtr + position);
+			position++;
 
-				param2 = *(localScriptPtr + position);
-				position++;
+			param2 = *(localScriptPtr + position);
+			position++;
 
-				param3 = READ_BE_UINT16(localScriptPtr + position);
-				position += 2;
+			param3 = READ_BE_UINT16(localScriptPtr + position);
+			position += 2;
 
-				param4 = READ_BE_UINT16(localScriptPtr + position);
-				position += 2;
+			param4 = READ_BE_UINT16(localScriptPtr + position);
+			position += 2;
 
-				param5 = READ_BE_UINT16(localScriptPtr + position);
-				position += 2;
+			param5 = READ_BE_UINT16(localScriptPtr + position);
+			position += 2;
 
-				sprintf(lineBuffer, "transformPaletteRange(%d,%d,%d,%d,%d)\n", param1, param2, param3, param4, param5);
+			sprintf(lineBuffer, "transformPaletteRange(%d,%d,%d,%d,%d)\n", param1, param2, param3, param4, param5);
 
-				break;
-			}
-		case 0x49:
-			{
-				byte param;
+			break;
+		}
+		case 0x49: {
+			byte param;
 
-				param = *(localScriptPtr + position);
-				position++;
+			param = *(localScriptPtr + position);
+			position++;
 
-				sprintf(lineBuffer, "setDefaultMenuBgColor(%d)\n", param);
+			sprintf(lineBuffer, "setDefaultMenuBgColor(%d)\n", param);
 
-				break;
-			}
-		case 0x4F:
-			{
-				sprintf(lineBuffer, "break()\n");
-				exitScript = 1;
-				break;
-			}
-		case 0x50:
-			{
-				sprintf(lineBuffer, "endScript()\n\n");
-				break;
-			}
-		case 0x51:
-			{
-				byte param1;
-				int16 param2;
-				int16 param3;
-				int16 param4;
-				int16 param5;
+			break;
+		}
+		case 0x4F: {
+			sprintf(lineBuffer, "break()\n");
+			exitScript = 1;
+			break;
+		}
+		case 0x50: {
+			sprintf(lineBuffer, "endScript()\n\n");
+			break;
+		}
+		case 0x51: {
+			byte param1;
+			int16 param2;
+			int16 param3;
+			int16 param4;
+			int16 param5;
 
-				param1 = *(localScriptPtr + position);
-				position++;
+			param1 = *(localScriptPtr + position);
+			position++;
 
-				param2 = READ_BE_UINT16(localScriptPtr + position);
-				position += 2;
+			param2 = READ_BE_UINT16(localScriptPtr + position);
+			position += 2;
 
-				param3 = READ_BE_UINT16(localScriptPtr + position);
-				position += 2;
+			param3 = READ_BE_UINT16(localScriptPtr + position);
+			position += 2;
 
-				param4 = READ_BE_UINT16(localScriptPtr + position);
-				position += 2;
+			param4 = READ_BE_UINT16(localScriptPtr + position);
+			position += 2;
 
-				param5 = READ_BE_UINT16(localScriptPtr + position);
-				position += 2;
+			param5 = READ_BE_UINT16(localScriptPtr + position);
+			position += 2;
 
-				sprintf(lineBuffer, "message(%d,%d,%d,%d,%d)\n", param1, param2, param3, param4, param5);
+			sprintf(lineBuffer, "message(%d,%d,%d,%d,%d)\n", param1, param2, param3, param4, param5);
 
-				break;
-			}
+			break;
+		}
 		case 0x52:
-		case 0x53:
-			{
-				byte param1;
-				byte param2;
+		case 0x53: {
+			byte param1;
+			byte param2;
 
-				param1 = *(localScriptPtr + position);
-				position++;
+			param1 = *(localScriptPtr + position);
+			position++;
 
-				param2 = *(localScriptPtr + position);
-				position++;
+			param2 = *(localScriptPtr + position);
+			position++;
 
-				if (param2) {
-					byte param3;
-
-					param3 = *(localScriptPtr + position);
-					position++;
-
-					if (param2 == 1) {
-						if (opcode - 1 == 0x52) {
-							sprintf(lineBuffer, "globalVar[%d] = var[%d]\n", param1, param3);
-						} else if (opcode - 1 == 0x53) {
-							sprintf(compareString1, "globalVar[%d]", param1);
-							sprintf(compareString2, "var[%d]", param3);
-						}
-					} else if (param2 == 2) {
-						if (opcode - 1 == 0x52) {
-							sprintf(lineBuffer, "globalVar[%d] = globalVar[%d]\n", param1, param3);
-						} else if (opcode - 1 == 0x53) {
-							sprintf(compareString1, "globalVar[%d]", param1);
-							sprintf(compareString2, "globalVar[%d]", param3);
-						}
-					} else {
-						if (opcode - 1 == 0x52) {
-							error("decompileScript: 0x52: param2 = %d", param2);
-						} else if (opcode - 1 == 0x53) {
-							error("decompileScript: 0x53: param2 = %d", param2);
-						}
-					}
-				} else {
-					int16 param3;
+			if (param2) {
+				byte param3;
 
-					param3 = READ_BE_UINT16(localScriptPtr + position);
-					position += 2;
+				param3 = *(localScriptPtr + position);
+				position++;
 
+				if (param2 == 1) {
 					if (opcode - 1 == 0x52) {
-						sprintf(lineBuffer, "globalVar[%d] = %d\n", param1, param3);
+						sprintf(lineBuffer, "globalVar[%d] = var[%d]\n", param1, param3);
 					} else if (opcode - 1 == 0x53) {
 						sprintf(compareString1, "globalVar[%d]", param1);
-						sprintf(compareString2, "%d", param3);
+						sprintf(compareString2, "var[%d]", param3);
+					}
+				} else if (param2 == 2) {
+					if (opcode - 1 == 0x52) {
+						sprintf(lineBuffer, "globalVar[%d] = globalVar[%d]\n", param1, param3);
+					} else if (opcode - 1 == 0x53) {
+						sprintf(compareString1, "globalVar[%d]", param1);
+						sprintf(compareString2, "globalVar[%d]", param3);
+					}
+				} else {
+					if (opcode - 1 == 0x52) {
+						error("decompileScript: 0x52: param2 = %d", param2);
+					} else if (opcode - 1 == 0x53) {
+						error("decompileScript: 0x53: param2 = %d", param2);
 					}
 				}
-				break;
-			}
-		case 0x59:
-			{
-				sprintf(lineBuffer, "comment: %s\n", localScriptPtr + position);
+			} else {
+				int16 param3;
 
-				position += strlen((const char *)localScriptPtr + position);
-				break;
+				param3 = READ_BE_UINT16(localScriptPtr + position);
+				position += 2;
+
+				if (opcode - 1 == 0x52) {
+					sprintf(lineBuffer, "globalVar[%d] = %d\n", param1, param3);
+				} else if (opcode - 1 == 0x53) {
+					sprintf(compareString1, "globalVar[%d]", param1);
+					sprintf(compareString2, "%d", param3);
+				}
 			}
-		case 0x5A:
-			{
-				byte param1;
-				byte param2;
+			break;
+		}
+		case 0x59: {
+			sprintf(lineBuffer, "comment: %s\n", localScriptPtr + position);
 
-				param1 = *(localScriptPtr + position);
-				position++;
+			position += strlen((const char *)localScriptPtr + position);
+			break;
+		}
+		case 0x5A: {
+			byte param1;
+			byte param2;
 
-				param2 = *(localScriptPtr + position);
-				position++;
+			param1 = *(localScriptPtr + position);
+			position++;
 
-				sprintf(lineBuffer, "freePartRang(%d,%d)\n", param1, param2);
+			param2 = *(localScriptPtr + position);
+			position++;
 
-				break;
-			}
-		case 0x5B:
-			{
-				sprintf(lineBuffer, "unloadAllMasks()\n");
-				break;
-			}
-		case 0x65:
-			{
-				sprintf(lineBuffer, "setupTableUnk1()\n");
-				break;
-			}
-		case 0x66:
-			{
-				byte param1;
-				int16 param2;
+			sprintf(lineBuffer, "freePartRang(%d,%d)\n", param1, param2);
 
-				param1 = *(localScriptPtr + position);
-				position++;
+			break;
+		}
+		case 0x5B: {
+			sprintf(lineBuffer, "unloadAllMasks()\n");
+			break;
+		}
+		case 0x65: {
+			sprintf(lineBuffer, "setupTableUnk1()\n");
+			break;
+		}
+		case 0x66: {
+			byte param1;
+			int16 param2;
 
-				param2 = READ_BE_UINT16(localScriptPtr + position);
-				position += 2;
+			param1 = *(localScriptPtr + position);
+			position++;
 
-				sprintf(lineBuffer, "tableUnk1[%d] = %d\n", param1, param2);
+			param2 = READ_BE_UINT16(localScriptPtr + position);
+			position += 2;
 
-				break;
-			}
-		case 0x68:
-			{
-				byte param;
+			sprintf(lineBuffer, "tableUnk1[%d] = %d\n", param1, param2);
 
-				param = *(localScriptPtr + position);
-				position++;
+			break;
+		}
+		case 0x68: {
+			byte param;
 
-				sprintf(lineBuffer, "setPlayerCommandPosY(%d)\n", param);
+			param = *(localScriptPtr + position);
+			position++;
 
-				break;
-			}
-		case 0x69:
-			{
-				sprintf(lineBuffer, "allowPlayerInput()\n");
-				break;
-			}
-		case 0x6A:
-			{
-				sprintf(lineBuffer, "disallowPlayerInput()\n");
-				break;
-			}
-		case 0x6B:
-			{
-				byte newDisk;
+			sprintf(lineBuffer, "setPlayerCommandPosY(%d)\n", param);
 
-				newDisk = *(localScriptPtr + position);
-				position++;
+			break;
+		}
+		case 0x69: {
+			sprintf(lineBuffer, "allowPlayerInput()\n");
+			break;
+		}
+		case 0x6A: {
+			sprintf(lineBuffer, "disallowPlayerInput()\n");
+			break;
+		}
+		case 0x6B: {
+			byte newDisk;
 
-				sprintf(lineBuffer, "changeDataDisk(%d)\n", newDisk);
+			newDisk = *(localScriptPtr + position);
+			position++;
 
-				break;
-			}
-		case 0x6D:
-			{
-				sprintf(lineBuffer, "loadDat(%s)\n", localScriptPtr + position);
+			sprintf(lineBuffer, "changeDataDisk(%d)\n", newDisk);
 
-				position += strlen((const char *)localScriptPtr + position) + 1;
-				break;
-			}
-		case 0x6E:	// nop
-			{
-				sprintf(lineBuffer, "updateDat()\n");
-				break;
-			}
-		case 0x6F:
-			{
-				sprintf(lineBuffer, "OP_6F() -> dat related\n");
-				break;
-			}
-		case 0x70:
-			{
-				sprintf(lineBuffer, "stopSample()\n");
-				break;
-			}
-		case 0x79:
-			{
-				byte param;
+			break;
+		}
+		case 0x6D: {
+			sprintf(lineBuffer, "loadDat(%s)\n", localScriptPtr + position);
 
-				param = *(localScriptPtr + position);
-				position++;
+			position += strlen((const char *)localScriptPtr + position) + 1;
+			break;
+		}
+		case 0x6E: { // nop
+			sprintf(lineBuffer, "updateDat()\n");
+			break;
+		}
+		case 0x6F: {
+			sprintf(lineBuffer, "OP_6F() -> dat related\n");
+			break;
+		}
+		case 0x70: {
+			sprintf(lineBuffer, "stopSample()\n");
+			break;
+		}
+		case 0x79: {
+			byte param;
 
-				sprintf(lineBuffer, "disableSystemMenu(%d)\n", param);
+			param = *(localScriptPtr + position);
+			position++;
 
-				break;
-			}
+			sprintf(lineBuffer, "disableSystemMenu(%d)\n", param);
+
+			break;
+		}
 		case 0x77:
-		case 0x78:
-			{
-				byte param1;
-				byte param2;
-				int16 param3;
-				byte param4;
-				int16 param5;
-				int16 param6;
+		case 0x78: {
+			byte param1;
+			byte param2;
+			int16 param3;
+			byte param4;
+			int16 param5;
+			int16 param6;
 
-				param1 = *(localScriptPtr + position);
-				position++;
+			param1 = *(localScriptPtr + position);
+			position++;
 
-				param2 = *(localScriptPtr + position);
-				position++;
+			param2 = *(localScriptPtr + position);
+			position++;
 
-				param3 = READ_BE_UINT16(localScriptPtr + position);
-				position += 2;
+			param3 = READ_BE_UINT16(localScriptPtr + position);
+			position += 2;
 
-				param4 = *(localScriptPtr + position);
-				position++;
+			param4 = *(localScriptPtr + position);
+			position++;
 
-				param5 = READ_BE_UINT16(localScriptPtr + position);
-				position += 2;
+			param5 = READ_BE_UINT16(localScriptPtr + position);
+			position += 2;
 
-				param6 = READ_BE_UINT16(localScriptPtr + position);
-				position += 2;
-
-				if (opcode - 1 == 0x77) {
-					sprintf(lineBuffer, "playSample(%d,%d,%d,%d,%d,%d)\n", param1, param2, param3, param4, param5, param6);
-				} else if (opcode - 1 == 0x78) {
-					sprintf(lineBuffer, "OP_78(%d,%d,%d,%d,%d,%d)\n", param1, param2, param3, param4, param5, param6);
-				}
+			param6 = READ_BE_UINT16(localScriptPtr + position);
+			position += 2;
 
-				break;
+			if (opcode - 1 == 0x77) {
+				sprintf(lineBuffer, "playSample(%d,%d,%d,%d,%d,%d)\n", param1, param2, param3, param4, param5, param6);
+			} else if (opcode - 1 == 0x78) {
+				sprintf(lineBuffer, "playSampleSwapped(%d,%d,%d,%d,%d,%d)\n", param1, param2, param3, param4, param5, param6);
 			}
-		case 0x7A:
-			{
-				byte param;
 
-				param = *(localScriptPtr + position);
-				position++;
+			break;
+		}
+		case 0x7A: {
+			byte param;
 
-				sprintf(lineBuffer, "OP_7A(%d)\n", param);
+			param = *(localScriptPtr + position);
+			position++;
 
-				break;
-			}
-		case 0x7B:	// OS only
-			{
-				byte param;
+			sprintf(lineBuffer, "OP_7A(%d)\n", param);
 
-				param = *(localScriptPtr + position);
-				position++;
+			break;
+		}
+		case 0x7B: { // OS only
+			byte param;
 
-				sprintf(lineBuffer, "OP_7B(%d)\n", param);
+			param = *(localScriptPtr + position);
+			position++;
 
-				break;
-			}
-		case 0x7F:	// OS only
-			{
-				byte param1;
-				byte param2;
-				byte param3;
-				byte param4;
-				int16 param5;
-				int16 param6;
-				int16 param7;
+			sprintf(lineBuffer, "OP_7B(%d)\n", param);
 
-				param1 = *(localScriptPtr + position);
-				position++;
+			break;
+		}
+		case 0x7F: { // OS only
+			byte param1;
+			byte param2;
+			byte param3;
+			byte param4;
+			int16 param5;
+			int16 param6;
+			int16 param7;
 
-				param2 = *(localScriptPtr + position);
-				position++;
+			param1 = *(localScriptPtr + position);
+			position++;
 
-				param3 = *(localScriptPtr + position);
-				position++;
+			param2 = *(localScriptPtr + position);
+			position++;
 
-				param4 = *(localScriptPtr + position);
-				position++;
+			param3 = *(localScriptPtr + position);
+			position++;
 
-				param5 = READ_BE_UINT16(localScriptPtr + position);
-				position += 2;
+			param4 = *(localScriptPtr + position);
+			position++;
 
-				param6 = READ_BE_UINT16(localScriptPtr + position);
-				position += 2;
+			param5 = READ_BE_UINT16(localScriptPtr + position);
+			position += 2;
 
-				param7 = READ_BE_UINT16(localScriptPtr + position);
-				position += 2;
+			param6 = READ_BE_UINT16(localScriptPtr + position);
+			position += 2;
 
-				sprintf(lineBuffer, "OP_7F(%d,%d,%d,%d,%d,%d,%d)\n", param1, param2, param3, param4, param5, param6, param7);
+			param7 = READ_BE_UINT16(localScriptPtr + position);
+			position += 2;
 
-				break;
-			}
-		case 0x80:	// OS only
-			{
-				byte param1;
-				byte param2;
+			sprintf(lineBuffer, "OP_7F(%d,%d,%d,%d,%d,%d,%d)\n", param1, param2, param3, param4, param5, param6, param7);
 
-				param1 = *(localScriptPtr + position);
-				position++;
+			break;
+		}
+		case 0x80: { // OS only
+			byte param1;
+			byte param2;
 
-				param2 = *(localScriptPtr + position);
-				position++;
+			param1 = *(localScriptPtr + position);
+			position++;
 
-				sprintf(lineBuffer, "OP_80(%d,%d)\n", param1, param2);
+			param2 = *(localScriptPtr + position);
+			position++;
 
-				break;
-			}
-		case 0x82:	// OS only
-			{
-				byte param1;
-				byte param2;
-				uint16 param3;
-				uint16 param4;
-				byte param5;
+			sprintf(lineBuffer, "OP_80(%d,%d)\n", param1, param2);
 
-				param1 = *(localScriptPtr + position);
-				position++;
+			break;
+		}
+		case 0x82: { // OS only
+			byte param1;
+			byte param2;
+			uint16 param3;
+			uint16 param4;
+			byte param5;
 
-				param2 = *(localScriptPtr + position);
-				position++;
+			param1 = *(localScriptPtr + position);
+			position++;
 
-				param3 = READ_BE_UINT16(localScriptPtr + position);
-				position += 2;
+			param2 = *(localScriptPtr + position);
+			position++;
 
-				param4 = READ_BE_UINT16(localScriptPtr + position);
-				position += 2;
+			param3 = READ_BE_UINT16(localScriptPtr + position);
+			position += 2;
 
-				param5 = *(localScriptPtr + position);
-				position++;
+			param4 = READ_BE_UINT16(localScriptPtr + position);
+			position += 2;
 
-				sprintf(lineBuffer, "OP_82(%d,%d,%d,%d,%d)\n", param1, param2, param3, param4, param5);
+			param5 = *(localScriptPtr + position);
+			position++;
 
-				break;
-			}
-		case 0x83:	// OS only
-			{
-				byte param1;
-				byte param2;
+			sprintf(lineBuffer, "OP_82(%d,%d,%d,%d,%d)\n", param1, param2, param3, param4, param5);
 
-				param1 = *(localScriptPtr + position);
-				position++;
+			break;
+		}
+		case 0x83: { // OS only
+			byte param1;
+			byte param2;
 
-				param2 = *(localScriptPtr + position);
-				position++;
+			param1 = *(localScriptPtr + position);
+			position++;
 
-				sprintf(lineBuffer, "OP_83(%d,%d)\n", param1, param2);
+			param2 = *(localScriptPtr + position);
+			position++;
 
-				break;
-			}
-		case 0x89:	// OS only
-			{
-				byte param;
+			sprintf(lineBuffer, "OP_83(%d,%d)\n", param1, param2);
 
-				param = *(localScriptPtr + position);
-				position++;
+			break;
+		}
+		case 0x89: { // OS only
+			byte param;
 
-				sprintf(lineBuffer, "if(%s!=%s) goto next label(%d)\n", compareString1, compareString2, param);
+			param = *(localScriptPtr + position);
+			position++;
 
-				break;
-			}
-		case 0x8B:	// OS only
-			{
-				byte param;
+			sprintf(lineBuffer, "if(%s!=%s) goto next label(%d)\n", compareString1, compareString2, param);
 
-				param = *(localScriptPtr + position);
-				position++;
+			break;
+		}
+		case 0x8B: { // OS only
+			byte param;
 
-				sprintf(lineBuffer, "OP_8B(%d)\n", param);
+			param = *(localScriptPtr + position);
+			position++;
 
-				break;
-			}
-		case 0x8C:	// OS only
-			{
-				byte param;
+			sprintf(lineBuffer, "OP_8B(%d)\n", param);
 
-				param = *(localScriptPtr + position);
-				position++;
+			break;
+		}
+		case 0x8C: { // OS only
+			byte param;
 
-				sprintf(lineBuffer, "OP_8C(%d)\n", param);
+			param = *(localScriptPtr + position);
+			position++;
 
-				break;
-			}
-		case 0x8D:	// OS only
-			{
-				int16 param1;
-				int16 param2;
-				int16 param3;
-				int16 param4;
-				int16 param5;
-				int16 param6;
-				int16 param7;
-				int16 param8;
+			sprintf(lineBuffer, "OP_8C(%d)\n", param);
 
-				param1 = READ_BE_UINT16(localScriptPtr + position);
-				position += 2;
+			break;
+		}
+		case 0x8D: { // OS only
+			int16 param1;
+			int16 param2;
+			int16 param3;
+			int16 param4;
+			int16 param5;
+			int16 param6;
+			int16 param7;
+			int16 param8;
 
-				param2 = READ_BE_UINT16(localScriptPtr + position);
-				position += 2;
+			param1 = READ_BE_UINT16(localScriptPtr + position);
+			position += 2;
 
-				param3 = READ_BE_UINT16(localScriptPtr + position);
-				position += 2;
+			param2 = READ_BE_UINT16(localScriptPtr + position);
+			position += 2;
 
-				param4 = READ_BE_UINT16(localScriptPtr + position);
-				position += 2;
+			param3 = READ_BE_UINT16(localScriptPtr + position);
+			position += 2;
 
-				param5 = READ_BE_UINT16(localScriptPtr + position);
-				position += 2;
+			param4 = READ_BE_UINT16(localScriptPtr + position);
+			position += 2;
 
-				param6 = READ_BE_UINT16(localScriptPtr + position);
-				position += 2;
+			param5 = READ_BE_UINT16(localScriptPtr + position);
+			position += 2;
 
-				param7 = READ_BE_UINT16(localScriptPtr + position);
-				position += 2;
+			param6 = READ_BE_UINT16(localScriptPtr + position);
+			position += 2;
 
-				param8 = READ_BE_UINT16(localScriptPtr + position);
-				position += 2;
+			param7 = READ_BE_UINT16(localScriptPtr + position);
+			position += 2;
 
-				sprintf(compareString1, "obj[%d]", param1);
-				sprintf(compareString2, "{%d,%d,%d,%d,%d,%d,%d}", param2, param3, param4, param5, param6, param7, param8);
+			param8 = READ_BE_UINT16(localScriptPtr + position);
+			position += 2;
 
-				break;
-			}
-		case 0x8E:	// OS only
-			{
-				byte param1;
+			sprintf(compareString1, "obj[%d]", param1);
+			sprintf(compareString2, "{%d,%d,%d,%d,%d,%d,%d}", param2, param3, param4, param5, param6, param7, param8);
 
-				param1 = *(localScriptPtr + position);
-				position++;
+			break;
+		}
+		case 0x8E: { // OS only
+			byte param1;
 
-				sprintf(lineBuffer, "ADDBG(%d,%s)\n", param1, localScriptPtr + position);
+			param1 = *(localScriptPtr + position);
+			position++;
 
-				position += strlen((const char *)localScriptPtr + position);
+			sprintf(lineBuffer, "ADDBG(%d,%s)\n", param1, localScriptPtr + position);
 
-				break;
-			}
-		case 0x8F:	// OS only
-			{
-				byte param;
+			position += strlen((const char *)localScriptPtr + position);
 
-				param = *(localScriptPtr + position);
-				position++;
+			break;
+		}
+		case 0x8F: { // OS only
+			byte param;
 
-				sprintf(lineBuffer, "OP_8F(%d)\n", param);
+			param = *(localScriptPtr + position);
+			position++;
 
-				break;
-			}
-		case 0x90:	// OS only
-			{
-				byte param1;
+			sprintf(lineBuffer, "OP_8F(%d)\n", param);
 
-				param1 = *(localScriptPtr + position);
-				position++;
+			break;
+		}
+		case 0x90: { // OS only
+			byte param1;
 
-				sprintf(lineBuffer, "loadABS(%d,%s)\n", param1, localScriptPtr + position);
+			param1 = *(localScriptPtr + position);
+			position++;
 
-				position += strlen((const char *)localScriptPtr + position);
+			sprintf(lineBuffer, "loadABS(%d,%s)\n", param1, localScriptPtr + position);
 
-				break;
-			}
-		case 0x91:	// OS only
-			{
-				byte param;
+			position += strlen((const char *)localScriptPtr + position);
 
-				param = *(localScriptPtr + position);
-				position++;
+			break;
+		}
+		case 0x91: { // OS only
+			byte param;
 
-				sprintf(lineBuffer, "OP_91(%d)\n", param);
+			param = *(localScriptPtr + position);
+			position++;
 
-				break;
-			}
-		case 0x9D:	// OS only
-			{
-				byte param;
+			sprintf(lineBuffer, "OP_91(%d)\n", param);
 
-				param = *(localScriptPtr + position);
-				position++;
+			break;
+		}
+		case 0x9D: { // OS only
+			byte param;
 
-				sprintf(lineBuffer, "OP_9D(%d) -> flip img idx\n", param);
+			param = *(localScriptPtr + position);
+			position++;
 
-				break;
-			}
-		case 0x9E:	// OS only
-			{
-				byte param;
+			sprintf(lineBuffer, "OP_9D(%d) -> flip img idx\n", param);
 
-				param = *(localScriptPtr + position);
-				position++;
+			break;
+		}
+		case 0x9E: { // OS only
+			byte param;
 
-				if (param) {
-					byte param2;
+			param = *(localScriptPtr + position);
+			position++;
 
-					param2 = *(localScriptPtr + position);
-					position++;
+			if (param) {
+				byte param2;
 
-					sprintf(lineBuffer, "OP_9E(%d,%d)\n", param, param2);
-				} else {
-					int16 param2;
+				param2 = *(localScriptPtr + position);
+				position++;
 
-					param2 = READ_BE_UINT16(localScriptPtr + position);
-					position += 2;
+				sprintf(lineBuffer, "OP_9E(%d,%d)\n", param, param2);
+			} else {
+				int16 param2;
 
-					sprintf(lineBuffer, "OP_9E(%d,%d)\n", param, param2);
-				}
+				param2 = READ_BE_UINT16(localScriptPtr + position);
+				position += 2;
 
-				break;
+				sprintf(lineBuffer, "OP_9E(%d,%d)\n", param, param2);
 			}
-		case 0xA0:	// OS only
-			{
-				byte param1;
-				byte param2;
 
-				param1 = *(localScriptPtr + position);
-				position++;
+			break;
+		}
+		case 0xA0: { // OS only
+			byte param1;
+			byte param2;
 
-				param2 = *(localScriptPtr + position);
-				position++;
+			param1 = *(localScriptPtr + position);
+			position++;
 
-				sprintf(lineBuffer, "OP_A0(%d,%d)\n", param1, param2);
+			param2 = *(localScriptPtr + position);
+			position++;
 
-				break;
-			}
-		case 0xA1:	// OS only
-			{
-				byte param1;
-				byte param2;
+			sprintf(lineBuffer, "OP_A0(%d,%d)\n", param1, param2);
 
-				param1 = *(localScriptPtr + position);
-				position++;
+			break;
+		}
+		case 0xA1: { // OS only
+			byte param1;
+			byte param2;
 
-				param2 = *(localScriptPtr + position);
-				position++;
+			param1 = *(localScriptPtr + position);
+			position++;
 
-				sprintf(lineBuffer, "OP_A1(%d,%d)\n", param1, param2);
+			param2 = *(localScriptPtr + position);
+			position++;
 
-				break;
-			}
-		default:
-			{
-				sprintf(lineBuffer, "Unsupported opcode %X in decompileScript\n\n", opcode - 1);
-				position = scriptSize;
-				break;
-			}
+			sprintf(lineBuffer, "OP_A1(%d,%d)\n", param1, param2);
+
+			break;
+		}
+		default: {
+			sprintf(lineBuffer, "Unsupported opcode %X in decompileScript\n\n", opcode - 1);
+			position = scriptSize;
+			break;
+		}
 		}
 
-		// printf(lineBuffer);
+		//printf(lineBuffer);
 		strcpy(decompileBuffer[decompileBufferPosition++], lineBuffer);
 
 		exitScript = 0;
diff --git a/engines/cine/sound.cpp b/engines/cine/sound.cpp
index 52e1cdac7e..10404ae56b 100644
--- a/engines/cine/sound.cpp
+++ b/engines/cine/sound.cpp
@@ -153,7 +153,7 @@ const int AdLibSoundDriver::_freqTable[] = {
 const int AdLibSoundDriver::_freqTableCount = ARRAYSIZE(_freqTable);
 
 const int AdLibSoundDriver::_operatorsTable[] = {
-	0, 1, 2, 3, 4, 5, 8, 9, 10, 11, 12, 13,	16, 17, 18, 19, 20, 21
+	0, 1, 2, 3, 4, 5, 8, 9, 10, 11, 12, 13, 16, 17, 18, 19, 20, 21
 };
 
 const int AdLibSoundDriver::_operatorsTableCount = ARRAYSIZE(_operatorsTable);
@@ -614,7 +614,7 @@ void AdLibSoundDriverADL::playSample(const byte *data, int size, int channel, in
 }
 
 MidiSoundDriverH32::MidiSoundDriverH32(MidiDriver *output)
-    : _output(output), _callback(0), _mutex() {
+	: _output(output), _callback(0), _mutex() {
 }
 
 MidiSoundDriverH32::~MidiSoundDriverH32() {
@@ -731,13 +731,13 @@ void MidiSoundDriverH32::selectInstrument(int channel, int timbreGroup, int timb
 		0x00, 0x00, 0x00,       // offset
 		0x00, // Timbre group   _ timbreGroup * 64 + timbreNumber should be the
 		0x00, // Timbre number /  MT-32 instrument in case timbreGroup is 0 or 1.
-		0x18, // Key shift (= 0) 
+		0x18, // Key shift (= 0)
 		0x32, // Fine tune (= 0)
 		0x0C, // Bender Range
 		0x03, // Assign Mode
 		0x01, // Reverb Switch (= enabled)
 		0x00, // dummy
-		0x00, // Output level 
+		0x00, // Output level
 		0x07, // Panpot (= balanced)
 		0x00, // dummy
 		0x00, // dummy
@@ -998,19 +998,55 @@ void PCSound::stopSound(int channel) {
 }
 
 PaulaSound::PaulaSound(Audio::Mixer *mixer, CineEngine *vm)
-	: Sound(mixer, vm) {
+	: Sound(mixer, vm), _sfxTimer(0), _musicTimer(0), _musicFadeTimer(0) {
 	_moduleStream = 0;
+	// The original is using the following timer frequency:
+	// 0.709379Mhz / 8000 = 88.672375Hz
+	// 1000000 / 88.672375Hz = 11277.46944863us
+	g_system->getTimerManager()->installTimerProc(&PaulaSound::sfxTimerProc, 11277, this, "PaulaSound::sfxTimerProc");
+	// The original is using the following timer frequency:
+	// 0.709379Mhz / 14565 = 48.704359Hz
+	// 1000000 / 48.704359Hz = 20532.04313806us
+	g_system->getTimerManager()->installTimerProc(&PaulaSound::musicTimerProc, 20532, this, "PaulaSound::musicTimerProc");
 }
 
 PaulaSound::~PaulaSound() {
+	Common::StackLock sfxLock(_sfxMutex);
+	g_system->getTimerManager()->removeTimerProc(&PaulaSound::sfxTimerProc);
 	for (int i = 0; i < NUM_CHANNELS; ++i) {
 		stopSound(i);
 	}
+
+	Common::StackLock musicLock(_musicMutex);
+	g_system->getTimerManager()->removeTimerProc(&PaulaSound::musicTimerProc);
 	stopMusic();
 }
 
 void PaulaSound::loadMusic(const char *name) {
 	debugC(5, kCineDebugSound, "PaulaSound::loadMusic('%s')", name);
+	for (int i = 0; i < NUM_CHANNELS; ++i) {
+		stopSound(i);
+	}
+
+	// Fade music out when there is music playing.
+	_musicMutex.lock();
+	if (_mixer->isSoundHandleActive(_moduleHandle)) {
+		// Only start fade out when it is not in progress.
+		if (!_musicFadeTimer) {
+			_musicFadeTimer = 1;
+		}
+
+		_musicMutex.unlock();
+		while (_musicFadeTimer != 64) {
+			g_system->delayMillis(50);
+		}
+	} else {
+		_musicMutex.unlock();
+	}
+
+	Common::StackLock lock(_musicMutex);
+	assert(!_mixer->isSoundHandleActive(_moduleHandle));
+
 	if (_vm->getGameType() == GType_FW) {
 		// look for separate files
 		Common::File f;
@@ -1031,54 +1067,135 @@ void PaulaSound::loadMusic(const char *name) {
 
 void PaulaSound::playMusic() {
 	debugC(5, kCineDebugSound, "PaulaSound::playMusic()");
+	Common::StackLock lock(_musicMutex);
+
 	_mixer->stopHandle(_moduleHandle);
 	if (_moduleStream) {
+		_musicFadeTimer = 0;
 		_mixer->playStream(Audio::Mixer::kMusicSoundType, &_moduleHandle, _moduleStream);
 	}
 }
 
 void PaulaSound::stopMusic() {
 	debugC(5, kCineDebugSound, "PaulaSound::stopMusic()");
+	Common::StackLock lock(_musicMutex);
+
 	_mixer->stopHandle(_moduleHandle);
 }
 
 void PaulaSound::fadeOutMusic() {
 	debugC(5, kCineDebugSound, "PaulaSound::fadeOutMusic()");
-	// TODO
-	stopMusic();
+	Common::StackLock lock(_musicMutex);
+
+	_musicFadeTimer = 1;
 }
 
 void PaulaSound::playSound(int channel, int frequency, const uint8 *data, int size, int volumeStep, int stepCount, int volume, int repeat) {
-	// TODO: handle volume slides and repeat
 	debugC(5, kCineDebugSound, "PaulaSound::playSound() channel %d size %d", channel, size);
+	Common::StackLock lock(_sfxMutex);
+	assert(frequency > 0);
+
 	stopSound(channel);
-	size = MIN<int>(size - SPL_HDR_SIZE, READ_BE_UINT16(data + 4));
-	// TODO: consider skipping the header in loadSpl directly
 	if (size > 0) {
 		byte *sound = (byte *)malloc(size);
 		if (sound) {
-			memcpy(sound, data + SPL_HDR_SIZE, size);
-			playSoundChannel(channel, frequency, sound, size, volume);
+			// Create the audio stream
+			memcpy(sound, data, size);
+
+			// Clear the first and last 16 bits like in the original.
+			sound[0] = sound[1] = sound[size - 2] = sound[size - 1] = 0;
+
+			Audio::SeekableAudioStream *stream = Audio::makeRawStream(sound, size, PAULA_FREQ / frequency, 0);
+
+			// Initialize the volume control
+			_channelsTable[channel].initialize(volume, volumeStep, stepCount);
+
+			// Start the sfx
+			_mixer->playStream(Audio::Mixer::kSFXSoundType, &_channelsTable[channel].handle,
+			                   Audio::makeLoopingAudioStream(stream, repeat ? 0 : 1),
+			                   -1, volume * Audio::Mixer::kMaxChannelVolume / 63,
+			                   _channelBalance[channel]);
 		}
 	}
 }
 
 void PaulaSound::stopSound(int channel) {
 	debugC(5, kCineDebugSound, "PaulaSound::stopSound() channel %d", channel);
-	_mixer->stopHandle(_channelsTable[channel]);
+	Common::StackLock lock(_sfxMutex);
+
+	_mixer->stopHandle(_channelsTable[channel].handle);
 }
 
-void PaulaSound::update() {
-	// process volume slides and start sound playback
-	// TODO
+void PaulaSound::sfxTimerProc(void *param) {
+	PaulaSound *sound = (PaulaSound *)param;
+	sound->sfxTimerCallback();
 }
 
-void PaulaSound::playSoundChannel(int channel, int frequency, uint8 *data, int size, int volume) {
-	assert(frequency > 0);
-	frequency = PAULA_FREQ / frequency;
-	Audio::AudioStream *stream = Audio::makeRawStream(data, size, frequency, 0);
-	_mixer->playStream(Audio::Mixer::kSFXSoundType, &_channelsTable[channel], stream);
-	_mixer->setChannelVolume(_channelsTable[channel], volume * Audio::Mixer::kMaxChannelVolume / 63);
+void PaulaSound::sfxTimerCallback() {
+	Common::StackLock lock(_sfxMutex);
+
+	if (_sfxTimer < 6) {
+		++_sfxTimer;
+
+		for (int i = 0; i < NUM_CHANNELS; ++i) {
+			// Only process active channels
+			if (!_mixer->isSoundHandleActive(_channelsTable[i].handle)) {
+				continue;
+			}
+
+			if (_channelsTable[i].curStep) {
+				--_channelsTable[i].curStep;
+			} else {
+				_channelsTable[i].curStep = _channelsTable[i].stepCount;
+				const int volume = CLIP(_channelsTable[i].volume + _channelsTable[i].volumeStep, 0, 63);
+				_channelsTable[i].volume = volume;
+				// Unlike the original we stop silent sounds
+				if (volume) {
+					_mixer->setChannelVolume(_channelsTable[i].handle, volume * Audio::Mixer::kMaxChannelVolume / 63);
+				} else {
+					_mixer->stopHandle(_channelsTable[i].handle);
+				}
+			}
+		}
+	} else {
+		_sfxTimer = 0;
+		// Possible TODO: The original only ever started sounds here. This
+		// should not be noticable though. So we do not do it for now.
+	}
 }
 
+void PaulaSound::musicTimerProc(void *param) {
+	PaulaSound *sound = (PaulaSound *)param;
+	sound->musicTimerCallback();
+}
+
+void PaulaSound::musicTimerCallback() {
+	Common::StackLock lock(_musicMutex);
+
+	++_musicTimer;
+	if (_musicTimer == 6) {
+		_musicTimer = 0;
+		if (_musicFadeTimer) {
+			++_musicFadeTimer;
+			if (_musicFadeTimer == 64) {
+				stopMusic();
+			} else {
+				if (_mixer->isSoundHandleActive(_moduleHandle)) {
+					_mixer->setChannelVolume(_moduleHandle, (64 - _musicFadeTimer) * Audio::Mixer::kMaxChannelVolume / 64);
+				}
+			}
+		}
+	}
+}
+
+const int PaulaSound::_channelBalance[NUM_CHANNELS] = {
+	// L/R/R/L This is according to the Hardware Reference Manual.
+	// TODO: It seems the order is swapped for some Amiga models:
+	// http://www.amiga.org/forums/archive/index.php/t-7862.html
+	// Maybe we should consider using R/L/L/R to match Amiga 500?
+	// This also is a bit more drastic to what WineUAE defaults,
+	// which is only 70% of full panning.
+	-127, 127, 127, -127
+};
+
 } // End of namespace Cine
diff --git a/engines/cine/sound.h b/engines/cine/sound.h
index afc0994a26..fdb183ad34 100644
--- a/engines/cine/sound.h
+++ b/engines/cine/sound.h
@@ -24,6 +24,7 @@
 #define CINE_SOUND_H_
 
 #include "common/util.h"
+#include "common/mutex.h"
 #include "audio/mixer.h"
 
 namespace Audio {
@@ -47,7 +48,6 @@ public:
 
 	virtual void playSound(int channel, int frequency, const uint8 *data, int size, int volumeStep, int stepCount, int volume, int repeat) = 0;
 	virtual void stopSound(int channel) = 0;
-	virtual void update() {}
 
 protected:
 
@@ -91,19 +91,39 @@ public:
 
 	virtual void playSound(int channel, int frequency, const uint8 *data, int size, int volumeStep, int stepCount, int volume, int repeat);
 	virtual void stopSound(int channel);
-	virtual void update();
 
 	enum {
-		PAULA_FREQ = 7093789,
-		NUM_CHANNELS = 4,
-		SPL_HDR_SIZE = 22
+		PAULA_FREQ = 3579545,
+		NUM_CHANNELS = 4
 	};
 
 protected:
 
-	void playSoundChannel(int channel, int frequency, uint8 *data, int size, int volume);
-
-	Audio::SoundHandle _channelsTable[NUM_CHANNELS];
+	struct SfxChannel {
+		Audio::SoundHandle handle;
+		int volume;
+		int volumeStep;
+		int curStep;
+		int stepCount;
+
+		void initialize(int vol, int volStep, int stepCnt) {
+			volume     = vol;
+			volumeStep = volStep;
+			curStep    = stepCount = stepCnt;
+		}
+	};
+	SfxChannel _channelsTable[NUM_CHANNELS];
+	static const int _channelBalance[NUM_CHANNELS];
+	Common::Mutex _sfxMutex;
+	int _sfxTimer;
+	static void sfxTimerProc(void *param);
+	void sfxTimerCallback();
+
+	Common::Mutex _musicMutex;
+	int _musicTimer;
+	int _musicFadeTimer;
+	static void musicTimerProc(void *param);
+	void musicTimerCallback();
 	Audio::SoundHandle _moduleHandle;
 	Audio::AudioStream *_moduleStream;
 };
diff --git a/engines/cine/texte.cpp b/engines/cine/texte.cpp
index 33ea569df7..998075c6ce 100644
--- a/engines/cine/texte.cpp
+++ b/engines/cine/texte.cpp
@@ -88,7 +88,7 @@ static const CharacterEntry fontParamTable_standard[NUM_FONT_CHARS] = {
 	{64, 3}, {65, 3}, { 0, 0}, { 0, 0}, {62, 2}, {74, 6}, {66, 1}, {67, 6},
 	{52, 6}, {53, 6}, {54, 6}, {55, 6}, {56, 6}, {57, 6}, {58, 6}, {59, 6},
 	{60, 6}, {61, 6}, {76, 3}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, {75, 6},
-	{ 0, 0}, { 0, 6},	//a
+	{ 0, 0}, { 0, 6}, //a
 	                  { 1, 6}, { 2, 6}, { 3, 6}, { 4, 6}, { 5, 6}, { 6, 6},
 	{ 7, 6}, { 8, 3}, { 9, 6}, {10, 6}, {11, 6}, {12, 7}, {13, 6}, {14, 6},
 	{15, 6}, {16, 6}, {17, 6}, {18, 6}, {19, 6}, {20, 6}, {21, 6}, {22, 7},
diff --git a/engines/cine/texte.h b/engines/cine/texte.h
index dd4b7e06ee..185dc53bfd 100644
--- a/engines/cine/texte.h
+++ b/engines/cine/texte.h
@@ -46,7 +46,7 @@ struct CharacterEntry {
 };
 
 struct TextHandler {
-	byte textTable[NUM_FONT_CHARS][2][FONT_WIDTH * FONT_HEIGHT];
+	byte textTable[NUM_FONT_CHARS][2][FONT_WIDTH *FONT_HEIGHT];
 	CharacterEntry fontParamTable[NUM_FONT_CHARS];
 };
 
diff --git a/engines/cine/various.cpp b/engines/cine/various.cpp
index eccd71cf05..23f439a7a7 100644
--- a/engines/cine/various.cpp
+++ b/engines/cine/various.cpp
@@ -99,8 +99,7 @@ byte isInPause = 0;
  * Bit on = mouse button down
  * Bit off = mouse button up
  */
-enum MouseButtonState
-{
+enum MouseButtonState {
 	kLeftMouseButton  = (1 << 0),
 	kRightMouseButton = (1 << 1)
 };
@@ -271,7 +270,7 @@ int16 getObjectUnderCursor(uint16 x, uint16 y) {
 			} else if (it->type == 1 && gfxGetBit(xdif, ydif, g_cine->_animDataTable[frame].data(), g_cine->_animDataTable[frame]._width * 4)) {
 				return it->objIdx;
 			}
-		} else if (it->type == 0)	{ // use generated mask
+		} else if (it->type == 0) { // use generated mask
 			if (gfxGetBit(xdif, ydif, g_cine->_animDataTable[frame].mask(), g_cine->_animDataTable[frame]._width)) {
 				return it->objIdx;
 			}
@@ -358,128 +357,122 @@ void CineEngine::makeSystemMenu() {
 		systemCommand = makeMenuChoice(systemMenu, numEntry, mouseX, mouseY, 140);
 
 		switch (systemCommand) {
-		case 0: // Pause
-			{
-				renderer->drawString(otherMessages[2], 0);
-				waitPlayerInput();
-				break;
-			}
-		case 1: // Restart Game
-			{
-				getMouseData(mouseUpdateStatus, (uint16 *)&mouseButton, (uint16 *)&mouseX, (uint16 *)&mouseY);
-				if (!makeMenuChoice(confirmMenu, 2, mouseX, mouseY + 8, 100)) {
-					_restartRequested = true;
-				}
-				break;
-			}
-		case 2: // Quit
-			{
-				getMouseData(mouseUpdateStatus, (uint16 *)&mouseButton, (uint16 *)&mouseX, (uint16 *)&mouseY);
-				if (!makeMenuChoice(confirmMenu, 2, mouseX, mouseY + 8, 100)) {
-					quitGame();
-				}
-				break;
+		case 0: { // Pause
+			renderer->drawString(otherMessages[2], 0);
+			waitPlayerInput();
+			break;
+		}
+		case 1: { // Restart Game
+			getMouseData(mouseUpdateStatus, (uint16 *)&mouseButton, (uint16 *)&mouseX, (uint16 *)&mouseY);
+			if (!makeMenuChoice(confirmMenu, 2, mouseX, mouseY + 8, 100)) {
+				_restartRequested = true;
 			}
-		case 3:	// Select save drive... change ?
-			{
-				break;
+			break;
+		}
+		case 2: { // Quit
+			getMouseData(mouseUpdateStatus, (uint16 *)&mouseButton, (uint16 *)&mouseX, (uint16 *)&mouseY);
+			if (!makeMenuChoice(confirmMenu, 2, mouseX, mouseY + 8, 100)) {
+				quitGame();
 			}
-		case 4:	// load game
-			{
-				if (loadSaveDirectory()) {
+			break;
+		}
+		case 3: { // Select save drive... change ?
+			break;
+		}
+		case 4: { // load game
+			if (loadSaveDirectory()) {
 //					int16 selectedSave;
 
-					getMouseData(mouseUpdateStatus, (uint16 *)&mouseButton, (uint16 *)&mouseX, (uint16 *)&mouseY);
-					selectedSave = makeMenuChoice(currentSaveName, 10, mouseX, mouseY + 8, 180);
+				getMouseData(mouseUpdateStatus, (uint16 *)&mouseButton, (uint16 *)&mouseX, (uint16 *)&mouseY);
+				selectedSave = makeMenuChoice(currentSaveName, 10, mouseX, mouseY + 8, 180);
 
-					if (selectedSave >= 0) {
-						char saveNameBuffer[256];
-						sprintf(saveNameBuffer, "%s.%1d", _targetName.c_str(), selectedSave);
+				if (selectedSave >= 0) {
+					char saveNameBuffer[256];
+					sprintf(saveNameBuffer, "%s.%1d", _targetName.c_str(), selectedSave);
 
-						getMouseData(mouseUpdateStatus, (uint16 *)&mouseButton, (uint16 *)&mouseX, (uint16 *)&mouseY);
-						if (!makeMenuChoice(confirmMenu, 2, mouseX, mouseY + 8, 100)) {
-							char loadString[256];
+					getMouseData(mouseUpdateStatus, (uint16 *)&mouseButton, (uint16 *)&mouseX, (uint16 *)&mouseY);
+					if (!makeMenuChoice(confirmMenu, 2, mouseX, mouseY + 8, 100)) {
+						char loadString[256];
 
-							sprintf(loadString, otherMessages[3], currentSaveName[selectedSave]);
-							renderer->drawString(loadString, 0);
+						sprintf(loadString, otherMessages[3], currentSaveName[selectedSave]);
+						renderer->drawString(loadString, 0);
 
-							makeLoad(saveNameBuffer);
-						} else {
-							renderer->drawString(otherMessages[4], 0);
-							waitPlayerInput();
-							checkDataDisk(-1);
-						}
+						makeLoad(saveNameBuffer);
 					} else {
 						renderer->drawString(otherMessages[4], 0);
 						waitPlayerInput();
 						checkDataDisk(-1);
 					}
 				} else {
-					renderer->drawString(otherMessages[5], 0);
+					renderer->drawString(otherMessages[4], 0);
 					waitPlayerInput();
 					checkDataDisk(-1);
 				}
-				break;
+			} else {
+				renderer->drawString(otherMessages[5], 0);
+				waitPlayerInput();
+				checkDataDisk(-1);
 			}
-		case 5: // Save game
-			{
-				loadSaveDirectory();
-				selectedSave = makeMenuChoice(currentSaveName, 10, mouseX, mouseY + 8, 180);
+			break;
+		}
+		case 5: { // Save game
+			loadSaveDirectory();
+			selectedSave = makeMenuChoice(currentSaveName, 10, mouseX, mouseY + 8, 180);
 
-				if (selectedSave >= 0) {
-					char saveFileName[256];
-					char saveName[20];
-					saveName[0] = 0;
+			if (selectedSave >= 0) {
+				char saveFileName[256];
+				char saveName[20];
+				saveName[0] = 0;
 
-					if (!makeTextEntryMenu(otherMessages[6], saveName, 20, 120))
-						break;
+				if (!makeTextEntryMenu(otherMessages[6], saveName, 20, 120))
+					break;
 
-					strncpy(currentSaveName[selectedSave], saveName, 20);
+				strncpy(currentSaveName[selectedSave], saveName, 20);
 
-					sprintf(saveFileName, "%s.%1d", _targetName.c_str(), selectedSave);
+				sprintf(saveFileName, "%s.%1d", _targetName.c_str(), selectedSave);
 
-					getMouseData(mouseUpdateStatus, (uint16 *)&mouseButton, (uint16 *)&mouseX, (uint16 *)&mouseY);
-					if (!makeMenuChoice(confirmMenu, 2, mouseX, mouseY + 8, 100)) {
-						char saveString[256];
-						Common::String tmp = Common::String::format("%s.dir", _targetName.c_str());
+				getMouseData(mouseUpdateStatus, (uint16 *)&mouseButton, (uint16 *)&mouseX, (uint16 *)&mouseY);
+				if (!makeMenuChoice(confirmMenu, 2, mouseX, mouseY + 8, 100)) {
+					char saveString[256];
+					Common::String tmp = Common::String::format("%s.dir", _targetName.c_str());
 
-						Common::OutSaveFile *fHandle = _saveFileMan->openForSaving(tmp);
-						if (!fHandle) {
-							warning("Unable to open file %s for saving", tmp.c_str());
-							break;
-						}
+					Common::OutSaveFile *fHandle = _saveFileMan->openForSaving(tmp);
+					if (!fHandle) {
+						warning("Unable to open file %s for saving", tmp.c_str());
+						break;
+					}
 
-						fHandle->write(currentSaveName, 200);
-						delete fHandle;
+					fHandle->write(currentSaveName, 200);
+					delete fHandle;
 
-						sprintf(saveString, otherMessages[3], currentSaveName[selectedSave]);
-						renderer->drawString(saveString, 0);
+					sprintf(saveString, otherMessages[3], currentSaveName[selectedSave]);
+					renderer->drawString(saveString, 0);
 
-						makeSave(saveFileName);
+					makeSave(saveFileName);
 
-						checkDataDisk(-1);
-					} else {
-						renderer->drawString(otherMessages[4], 0);
-						waitPlayerInput();
-						checkDataDisk(-1);
-					}
+					checkDataDisk(-1);
+				} else {
+					renderer->drawString(otherMessages[4], 0);
+					waitPlayerInput();
+					checkDataDisk(-1);
 				}
-				break;
 			}
+			break;
+		}
 		}
 
 		inMenu = false;
 	}
 }
 
-void drawMessageBox(int16 x, int16 y, int16 width, int16 currentY, int16 offset, int16 color, byte* page) {
-	gfxDrawLine(x + offset, y + offset, x + width - offset, y + offset, color, page);	// top
-	gfxDrawLine(x + offset, currentY + 4 - offset, x + width - offset, currentY + 4 - offset, color, page);	// bottom
-	gfxDrawLine(x + offset, y + offset, x + offset, currentY + 4 - offset, color, page);	// left
-	gfxDrawLine(x + width - offset, y + offset, x + width - offset, currentY + 4 - offset, color, page);	// right
+void drawMessageBox(int16 x, int16 y, int16 width, int16 currentY, int16 offset, int16 color, byte *page) {
+	gfxDrawLine(x + offset, y + offset, x + width - offset, y + offset, color, page);   // top
+	gfxDrawLine(x + offset, currentY + 4 - offset, x + width - offset, currentY + 4 - offset, color, page); // bottom
+	gfxDrawLine(x + offset, y + offset, x + offset, currentY + 4 - offset, color, page);    // left
+	gfxDrawLine(x + width - offset, y + offset, x + width - offset, currentY + 4 - offset, color, page);    // right
 }
 
-void drawDoubleMessageBox(int16 x, int16 y, int16 width, int16 currentY, int16 color, byte* page) {
+void drawDoubleMessageBox(int16 x, int16 y, int16 width, int16 currentY, int16 color, byte *page) {
 	drawMessageBox(x, y, width, currentY, 1, 0, page);
 	drawMessageBox(x, y, width, currentY, 0, color, page);
 }
@@ -581,7 +574,7 @@ void makeCommandLine() {
 		g_cine->_commandBuffer = "";
 	}
 
-	if ((playerCommand != -1) && (choiceResultTable[playerCommand] == 2)) {	// need object selection ?
+	if ((playerCommand != -1) && (choiceResultTable[playerCommand] == 2)) { // need object selection?
 		int16 si;
 
 		getMouseData(mouseUpdateStatus, &dummyU16, &x, &y);
@@ -635,7 +628,7 @@ void makeCommandLine() {
 	}
 
 	if (g_cine->getGameType() == Cine::GType_OS && playerCommand != 2) {
-		if (playerCommand != -1 && canUseOnObject != 0)	{ // call use on sub object
+		if (playerCommand != -1 && canUseOnObject != 0) { // call use on sub object
 			int16 si;
 
 			getMouseData(mouseUpdateStatus, &dummyU16, &x, &y);
@@ -742,11 +735,11 @@ int16 makeMenuChoice(const CommandeType commandList[], uint16 height, uint16 X,
 				mainLoopSub6();
 			}
 
-			if (menuVar4 && currentSelection > 0) {	// go up
+			if (menuVar4 && currentSelection > 0) { // go up
 				currentSelection--;
 			}
 
-			if (menuVar5) {	// go down
+			if (menuVar5) { // go down
 				if (height - 1 > currentSelection) {
 					currentSelection++;
 				}
@@ -763,7 +756,7 @@ int16 makeMenuChoice(const CommandeType commandList[], uint16 height, uint16 X,
 			}
 		}
 
-		if (currentSelection != oldSelection) {	// old != new
+		if (currentSelection != oldSelection) { // old != new
 			if (needMouseSave) {
 				hideMouse();
 			}
@@ -789,7 +782,7 @@ int16 makeMenuChoice(const CommandeType commandList[], uint16 height, uint16 X,
 		getMouseData(mouseUpdateStatus, &button, &dummyU16, &dummyU16);
 	} while (button && !g_cine->shouldQuit());
 
-	if (var_4 == 2)	{	// recheck
+	if (var_4 == 2) { // recheck
 		if (!recheckValue)
 			return -1;
 		else
@@ -809,7 +802,7 @@ void makeActionMenu() {
 	getMouseData(mouseUpdateStatus, &mouseButton, &mouseX, &mouseY);
 
 	if (g_cine->getGameType() == Cine::GType_OS) {
-		if(disableSystemMenu == 0) {
+		if (disableSystemMenu == 0) {
 			playerCommand = makeMenuChoice(defaultActionCommand, 6, mouseX, mouseY, 70, true);
 		}
 
@@ -818,7 +811,7 @@ void makeActionMenu() {
 			canUseOnObject = canUseOnItemTable[playerCommand];
 		}
 	} else {
-		if(disableSystemMenu == 0) {
+		if (disableSystemMenu == 0) {
 			playerCommand = makeMenuChoice(defaultActionCommand, 6, mouseX, mouseY, 70);
 		}
 	}
@@ -1185,7 +1178,7 @@ void removeMessages() {
 	Common::List<overlay>::iterator it;
 	bool remove;
 
-	for (it = g_cine->_overlayList.begin(); it != g_cine->_overlayList.end(); ) {
+	for (it = g_cine->_overlayList.begin(); it != g_cine->_overlayList.end();) {
 		if (g_cine->getGameType() == Cine::GType_OS) {
 			// NOTE: These are really removeOverlay calls that have been deferred.
 			// In Operation Stealth's disassembly elements are removed from the
@@ -1348,7 +1341,7 @@ void modifySeqListElement(uint16 objIdx, int16 var4Test, int16 param1, int16 par
 }
 
 void computeMove1(SeqListElement &element, int16 x, int16 y, int16 param1,
-    int16 param2, int16 x2, int16 y2) {
+                  int16 param2, int16 x2, int16 y2) {
 	element.var16 = 0;
 	element.var14 = 0;
 
@@ -1397,7 +1390,7 @@ uint16 addAni(uint16 param1, uint16 objIdx, const int8 *ptr, SeqListElement &ele
 	int16 di;
 
 	debug(5, "addAni: param1 = %d, objIdx = %d, ptr = %p, element.var8 = %d, element.var14 = %d param3 = %d",
-		param1, objIdx, ptr, element.var8, element.var14, param3);
+	      param1, objIdx, ptr, element.var8, element.var14, param3);
 
 	// In the original an error string is set and 0 is returned if the following doesn't hold
 	assert(ptr);
@@ -1413,16 +1406,16 @@ uint16 addAni(uint16 param1, uint16 objIdx, const int8 *ptr, SeqListElement &ele
 	di = (g_cine->_objectTable[objIdx].costume + 1) % (*ptrData);
 	++ptrData; // Jump over the just read byte
 	// Here ptr2 seems to be indexing a table of structs (8 bytes per struct):
-	//	struct {
-	//		int8 x;			// 0 (Used with checkCollision)
-	//		int8 y;			// 1 (Used with checkCollision)
-	//		int8 numZones;	// 2 (Used with checkCollision)
-	//		int8 var3;		// 3 (Not used in this function)
-	//		int8 xAdd;		// 4 (Used with an object)
-	//		int8 yAdd;		// 5 (Used with an object)
-	//		int8 maskAdd;	// 6 (Used with an object)
-	//		int8 frameAdd;	// 7 (Used with an object)
-	//	};
+	// struct {
+	//      int8 x;         // 0 (Used with checkCollision)
+	//      int8 y;         // 1 (Used with checkCollision)
+	//      int8 numZones;  // 2 (Used with checkCollision)
+	//      int8 var3;      // 3 (Not used in this function)
+	//      int8 xAdd;      // 4 (Used with an object)
+	//      int8 yAdd;      // 5 (Used with an object)
+	//      int8 maskAdd;   // 6 (Used with an object)
+	//      int8 frameAdd;  // 7 (Used with an object)
+	// };
 	ptr2 = ptrData + di * 8;
 
 	// We might probably safely discard the AND by 1 here because
@@ -1572,8 +1565,7 @@ void processSeqListElement(SeqListElement &element) {
 		var_4 = -1;
 
 		if ((element.var16 == 1
-			&& !addAni(3, element.objIdx, ptr1, element, 0, &var_4)) || (element.var16 == 2	&& !addAni(2, element.objIdx, ptr1, element, 0,
-			    &var_4))) {
+			&& !addAni(3, element.objIdx, ptr1, element, 0, &var_4)) || (element.var16 == 2 && !addAni(2, element.objIdx, ptr1, element, 0, &var_4))) {
 			if (element.varC == 255) {
 				g_cine->_globalVars[VAR_MOUSE_Y_POS] = 0;
 			}
@@ -1702,9 +1694,9 @@ bool makeTextEntryMenu(const char *messagePtr, char *inputString, int stringMaxL
 			}
 			break;
 		default:
-			if (((keycode >= 'a') && (keycode <='z')) ||
-				((keycode >= '0') && (keycode <='9')) ||
-				((keycode >= 'A') && (keycode <='Z')) ||
+			if (((keycode >= 'a') && (keycode <= 'z')) ||
+				((keycode >= '0') && (keycode <= '9')) ||
+				((keycode >= 'A') && (keycode <= 'Z')) ||
 				(keycode == ' ')) {
 				if (inputLength < stringMaxLength - 1) {
 					ch[0] = keycode;
diff --git a/engines/configure.engines b/engines/configure.engines
index 364e10b6d9..96c46c7b4a 100644
--- a/engines/configure.engines
+++ b/engines/configure.engines
@@ -1,9 +1,10 @@
 # This file is included from the main "configure" script
-add_engine scumm "SCUMM" yes "scumm_7_8 he"
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+add_engine scumm "SCUMM" yes "scumm_7_8 he" "v0-v6 games"
 add_engine scumm_7_8 "v7 & v8 games" yes
 add_engine he "HE71+ games" yes
 add_engine agi "AGI" yes
-add_engine agos "AGOS" yes "agos2"
+add_engine agos "AGOS" yes "agos2" "AGOS 1 games"
 add_engine agos2 "AGOS 2 games" yes
 add_engine cge "CGE" yes
 add_engine cine "Cinematique evo 1" yes
@@ -13,31 +14,31 @@ add_engine draci "Dragon History" yes
 add_engine drascula "Drascula: The Vampire Strikes Back" yes
 add_engine dreamweb "Dreamweb" yes
 add_engine gob "Gobli*ns" yes
-add_engine groovie "Groovie" yes "groovie2"
+add_engine groovie "Groovie" yes "groovie2" "7th Guest"
 add_engine groovie2 "Groovie 2 games" no
 add_engine hugo "Hugo Trilogy" yes
-add_engine kyra "Legend of Kyrandia" yes "lol eob"
+add_engine kyra "Kyra" yes "lol eob" "Legend of Kyrandia 1-3"
 add_engine lol "Lands of Lore" yes
 add_engine eob "Eye of the Beholder" no
 add_engine lastexpress "The Last Express" no
 add_engine lure "Lure of the Temptress" yes
 add_engine made "MADE" yes
-add_engine mohawk "Mohawk" yes "cstime myst riven"
+add_engine mohawk "Mohawk" yes "cstime myst riven" "Living Books"
 add_engine cstime "Where in Time is Carmen Sandiego?" no
 add_engine riven "Riven: The Sequel to Myst" no
 add_engine myst "Myst" no
 add_engine parallaction "Parallaction" yes
 add_engine pegasus "The Journeyman Project: Pegasus Prime" no
 add_engine queen "Flight of the Amazon Queen" yes
-add_engine saga "SAGA" yes "ihnm saga2"
+add_engine saga "SAGA" yes "ihnm saga2" "ITE"
 add_engine ihnm "IHNM" yes
 add_engine saga2 "SAGA 2 games" no
-add_engine sci "SCI" yes "sci32"
+add_engine sci "SCI" yes "sci32" "SCI 0-1.1 games"
 add_engine sci32 "SCI32 games" no
 add_engine sky "Beneath a Steel Sky" yes
 add_engine sword1 "Broken Sword" yes
 add_engine sword2 "Broken Sword II" yes
-add_engine sword25 "Broken Sword 2.5" no "" "png zlib"
+add_engine sword25 "Broken Sword 2.5" no "" "" "png zlib"
 add_engine teenagent "Teen Agent" yes
 add_engine testbed "TestBed: the Testing framework" no
 add_engine tinsel "Tinsel" yes
@@ -47,4 +48,4 @@ add_engine touche "Touche: The Adventures of the Fifth Musketeer" yes
 add_engine tony "Tony Tough and the Night of Roasted Moths" no
 add_engine tsage "TsAGE" yes
 add_engine tucker "Bud Tucker in Double Trouble" yes
-add_engine wintermute "Wintermute" no "" "png zlib vorbis"
+add_engine wintermute "Wintermute" no "" "" "png zlib vorbis"
diff --git a/engines/groovie/roq.cpp b/engines/groovie/roq.cpp
index 35d7ecf886..72a61fefb2 100644
--- a/engines/groovie/roq.cpp
+++ b/engines/groovie/roq.cpp
@@ -288,19 +288,18 @@ bool ROQPlayer::processBlockInfo(ROQBlockHeader &blockHeader) {
 		// them it should be just fine.
 		_currBuf->create(width, height, Graphics::PixelFormat(3, 0, 0, 0, 0, 0, 0, 0, 0));
 		_prevBuf->create(width, height, Graphics::PixelFormat(3, 0, 0, 0, 0, 0, 0, 0, 0));
+	}
 
-		// Clear the buffers with black YUV values
-		byte *ptr1 = (byte *)_currBuf->getBasePtr(0, 0);
-		byte *ptr2 = (byte *)_prevBuf->getBasePtr(0, 0);
-		for (int i = 0; i < width * height; i++) {
-			*ptr1++ = 0;
-			*ptr1++ = 128;
-			*ptr1++ = 128;
-			*ptr2++ = 0;
-			*ptr2++ = 128;
-			*ptr2++ = 128;
-		}
-
+	// Clear the buffers with black YUV values
+	byte *ptr1 = (byte *)_currBuf->getBasePtr(0, 0);
+	byte *ptr2 = (byte *)_prevBuf->getBasePtr(0, 0);
+	for (int i = 0; i < width * height; i++) {
+		*ptr1++ = 0;
+		*ptr1++ = 128;
+		*ptr1++ = 128;
+		*ptr2++ = 0;
+		*ptr2++ = 128;
+		*ptr2++ = 128;
 	}
 
 	return true;
@@ -405,7 +404,7 @@ void ROQPlayer::processBlockQuadVectorBlock(int baseX, int baseY, int8 Mx, int8
 }
 
 void ROQPlayer::processBlockQuadVectorBlockSub(int baseX, int baseY, int8 Mx, int8 My) {
-	debugC(5, kGroovieDebugVideo | kGroovieDebugAll, "Groovie::ROQ: Processing quad vector sub block");
+	debugC(6, kGroovieDebugVideo | kGroovieDebugAll, "Groovie::ROQ: Processing quad vector sub block");
 
 	uint16 codingType = getCodingType();
 	switch (codingType) {
@@ -433,7 +432,7 @@ void ROQPlayer::processBlockQuadVectorBlockSub(int baseX, int baseY, int8 Mx, in
 bool ROQPlayer::processBlockStill(ROQBlockHeader &blockHeader) {
 	debugC(5, kGroovieDebugVideo | kGroovieDebugAll, "Groovie::ROQ: Processing still (JPEG) block");
 
-	warning("Groovie::ROQ: JPEG frame (unfinshed)");
+	warning("Groovie::ROQ: JPEG frame (unfinished)");
 
 	Graphics::JPEGDecoder *jpg = new Graphics::JPEGDecoder();
 	jpg->loadStream(*_file);
diff --git a/engines/mohawk/bitmap.cpp b/engines/mohawk/bitmap.cpp
index 952b6daec2..bc19fe2d3e 100644
--- a/engines/mohawk/bitmap.cpp
+++ b/engines/mohawk/bitmap.cpp
@@ -630,7 +630,7 @@ void MohawkBitmap::drawRLE8(Graphics::Surface *surface, bool isLE) {
 // Myst Bitmap Decoder
 //////////////////////////////////////////
 
-MohawkSurface *MystBitmap::decodeImage(Common::SeekableReadStream* stream) {
+MohawkSurface *MystBitmap::decodeImage(Common::SeekableReadStream *stream) {
 	uint32 uncompressedSize = stream->readUint32LE();
 	Common::SeekableReadStream *bmpStream = decompressLZ(stream, uncompressedSize);
 	delete stream;
@@ -652,10 +652,10 @@ MohawkSurface *MystBitmap::decodeImage(Common::SeekableReadStream* stream) {
 	}
 
 	// Copy the palette to one of our own
-	const byte *palette = bitmapDecoder.getPalette();
 	byte *newPal = 0;
 
-	if (palette) {
+	if (bitmapDecoder.hasPalette()) {
+		const byte *palette = bitmapDecoder.getPalette();
 		newPal = (byte *)malloc(256 * 3);
 		memcpy(newPal, palette, 256 * 3);
 	}
diff --git a/engines/parallaction/sound_br.cpp b/engines/parallaction/sound_br.cpp
index 0925e55309..fbafd36c9a 100644
--- a/engines/parallaction/sound_br.cpp
+++ b/engines/parallaction/sound_br.cpp
@@ -91,20 +91,20 @@ public:
 };
 
 void MidiParser_MSC::parseMetaEvent(EventInfo &info) {
-	uint8 type = read1(_position._play_pos);
-	uint8 len = read1(_position._play_pos);
+	uint8 type = read1(_position._playPos);
+	uint8 len = read1(_position._playPos);
 	info.ext.type = type;
 	info.length = len;
 	info.ext.data = 0;
 
 	if (type == 0x51) {
-		info.ext.data = _position._play_pos;
+		info.ext.data = _position._playPos;
 	} else {
 		warning("unknown meta event 0x%02X", type);
 		info.ext.type = 0;
 	}
 
-	_position._play_pos += len;
+	_position._playPos += len;
 }
 
 void MidiParser_MSC::parseMidiEvent(EventInfo &info) {
@@ -116,13 +116,13 @@ void MidiParser_MSC::parseMidiEvent(EventInfo &info) {
 	case 0xA:
 	case 0xB:
 	case 0xE:
-		info.basic.param1 = read1(_position._play_pos);
-		info.basic.param2 = read1(_position._play_pos);
+		info.basic.param1 = read1(_position._playPos);
+		info.basic.param2 = read1(_position._playPos);
 		break;
 
 	case 0xC:
 	case 0xD:
-		info.basic.param1 = read1(_position._play_pos);
+		info.basic.param1 = read1(_position._playPos);
 		info.basic.param2 = 0;
 		break;
 
@@ -135,9 +135,9 @@ void MidiParser_MSC::parseMidiEvent(EventInfo &info) {
 }
 
 void MidiParser_MSC::parseNextEvent(EventInfo &info) {
-	info.start = _position._play_pos;
+	info.start = _position._playPos;
 
-	if (_position._play_pos >= _trackEnd) {
+	if (_position._playPos >= _trackEnd) {
 		// fake an end-of-track meta event
 		info.delta = 0;
 		info.event = 0xFF;
@@ -146,8 +146,8 @@ void MidiParser_MSC::parseNextEvent(EventInfo &info) {
 		return;
 	}
 
-	info.delta = readVLQ(_position._play_pos);
-	info.event = read1(_position._play_pos);
+	info.delta = readVLQ(_position._playPos);
+	info.event = read1(_position._playPos);
 
 	if (info.event == 0xFF) {
 		parseMetaEvent(info);
@@ -155,7 +155,7 @@ void MidiParser_MSC::parseNextEvent(EventInfo &info) {
 	}
 
 	if (info.event < 0x80) {
-		_position._play_pos--;
+		_position._playPos--;
 		info.event = _lastEvent;
 	}
 
@@ -185,7 +185,7 @@ bool MidiParser_MSC::loadMusic(byte *data, uint32 size) {
 	_lastEvent = 0;
 	_trackEnd = data + size;
 
-	_num_tracks = 1;
+	_numTracks = 1;
 	_tracks[0] = pos;
 
 	setTempo(500000);
diff --git a/engines/sci/sound/midiparser_sci.cpp b/engines/sci/sound/midiparser_sci.cpp
index 422948f975..4e54797960 100644
--- a/engines/sci/sound/midiparser_sci.cpp
+++ b/engines/sci/sound/midiparser_sci.cpp
@@ -98,7 +98,7 @@ bool MidiParser_SCI::loadMusic(SoundResource::Track *track, MusicEntry *psnd, in
 		midiMixChannels();
 	}
 
-	_num_tracks = 1;
+	_numTracks = 1;
 	_tracks[0] = _mixedData;
 	if (_pSnd)
 		setTrack(0);
@@ -144,7 +144,7 @@ byte *MidiParser_SCI::midiMixChannels() {
 	_mixedData = outData;
 	long ticker = 0;
 	byte channelNr, curDelta;
-	byte midiCommand = 0, midiParam, global_prev = 0;
+	byte midiCommand = 0, midiParam, globalPrev = 0;
 	long newDelta;
 	SoundResource::Channel *channel;
 
@@ -190,13 +190,13 @@ byte *MidiParser_SCI::midiMixChannels() {
 			byte midiChannel = midiCommand & 0xF;
 			_channelUsed[midiChannel] = true;
 
-			if (midiCommand != global_prev)
+			if (midiCommand != globalPrev)
 				*outData++ = midiCommand;
 			*outData++ = midiParam;
 			if (nMidiParams[(midiCommand >> 4) - 8] == 2)
 				*outData++ = channel->data[channel->curPos++];
 			channel->prev = midiCommand;
-			global_prev = midiCommand;
+			globalPrev = midiCommand;
 		}
 	}
 
@@ -372,8 +372,8 @@ void MidiParser_SCI::unloadMusic() {
 		resetTracking();
 		allNotesOff();
 	}
-	_num_tracks = 0;
-	_active_track = 255;
+	_numTracks = 0;
+	_activeTrack = 255;
 	_resetOnPause = false;
 
 	if (_mixedData) {
@@ -454,26 +454,26 @@ void MidiParser_SCI::parseNextEvent(EventInfo &info) {
 		debugC(4, kDebugLevelSound, "signal %04x", _signalToSet);
 	}
 
-	info.start = _position._play_pos;
+	info.start = _position._playPos;
 	info.delta = 0;
-	while (*_position._play_pos == 0xF8) {
+	while (*_position._playPos == 0xF8) {
 		info.delta += 240;
-		_position._play_pos++;
+		_position._playPos++;
 	}
-	info.delta += *(_position._play_pos++);
+	info.delta += *(_position._playPos++);
 
 	// Process the next info.
-	if ((_position._play_pos[0] & 0xF0) >= 0x80)
-		info.event = *(_position._play_pos++);
+	if ((_position._playPos[0] & 0xF0) >= 0x80)
+		info.event = *(_position._playPos++);
 	else
-		info.event = _position._running_status;
+		info.event = _position._runningStatus;
 	if (info.event < 0x80)
 		return;
 
-	_position._running_status = info.event;
+	_position._runningStatus = info.event;
 	switch (info.command()) {
 	case 0xC:
-		info.basic.param1 = *(_position._play_pos++);
+		info.basic.param1 = *(_position._playPos++);
 		info.basic.param2 = 0;
 		if (info.channel() == 0xF) {// SCI special case
 			if (info.basic.param1 != kSetSignalLoop) {
@@ -488,23 +488,23 @@ void MidiParser_SCI::parseNextEvent(EventInfo &info) {
 				// in glitches (e.g. the intro of LB1 Amiga gets stuck - bug
 				// #3297883). Refer to MusicEntry::setSignal() in sound/music.cpp.
 				if (_soundVersion <= SCI_VERSION_0_LATE ||
-					_position._play_tick || info.delta) {
+					_position._playTick || info.delta) {
 					_signalSet = true;
 					_signalToSet = info.basic.param1;
 				}
 			} else {
-				_loopTick = _position._play_tick + info.delta;
+				_loopTick = _position._playTick + info.delta;
 			}
 		}
 		break;
 	case 0xD:
-		info.basic.param1 = *(_position._play_pos++);
+		info.basic.param1 = *(_position._playPos++);
 		info.basic.param2 = 0;
 		break;
 
 	case 0xB:
-		info.basic.param1 = *(_position._play_pos++);
-		info.basic.param2 = *(_position._play_pos++);
+		info.basic.param1 = *(_position._playPos++);
+		info.basic.param2 = *(_position._playPos++);
 
 		// Reference for some events:
 		// http://wiki.scummvm.org/index.php/SCI/Specifications/Sound/SCI0_Resource_Format#Status_Reference
@@ -588,8 +588,8 @@ void MidiParser_SCI::parseNextEvent(EventInfo &info) {
 	case 0x9:
 	case 0xA:
 	case 0xE:
-		info.basic.param1 = *(_position._play_pos++);
-		info.basic.param2 = *(_position._play_pos++);
+		info.basic.param1 = *(_position._playPos++);
+		info.basic.param2 = *(_position._playPos++);
 		if (info.command() == 0x9 && info.basic.param2 == 0)
 			info.event = info.channel() | 0x80;
 		info.length = 0;
@@ -598,12 +598,12 @@ void MidiParser_SCI::parseNextEvent(EventInfo &info) {
 	case 0xF: // System Common, Meta or SysEx event
 		switch (info.event & 0x0F) {
 		case 0x2: // Song Position Pointer
-			info.basic.param1 = *(_position._play_pos++);
-			info.basic.param2 = *(_position._play_pos++);
+			info.basic.param1 = *(_position._playPos++);
+			info.basic.param2 = *(_position._playPos++);
 			break;
 
 		case 0x3: // Song Select
-			info.basic.param1 = *(_position._play_pos++);
+			info.basic.param1 = *(_position._playPos++);
 			info.basic.param2 = 0;
 			break;
 
@@ -617,16 +617,16 @@ void MidiParser_SCI::parseNextEvent(EventInfo &info) {
 			break;
 
 		case 0x0: // SysEx
-			info.length = readVLQ(_position._play_pos);
-			info.ext.data = _position._play_pos;
-			_position._play_pos += info.length;
+			info.length = readVLQ(_position._playPos);
+			info.ext.data = _position._playPos;
+			_position._playPos += info.length;
 			break;
 
 		case 0xF: // META event
-			info.ext.type = *(_position._play_pos++);
-			info.length = readVLQ(_position._play_pos);
-			info.ext.data = _position._play_pos;
-			_position._play_pos += info.length;
+			info.ext.type = *(_position._playPos++);
+			info.length = readVLQ(_position._playPos);
+			info.ext.data = _position._playPos;
+			_position._playPos += info.length;
 			if (info.ext.type == 0x2F) {// end of track reached
 				if (_pSnd->loop)
 					_pSnd->loop--;
@@ -677,21 +677,21 @@ void MidiParser_SCI::allNotesOff() {
 	// Turn off all active notes
 	for (i = 0; i < 128; ++i) {
 		for (j = 0; j < 16; ++j) {
-			if ((_active_notes[i] & (1 << j)) && (_channelRemap[j] != -1)){
+			if ((_activeNotes[i] & (1 << j)) && (_channelRemap[j] != -1)){
 				sendToDriver(0x80 | j, i, 0);
 			}
 		}
 	}
 
 	// Turn off all hanging notes
-	for (i = 0; i < ARRAYSIZE(_hanging_notes); i++) {
-		byte midiChannel = _hanging_notes[i].channel;
-		if ((_hanging_notes[i].time_left) && (_channelRemap[midiChannel] != -1)) {
-			sendToDriver(0x80 | midiChannel, _hanging_notes[i].note, 0);
-			_hanging_notes[i].time_left = 0;
+	for (i = 0; i < ARRAYSIZE(_hangingNotes); i++) {
+		byte midiChannel = _hangingNotes[i].channel;
+		if ((_hangingNotes[i].timeLeft) && (_channelRemap[midiChannel] != -1)) {
+			sendToDriver(0x80 | midiChannel, _hangingNotes[i].note, 0);
+			_hangingNotes[i].timeLeft = 0;
 		}
 	}
-	_hanging_notes_count = 0;
+	_hangingNotesCount = 0;
 
 	// To be sure, send an "All Note Off" event (but not all MIDI devices
 	// support this...).
@@ -703,7 +703,7 @@ void MidiParser_SCI::allNotesOff() {
 		}
 	}
 
-	memset(_active_notes, 0, sizeof(_active_notes));
+	memset(_activeNotes, 0, sizeof(_activeNotes));
 }
 
 void MidiParser_SCI::setMasterVolume(byte masterVolume) {
diff --git a/engines/sci/sound/midiparser_sci.h b/engines/sci/sound/midiparser_sci.h
index 82f34070a4..d3fd337644 100644
--- a/engines/sci/sound/midiparser_sci.h
+++ b/engines/sci/sound/midiparser_sci.h
@@ -65,7 +65,7 @@ public:
 	void setMasterVolume(byte masterVolume);
 	void setVolume(byte volume);
 	void stop() {
-		_abort_parse = true;
+		_abortParse = true;
 		allNotesOff();
 	}
 	void pause() {
diff --git a/engines/scumm/midiparser_ro.cpp b/engines/scumm/midiparser_ro.cpp
index 1a31d1ca82..8549a9262d 100644
--- a/engines/scumm/midiparser_ro.cpp
+++ b/engines/scumm/midiparser_ro.cpp
@@ -62,13 +62,13 @@ void MidiParser_RO::parseNextEvent (EventInfo &info) {
 
 	info.delta = 0;
 	do {
-		info.start = _position._play_pos;
-		info.event = *(_position._play_pos++);
+		info.start = _position._playPos;
+		info.event = *(_position._playPos++);
 		if (info.command() == 0xA) {
 			++_lastMarkerCount;
 			info.event = 0xF0;
 		} else if (info.event == 0xF0 || info.event == 0xF1) {
-			byte delay = *(_position._play_pos++);
+			byte delay = *(_position._playPos++);
 			info.delta += delay;
 			if (info.event == 0xF1) {
 				// This event is, as far as we have been able
@@ -95,16 +95,16 @@ void MidiParser_RO::parseNextEvent (EventInfo &info) {
 	if (info.event < 0x80)
 		return;
 
-	_position._running_status = info.event;
+	_position._runningStatus = info.event;
 	switch (info.command()) {
 	case 0xC:
-		info.basic.param1 = *(_position._play_pos++);
+		info.basic.param1 = *(_position._playPos++);
 		info.basic.param2 = 0;
 		break;
 
 	case 0x8: case 0x9: case 0xB:
-		info.basic.param1 = *(_position._play_pos++);
-		info.basic.param2 = *(_position._play_pos++);
+		info.basic.param1 = *(_position._playPos++);
+		info.basic.param2 = *(_position._playPos++);
 		if (info.command() == 0x9 && info.basic.param2 == 0)
 			info.event = info.channel() | 0x80;
 		info.length = 0;
@@ -133,7 +133,7 @@ bool MidiParser_RO::loadMusic (byte *data, uint32 size) {
 		return false;
 	}
 
-	_num_tracks = 1;
+	_numTracks = 1;
 	_ppqn = 120;
 	_tracks[0] = pos + 2;
 	_markerCount = _lastMarkerCount = 0;
diff --git a/engines/toltecs/menu.cpp b/engines/toltecs/menu.cpp
index 415f19ca31..d7ba254d9b 100644
--- a/engines/toltecs/menu.cpp
+++ b/engines/toltecs/menu.cpp
@@ -21,8 +21,11 @@
  *
  */
 
+#include "audio/mixer.h"
 #include "common/savefile.h"
 
+#include "common/config-manager.h"
+
 #include "toltecs/toltecs.h"
 #include "toltecs/menu.h"
 #include "toltecs/palette.h"
@@ -37,7 +40,7 @@ MenuSystem::MenuSystem(ToltecsEngine *vm) : _vm(vm) {
 MenuSystem::~MenuSystem() {
 }
 
-int MenuSystem::run() {
+int MenuSystem::run(MenuID menuId) {
 
 	//debug("MenuSystem::run()");
 
@@ -50,17 +53,11 @@ int MenuSystem::run() {
 	memcpy(backgroundOrig.getBasePtr(0,0), _vm->_screen->_frontScreen, 640 * 400);
 
 	_currMenuID = kMenuIdNone;
-	_newMenuID = kMenuIdMain;
+	_newMenuID = menuId;
 	_currItemID = kItemIdNone;
 	_editingDescription = false;
-	_cfgText = true;
-	_cfgVoices = true;
-	_cfgMasterVolume = 10;
-	_cfgVoicesVolume = 10;
-	_cfgMusicVolume = 10;
-	_cfgSoundFXVolume = 10;
-	_cfgBackgroundVolume = 10;
-	_running = true;    	
+
+	_running = true;
 	_top = 30 - _vm->_guiHeight / 2;
 	_needRedraw = false;
 
@@ -241,8 +238,8 @@ void MenuSystem::initMenu(MenuID menuID) {
 		drawString(0, 74, 320, 1, 229, _vm->getSysString(kStrWhatCanIDoForYou));
 		addClickTextItem(kItemIdLoad, 0, 115, 320, 0, _vm->getSysString(kStrLoad), 229, 255);
 		addClickTextItem(kItemIdSave, 0, 135, 320, 0, _vm->getSysString(kStrSave), 229, 255);
-		addClickTextItem(kItemIdToggleText, 0, 165, 320, 0, _vm->getSysString(kStrTextOn), 229, 255);
-		addClickTextItem(kItemIdToggleVoices, 0, 185, 320, 0, _vm->getSysString(kStrVoicesOn), 229, 255);
+		addClickTextItem(kItemIdToggleText, 0, 165, 320, 0, _vm->getSysString(_vm->_cfgText ? kStrTextOn : kStrTextOff), 229, 255);
+		addClickTextItem(kItemIdToggleVoices, 0, 185, 320, 0, _vm->getSysString(_vm->_cfgVoices ? kStrVoicesOn : kStrVoicesOff), 229, 255);
 		addClickTextItem(kItemIdVolumesMenu, 0, 215, 320, 0, _vm->getSysString(kStrVolume), 229, 255);
 		addClickTextItem(kItemIdPlay, 0, 245, 320, 0, _vm->getSysString(kStrPlay), 229, 255);
 		addClickTextItem(kItemIdQuit, 0, 275, 320, 0, _vm->getSysString(kStrQuit), 229, 255);
@@ -326,13 +323,13 @@ void MenuSystem::clickItem(ItemID id) {
 		_newMenuID = kMenuIdLoad;
 		break;
 	case kItemIdToggleText:
-		setCfgText(!_cfgText, true);
-		if (!_cfgVoices && !_cfgText)
+		setCfgText(!_vm->_cfgText, true);
+		if (!_vm->_cfgVoices && !_vm->_cfgText)
 			setCfgVoices(true, false);
 		break;
 	case kItemIdToggleVoices:
-		setCfgVoices(!_cfgVoices, true);
-		if (!_cfgVoices && !_cfgText)
+		setCfgVoices(!_vm->_cfgVoices, true);
+		if (!_vm->_cfgVoices && !_vm->_cfgText)
 			setCfgText(true, false);
 		break;
 	case kItemIdVolumesMenu:
@@ -518,22 +515,24 @@ void MenuSystem::clickSavegameItem(ItemID id) {
 }
 
 void MenuSystem::setCfgText(bool value, bool active) {
-	if (_cfgText != value) {
+	if (_vm->_cfgText != value) {
 		Item *item = getItem(kItemIdToggleText);
-		_cfgText = value;
+		_vm->_cfgText = value;
 		restoreRect(item->rect.left, item->rect.top, item->rect.width() + 1, item->rect.height() - 2);
-		setItemCaption(item, _vm->getSysString(_cfgText ? kStrTextOn : kStrTextOff));
+		setItemCaption(item, _vm->getSysString(_vm->_cfgText ? kStrTextOn : kStrTextOff));
 		drawItem(kItemIdToggleText, true);
+		ConfMan.setBool("subtitles", value);
 	}
 }
 
 void MenuSystem::setCfgVoices(bool value, bool active) {
-	if (_cfgVoices != value) {
+	if (_vm->_cfgVoices != value) {
 		Item *item = getItem(kItemIdToggleVoices);
-		_cfgVoices = value;
+		_vm->_cfgVoices = value;
 		restoreRect(item->rect.left, item->rect.top, item->rect.width() + 1, item->rect.height() - 2);
-		setItemCaption(item, _vm->getSysString(_cfgVoices ? kStrVoicesOn : kStrVoicesOff));
+		setItemCaption(item, _vm->getSysString(_vm->_cfgVoices ? kStrVoicesOn : kStrVoicesOff));
 		drawItem(kItemIdToggleVoices, true);
+		ConfMan.setBool("speech_mute", !value);
 	}
 }
 
@@ -542,25 +541,25 @@ void MenuSystem::drawVolumeBar(ItemID itemID) {
 	char text[21];
 	
 	switch (itemID) {
-	case kItemIdMaster:
+	case kItemIdMaster:	// unused in ScummVM, always 20
 		y = 130 + 25 * 0;
-		volume = _cfgMasterVolume;
+		volume = 20;
 		break;
 	case kItemIdVoices:
 		y = 130 + 25 * 1;
-		volume = _cfgVoicesVolume;
+		volume = _vm->_cfgVoicesVolume;
 		break;
 	case kItemIdMusic:
 		y = 130 + 25 * 2;
-		volume = _cfgMusicVolume;
+		volume = _vm->_cfgMusicVolume;
 		break;
 	case kItemIdSoundFX:
 		y = 130 + 25 * 3;
-		volume = _cfgSoundFXVolume;
+		volume = _vm->_cfgSoundFXVolume;
 		break;
-	case kItemIdBackground:
+	case kItemIdBackground:	// unused in ScummVM, always 20
 		y = 130 + 25 * 4;
-		volume = _cfgBackgroundVolume;
+		volume = 20;
 		break;
 	default:
 		return;
@@ -578,36 +577,37 @@ void MenuSystem::drawVolumeBar(ItemID itemID) {
 }
 
 void MenuSystem::changeVolumeBar(ItemID itemID, int delta) {
-
-	int *volume, newVolume;
+	byte newVolume;
 
 	switch (itemID) {
-	case kItemIdMaster:
-		volume = &_cfgMasterVolume;
-		break;
 	case kItemIdVoices:
-		volume = &_cfgVoicesVolume;
+		_vm->_cfgVoicesVolume = CLIP(_vm->_cfgVoicesVolume + delta, 0, 20);
+		newVolume = ceil((double)_vm->_cfgVoicesVolume * Audio::Mixer::kMaxChannelVolume / 20);
+		_vm->_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, newVolume);
+		ConfMan.setInt("speech_volume", newVolume);
 		break;
 	case kItemIdMusic:
-		volume = &_cfgMusicVolume;
+		_vm->_cfgMusicVolume = CLIP(_vm->_cfgMusicVolume + delta, 0, 20);
+		newVolume = ceil((double)_vm->_cfgMusicVolume * Audio::Mixer::kMaxChannelVolume / 20);
+		_vm->_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, newVolume);
+		ConfMan.setInt("music_volume", newVolume);
 		break;
 	case kItemIdSoundFX:
-		volume = &_cfgSoundFXVolume;
+		_vm->_cfgSoundFXVolume = CLIP(_vm->_cfgSoundFXVolume + delta, 0, 20);
+		newVolume = ceil((double)_vm->_cfgSoundFXVolume * Audio::Mixer::kMaxChannelVolume / 20);
+		_vm->_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, newVolume);
+		ConfMan.setInt("sfx_volume", newVolume);
 		break;
+	case kItemIdMaster:
 	case kItemIdBackground:
-		volume = &_cfgBackgroundVolume;
+		// unused in ScummVM
 		break;
 	default:
 		return;
 	}
 
-	newVolume = CLIP(*volume + delta, 0, 20);
-
-	if (newVolume != *volume) {
-		*volume = newVolume;
-		drawVolumeBar(itemID);
-	}
-
+	_vm->syncSoundSettings();
+	drawVolumeBar(itemID);
 }
 
 } // End of namespace Toltecs
diff --git a/engines/toltecs/menu.h b/engines/toltecs/menu.h
index 3e2c2da8d9..9234a56398 100644
--- a/engines/toltecs/menu.h
+++ b/engines/toltecs/menu.h
@@ -29,14 +29,6 @@
 
 namespace Toltecs {
 
-enum MenuID {
-	kMenuIdNone,
-	kMenuIdMain,
-	kMenuIdSave,
-	kMenuIdLoad,
-	kMenuIdVolumes
-};
-
 enum ItemID {
 	kItemIdNone,
 	// Main menu
@@ -85,7 +77,7 @@ public:
 	MenuSystem(ToltecsEngine *vm);
 	~MenuSystem();
 
-	int run();
+	int run(MenuID menuId);
 	void update();
 	void handleEvents();
 	
@@ -125,9 +117,6 @@ protected:
 	Common::Array<Item> _items;
 	Common::Array<SavegameItem> _savegames;
 	
-	bool _cfgText, _cfgVoices;
-	int _cfgMasterVolume, _cfgVoicesVolume, _cfgMusicVolume, _cfgSoundFXVolume,	_cfgBackgroundVolume;
-
 	void addClickTextItem(ItemID id, int x, int y, int w, uint fontNum, const char *caption, byte defaultColor, byte activeColor);
 
 	void drawItem(ItemID itemID, bool active);
diff --git a/engines/toltecs/movie.cpp b/engines/toltecs/movie.cpp
index 76d42ebf0a..33fe249514 100644
--- a/engines/toltecs/movie.cpp
+++ b/engines/toltecs/movie.cpp
@@ -78,7 +78,7 @@ void MoviePlayer::playMovie(uint resIndex) {
 	_vm->_arc->readUint32LE();
 	_vm->_arc->readUint32LE();
 	_framesPerSoundChunk = _vm->_arc->readUint32LE();
-	_vm->_arc->readUint32LE();
+	int rate = _vm->_arc->readUint32LE();
 
 	_vm->_sceneWidth = 640;
 	_vm->_sceneHeight = 400;
@@ -87,7 +87,7 @@ void MoviePlayer::playMovie(uint resIndex) {
 	_vm->_cameraY = 0;
 	_vm->_guiHeight = 0;
 
-	_audioStream = Audio::makeQueuingAudioStream(22050, false);
+	_audioStream = Audio::makeQueuingAudioStream(rate, false);
 
 	_vm->_mixer->playStream(Audio::Mixer::kPlainSoundType, &_audioStreamHandle, _audioStream);
 
@@ -97,13 +97,12 @@ void MoviePlayer::playMovie(uint resIndex) {
 	fetchAudioChunks();
 
 	uint32 lastTime = _vm->_mixer->getSoundElapsedTime(_audioStreamHandle);
+	byte *chunkBuffer = NULL;
+	uint32 prevChunkSize = 0;
 
 	while (_chunkCount--) {
-
 		byte chunkType = _vm->_arc->readByte();
 		uint32 chunkSize = _vm->_arc->readUint32LE();
-		byte *chunkBuffer = NULL;
-		uint32 movieOffset;
 
 		debug(0, "chunkType = %d; chunkSize = %d", chunkType, chunkSize);
 		
@@ -112,12 +111,16 @@ void MoviePlayer::playMovie(uint resIndex) {
 		if (chunkType == kChunkAudio) {
 			_vm->_arc->skip(chunkSize);
 		} else {
-			chunkBuffer = new byte[chunkSize];
+			// Only reallocate the chunk buffer if it's smaller than the previous frame
+			if (chunkSize > prevChunkSize) {
+				delete[] chunkBuffer;
+				chunkBuffer = new byte[chunkSize];
+			}
+
+			prevChunkSize = chunkSize;
 			_vm->_arc->read(chunkBuffer, chunkSize);
 		}
 
-		movieOffset = _vm->_arc->pos();
-
 		switch (chunkType) {
 		case kChunkFirstImage:
 		case kChunkSubsequentImages:
@@ -150,10 +153,10 @@ void MoviePlayer::playMovie(uint resIndex) {
 			// Already processed
 			break;
 		case kChunkShowSubtitle:
-			// TODO: Check if the text is a subtitle (last character == 0xFE).
-			//	   If so, don't show it if text display is disabled.
-			memcpy(_vm->_script->getSlotData(subtitleSlot), chunkBuffer, chunkSize);
-			_vm->_screen->updateTalkText(subtitleSlot, 0);
+			if (_vm->_cfgText) {
+				memcpy(_vm->_script->getSlotData(subtitleSlot), chunkBuffer, chunkSize);
+				_vm->_screen->updateTalkText(subtitleSlot, 0);
+			}
 			break;
 		case kChunkShakeScreen: // start/stop shakescreen effect
 			if (chunkBuffer[0] == 0xFF)
@@ -175,16 +178,13 @@ void MoviePlayer::playMovie(uint resIndex) {
 		default:
 			error("MoviePlayer::playMovie(%04X) Unknown chunk type %d at %08X", resIndex, chunkType, _vm->_arc->pos() - 5 - chunkSize);
 		}
-
-		delete[] chunkBuffer;
-
-		_vm->_arc->seek(movieOffset, SEEK_SET);
 		
 		if (!handleInput())
 			break;
-
 	}
 
+	delete[] chunkBuffer;
+
 	_audioStream->finish();
 	_vm->_mixer->stopHandle(_audioStreamHandle);
 
diff --git a/engines/toltecs/music.cpp b/engines/toltecs/music.cpp
index c322961077..2cd36cad9f 100644
--- a/engines/toltecs/music.cpp
+++ b/engines/toltecs/music.cpp
@@ -20,15 +20,13 @@
  *
  */
 
-// FIXME: This code is taken from SAGA and needs more work (e.g. setVolume).
+#include "audio/midiparser.h"
+#include "common/textconsole.h"
 
 #include "toltecs/toltecs.h"
 #include "toltecs/music.h"
 #include "toltecs/resource.h"
 
-#include "audio/midiparser.h"
-#include "common/textconsole.h"
-
 namespace Toltecs {
 
 MusicPlayer::MusicPlayer(bool isGM) : _isGM(isGM), _buffer(NULL) {
@@ -77,7 +75,7 @@ void MusicPlayer::playMIDI(const byte *data, uint32 size, bool loop) {
 
 		_parser = parser;
 
-		setVolume(127);
+		syncVolume();
 
 		_isLooping = loop;
 		_isPlaying = true;
@@ -86,16 +84,6 @@ void MusicPlayer::playMIDI(const byte *data, uint32 size, bool loop) {
 	}
 }
 
-void MusicPlayer::pause() {
-	setVolume(-1);
-	_isPlaying = false;
-}
-
-void MusicPlayer::resume() {
-	setVolume(127);
-	_isPlaying = true;
-}
-
 void MusicPlayer::stopAndClear() {
 	Common::StackLock lock(_mutex);
 	stop();
diff --git a/engines/toltecs/music.h b/engines/toltecs/music.h
index 79df1ea2f5..8d364dbb9f 100644
--- a/engines/toltecs/music.h
+++ b/engines/toltecs/music.h
@@ -37,8 +37,6 @@ public:
 	MusicPlayer(bool isGM = true);
 
 	void playMIDI(const byte *data, uint32 size, bool loop = false);
-	void pause();
-	void resume();
 	void stopAndClear();
 
 	// MidiDriver_BASE interface implementation
diff --git a/engines/toltecs/saveload.cpp b/engines/toltecs/saveload.cpp
index c24d2149b0..4de25101d2 100644
--- a/engines/toltecs/saveload.cpp
+++ b/engines/toltecs/saveload.cpp
@@ -36,12 +36,11 @@
 namespace Toltecs {
 
 /* TODO:
-	- Save with F7; Load with F9
 	- Saving during an animation (AnimationPlayer) is not working correctly yet
 	- Maybe switch to SCUMM/Tinsel serialization approach?
 */
 
-#define TOLTECS_SAVEGAME_VERSION 3
+#define TOLTECS_SAVEGAME_VERSION 4
 
 ToltecsEngine::kReadSaveHeaderError ToltecsEngine::readSaveHeader(Common::SeekableReadStream *in, bool loadThumbnail, SaveHeader &header) {
 
@@ -141,8 +140,8 @@ void ToltecsEngine::savegame(const char *filename, const char *description) {
 }
 
 void ToltecsEngine::loadgame(const char *filename) {
-	Common::InSaveFile *in;
-	if (!(in = g_system->getSavefileManager()->openForLoading(filename))) {
+	Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(filename);
+	if (!in) {
 		warning("Can't open file '%s', game not loaded", filename);
 		return;
 	}
@@ -191,7 +190,7 @@ void ToltecsEngine::loadgame(const char *filename) {
 	_anim->loadState(in);
 	_screen->loadState(in);
 	if (header.version >= 2)
-		_sound->loadState(in);
+		_sound->loadState(in, header.version);
 	if (header.version >= 3)
 		_music->loadState(in);
 
diff --git a/engines/toltecs/screen.cpp b/engines/toltecs/screen.cpp
index 634917a7b1..7ec6e940dd 100644
--- a/engines/toltecs/screen.cpp
+++ b/engines/toltecs/screen.cpp
@@ -469,7 +469,6 @@ void Screen::addTalkTextRect(Font &font, int16 x, int16 &y, int16 length, int16
 }
 
 void Screen::addTalkTextItemsToRenderQueue() {
-
 	for (int16 i = 0; i <= _talkTextItemNum; i++) {
 		TalkTextItem *item = &_talkTextItems[i];
 		byte *text = _vm->_script->getSlotData(item->slotIndex) + item->slotOffset;
@@ -482,14 +481,15 @@ void Screen::addTalkTextItemsToRenderQueue() {
 		if (item->duration < 0)
 			item->duration = 0;
 
+		if (!_vm->_cfgText)
+			return;
+
 		for (byte j = 0; j < item->lineCount; j++) {
-			_renderQueue->addText(item->lines[j].x, item->lines[j].y, item->color, _fontResIndexArray[item->fontNum],
-				text, item->lines[j].length);
+			_renderQueue->addText(item->lines[j].x, item->lines[j].y, item->color,
+					_fontResIndexArray[item->fontNum], text, item->lines[j].length);
 			text += item->lines[j].length;
 		}
-		
 	}
-
 }
 
 int16 Screen::getTalkTextDuration() {
diff --git a/engines/toltecs/script.cpp b/engines/toltecs/script.cpp
index 9683831980..40b13526cf 100644
--- a/engines/toltecs/script.cpp
+++ b/engines/toltecs/script.cpp
@@ -1060,15 +1060,7 @@ void ScriptInterpreter::sfHandleInput() {
 }
 
 void ScriptInterpreter::sfRunOptionsScreen() {
-	_vm->_screen->loadMouseCursor(12);
-	_vm->_palette->loadAddPalette(9, 224);
-	_vm->_palette->setDeltaPalette(_vm->_palette->getMainPalette(), 7, 0, 31, 224);
-	_vm->_screen->finishTalkTextItems();
-	_vm->_screen->clearSprites();
-	CursorMan.showMouse(true);
-	_vm->_menuSystem->run();
-	_vm->_keyState.reset();
-	_switchLocalDataNear = true;
+	_vm->showMenu(kMenuIdMain);
 }
 
 /* NOTE: The opcodes sfPrecacheSprites, sfPrecacheSounds1, sfPrecacheSounds2 and
diff --git a/engines/toltecs/script.h b/engines/toltecs/script.h
index 0c1898c525..7a50d22ff2 100644
--- a/engines/toltecs/script.h
+++ b/engines/toltecs/script.h
@@ -56,6 +56,8 @@ public:
 	void saveState(Common::WriteStream *out);
 	void loadState(Common::ReadStream *in);
 
+	void setSwitchLocalDataNear(bool newValue) { _switchLocalDataNear = newValue; }
+
 protected:
 
 	struct ScriptRegs {
diff --git a/engines/toltecs/sound.cpp b/engines/toltecs/sound.cpp
index c9ef00e31b..2705efe5f0 100644
--- a/engines/toltecs/sound.cpp
+++ b/engines/toltecs/sound.cpp
@@ -34,49 +34,39 @@ namespace Toltecs {
 
 Sound::Sound(ToltecsEngine *vm) : _vm(vm) {
 	for (int i = 0; i < kMaxChannels; i++) {
-		channels[i].type = kChannelTypeEmpty;
-		channels[i].resIndex = -1;
+		clearChannel(i);
 	}
 }
 
 Sound::~Sound() {
 }
 
+void Sound::clearChannel(int channel) {
+	channels[channel].type = kChannelTypeEmpty;
+	channels[channel].resIndex = -1;
+	channels[channel].volume = 0;
+	channels[channel].panning = 0;
+}
+
 void Sound::playSpeech(int16 resIndex) {
 	debug(0, "playSpeech(%d)", resIndex);
-	internalPlaySound(resIndex, kChannelTypeSpeech, 50 /*TODO*/, 0);
+
+	if (_vm->_cfgVoices)
+		internalPlaySound(resIndex, kChannelTypeSpeech, 50 /*TODO*/, 0);
 }
 
 void Sound::playSound(int16 resIndex, int16 type, int16 volume) {
-
-	// TODO: Use the right volumes
-
 	debug(0, "playSound(%d, %d, %d)", resIndex, type, volume);
 	
-	if (volume == -1 || type == -2) {
-		if (type == kChannelTypeBackground) {
-			internalPlaySound(resIndex, type, 50 /*TODO*/, 0);
-		} else {
-			internalPlaySound(resIndex, type, 100 /*TODO*/, 0);
-		}
-	} else {
-		internalPlaySound(resIndex, type, 100 /*TODO*/, 0);
-	}
-
+	internalPlaySound(resIndex, type, volume, 0);
 }
 
 void Sound::playSoundAtPos(int16 resIndex, int16 x, int16 y) {
-
 	debug(0, "playSoundAtPos(%d, %d, %d)", resIndex, x, y);
 
-	int16 volume, panning = 0, deltaX = 0;
-	int8 scaling = _vm->_segmap->getScalingAtPoint(x, y);
-
-	if (scaling >= 0)
-		volume = 50 + ABS(scaling) / 2;
-	else
-		volume = 50 - ABS(scaling) / 2;
-
+	int16 volume = 50 + ABS(_vm->_segmap->getScalingAtPoint(x, y)) / 2;
+	int16 panning = 0, deltaX = 0;
+	
 	if (_vm->_cameraX > x)
 		deltaX = _vm->_cameraX - x;
 	else if (_vm->_cameraX + 640 < x)
@@ -91,26 +81,25 @@ void Sound::playSoundAtPos(int16 resIndex, int16 x, int16 y) {
 	}
 
 	internalPlaySound(resIndex, 1, volume, panning);
-
 }
 
 void Sound::internalPlaySound(int16 resIndex, int16 type, int16 volume, int16 panning) {
-
+	// Change the game's sound volume (0 - 100) to Scummvm's scale (0 - 255)
+	volume = (volume == -1) ? 255 : volume * 255 / 100;
+	
 	if (resIndex == -1) {
 		// Stop all sounds
 		_vm->_mixer->stopAll();
 		_vm->_screen->keepTalkTextItemsAlive();
 		for (int i = 0; i < kMaxChannels; i++) {
-			channels[i].type = kChannelTypeEmpty;
-			channels[i].resIndex = -1;
+			clearChannel(i);
 		}
 	} else if (type == -2) {
 		// Stop sounds with specified resIndex
 		for (int i = 0; i < kMaxChannels; i++) {
 			if (channels[i].resIndex == resIndex) {
 				_vm->_mixer->stopHandle(channels[i].handle);
-				channels[i].type = kChannelTypeEmpty;
-				channels[i].resIndex = -1;
+				clearChannel(i);
 			}
 		}
 	} else {
@@ -141,15 +130,13 @@ void Sound::internalPlaySound(int16 resIndex, int16 type, int16 volume, int16 pa
 
 			channels[freeChannel].type = type;
 			channels[freeChannel].resIndex = resIndex;
+			channels[freeChannel].volume = volume;
+			channels[freeChannel].panning = panning;
 
-			Audio::Mixer::SoundType soundType = Audio::Mixer::kPlainSoundType;
-			/*
-			switch (type) {
-			}
-			*/
+			Audio::Mixer::SoundType soundType = getScummVMSoundType((SoundChannelType)type);
 
 			_vm->_mixer->playStream(soundType, &channels[freeChannel].handle,
-				stream, -1, volume, panning);
+			                        stream, -1, volume, panning);
 		}
 
 	}
@@ -170,8 +157,7 @@ void Sound::stopSpeech() {
 		if (channels[i].type == kChannelTypeSpeech) {
 			_vm->_mixer->stopHandle(channels[i].handle);
 			_vm->_screen->keepTalkTextItemsAlive();
-			channels[i].type = kChannelTypeEmpty;
-			channels[i].resIndex = -1;
+			clearChannel(i);
 		}
 	}
 }
@@ -180,8 +166,7 @@ void Sound::stopAll() {
 	for (int i = 0; i < kMaxChannels; i++) {
 		_vm->_mixer->stopHandle(channels[i].handle);
 		_vm->_screen->keepTalkTextItemsAlive();
-		channels[i].type = kChannelTypeEmpty;
-		channels[i].resIndex = -1;
+		clearChannel(i);
 	}
 }
 
@@ -189,13 +174,22 @@ void Sound::saveState(Common::WriteStream *out) {
 	for (int i = 0; i < kMaxChannels; i++) {
 		out->writeSint16LE(channels[i].type);
 		out->writeSint16LE(channels[i].resIndex);
+		out->writeSint16LE(channels[i].volume);
+		out->writeSint16LE(channels[i].panning);
 	}
 }
 
-void Sound::loadState(Common::ReadStream *in) {
+void Sound::loadState(Common::ReadStream *in, int version) {
 	for (int i = 0; i < kMaxChannels; i++) {
 		channels[i].type = in->readSint16LE();
 		channels[i].resIndex = in->readSint16LE();
+		if (version < 4) {
+			channels[i].volume = (channels[i].type == kChannelTypeBackground) ? 50 : 100;
+			channels[i].panning = 0;
+		} else {
+			channels[i].volume = in->readSint16LE();
+			channels[i].panning = in->readSint16LE();
+		}
 
 		if (channels[i].type != kChannelTypeEmpty) {
 			Resource *soundResource = _vm->_res->load(channels[i].resIndex);
@@ -206,19 +200,26 @@ void Sound::loadState(Common::ReadStream *in) {
 								DisposeAfterUse::NO),
 								channels[i].type == kChannelTypeBackground ? 0 : 1);
 
-			Audio::Mixer::SoundType soundType = Audio::Mixer::kPlainSoundType;
-			/*
-			switch (type) {
-			}
-			*/
-
-			// TODO: Volume and panning
-			int16 volume = (channels[i].type == kChannelTypeBackground) ? 50 : 100;
+			Audio::Mixer::SoundType soundType = getScummVMSoundType((SoundChannelType)channels[i].type);
 
 			_vm->_mixer->playStream(soundType, &channels[i].handle,
-				stream, -1, volume, /*panning*/0);
+				stream, -1, channels[i].volume, channels[i].panning);
 		}
 	}
 }
 
+Audio::Mixer::SoundType Sound::getScummVMSoundType(SoundChannelType type) const {
+	switch (type) {
+	case kChannelTypeBackground:
+	case kChannelTypeSfx:
+		return Audio::Mixer::kSFXSoundType;
+	case kChannelTypeSpeech:
+		return Audio::Mixer::kSpeechSoundType;
+		break;
+	default:
+		return Audio::Mixer::kSFXSoundType;
+		break;
+	}
+}
+
 } // End of namespace Toltecs
diff --git a/engines/toltecs/sound.h b/engines/toltecs/sound.h
index e292d22c0f..48a6cd1318 100644
--- a/engines/toltecs/sound.h
+++ b/engines/toltecs/sound.h
@@ -42,6 +42,8 @@ enum SoundChannelType {
 struct SoundChannel {
 	int16 resIndex;
 	int16 type;
+	int16 volume;
+	int16 panning;
 	Audio::SoundHandle handle;
 };
 
@@ -60,15 +62,16 @@ public:
 	void stopAll();
 
 	void saveState(Common::WriteStream *out);
-	void loadState(Common::ReadStream *in);
+	void loadState(Common::ReadStream *in, int version);
 
 protected:
 	ToltecsEngine *_vm;
 
 	SoundChannel channels[kMaxChannels];
 
+	void clearChannel(int channel);
 	void internalPlaySound(int16 resIndex, int16 type, int16 volume, int16 panning);
-
+	Audio::Mixer::SoundType getScummVMSoundType(SoundChannelType type) const;
 };
 
 
diff --git a/engines/toltecs/toltecs.cpp b/engines/toltecs/toltecs.cpp
index 6d6c37dffd..b1f60c5cc7 100644
--- a/engines/toltecs/toltecs.cpp
+++ b/engines/toltecs/toltecs.cpp
@@ -62,11 +62,6 @@ struct GameSettings {
 };
 
 ToltecsEngine::ToltecsEngine(OSystem *syst, const ToltecsGameDescription *gameDesc) : Engine(syst), _gameDescription(gameDesc) {
-
-	// Setup mixer
-	_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
-	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume"));
-
 	_rnd = new Common::RandomSource("toltecs");
 }
 
@@ -129,14 +124,24 @@ Common::Error ToltecsEngine::run() {
 	
 	_sound = new Sound(this);
 
+	_cfgText = ConfMan.getBool("subtitles");
+	_cfgVoices = !ConfMan.getBool("speech_mute");
+
+	bool mute = false;
+	if (ConfMan.hasKey("mute"))
+		mute = ConfMan.getBool("mute");
+
+	_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, mute ? 0 : ConfMan.getInt("speech_volume"));
+	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType,  mute ? 0 : ConfMan.getInt("music_volume"));
+	_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType,    mute ? 0 : ConfMan.getInt("sfx_volume"));
 	syncSoundSettings();
 
 	CursorMan.showMouse(true);
 
 	setupSysStrings();
 
-//#define TEST_MENU
-#ifdef TEST_MENU
+#if 0
+	// Menu test
 	_screen->registerFont(0, 0x0D);
 	_screen->registerFont(1, 0x0E);
 	_screen->loadMouseCursor(12);
@@ -321,15 +326,14 @@ void ToltecsEngine::updateInput() {
 
 			//debug("key: flags = %02X; keycode = %d", _keyState.flags, _keyState.keycode);
 
-			// FIXME: This is just for debugging
 			switch (event.kbd.keycode) {
-			case Common::KEYCODE_F7:
-				savegame("toltecs.001", "Quicksave");
+			case Common::KEYCODE_F5:
+				showMenu(kMenuIdSave);
 				break;
-			case Common::KEYCODE_F9:
-				loadgame("toltecs.001");
+			case Common::KEYCODE_F7:
+				showMenu(kMenuIdLoad);
 				break;
-			case Common::KEYCODE_ESCAPE:
+			case Common::KEYCODE_SPACE:
 				// Skip current dialog line, if a dialog is active
 				if (_screen->getTalkTextDuration() > 0) {
 					_sound->stopSpeech();
@@ -635,7 +639,30 @@ int16 ToltecsEngine::findRectAtPoint(byte *rectData, int16 x, int16 y, int16 ind
 	}
 	
 	return -1;
+}
+
+void ToltecsEngine::showMenu(MenuID menuId) {
+	_screen->loadMouseCursor(12);
+	_palette->loadAddPalette(9, 224);
+	_palette->setDeltaPalette(_palette->getMainPalette(), 7, 0, 31, 224);
+	_screen->finishTalkTextItems();
+	_screen->clearSprites();
+	CursorMan.showMouse(true);
+	_menuSystem->run(menuId);
+	_keyState.reset();
+	_script->setSwitchLocalDataNear(true);
+}
+
+void ToltecsEngine::syncSoundSettings() {
+	Engine::syncSoundSettings();
+
+	bool mute = false;
+	if (ConfMan.hasKey("mute"))
+		mute = ConfMan.getBool("mute");
 
+	_cfgVoicesVolume  = (mute ? 0 : ConfMan.getInt("speech_volume")) * 20 / Audio::Mixer::kMaxChannelVolume;
+	_cfgMusicVolume   = (mute ? 0 : ConfMan.getInt("music_volume"))  * 20 / Audio::Mixer::kMaxChannelVolume;
+	_cfgSoundFXVolume = (mute ? 0 : ConfMan.getInt("sfx_volume"))    * 20 / Audio::Mixer::kMaxChannelVolume;
 }
 
 } // End of namespace Toltecs
diff --git a/engines/toltecs/toltecs.h b/engines/toltecs/toltecs.h
index efa1f9d13a..e82a88bcfc 100644
--- a/engines/toltecs/toltecs.h
+++ b/engines/toltecs/toltecs.h
@@ -81,6 +81,14 @@ enum SysString {
 	kSysStrCount
 };
 
+enum MenuID {
+	kMenuIdNone,
+	kMenuIdMain,
+	kMenuIdSave,
+	kMenuIdLoad,
+	kMenuIdVolumes
+};
+
 class ToltecsEngine : public ::Engine {
 	Common::KeyState _keyPressed;
 
@@ -99,6 +107,7 @@ public:
 	uint32 getFeatures() const;
 	Common::Language getLanguage() const;
 	const Common::String& getTargetName() const { return _targetName; }
+	void syncSoundSettings();
 
 	void setupSysStrings();
 	void requestSavegame(int slotNum, Common::String &description);
@@ -119,7 +128,9 @@ public:
 	void scrollCameraLeft(int16 delta);
 	void scrollCameraRight(int16 delta);
 	void updateCamera();
-	
+
+	void showMenu(MenuID menuId);
+
 	void talk(int16 slotIndex, int16 slotOffset);
 
 	void walk(byte *walkData);
@@ -127,6 +138,8 @@ public:
 	int16 findRectAtPoint(byte *rectData, int16 x, int16 y, int16 index, int16 itemSize, 
 		byte *rectDataEnd);
 
+	int _cfgVoicesVolume, _cfgMusicVolume, _cfgSoundFXVolume;
+	bool _cfgText, _cfgVoices;
 public:
 
 	AnimationPlayer *_anim;
diff --git a/engines/tony/custom.cpp b/engines/tony/custom.cpp
index f0a9197c6d..99debbfa0e 100644
--- a/engines/tony/custom.cpp
+++ b/engines/tony/custom.cpp
@@ -41,7 +41,7 @@
 
 namespace Tony {
 
-const char *ambianceFile[] =  {
+static const char *const kAmbianceFile[] =  {
 	"None",
 	"1.ADP",    // Grilli.WAV
 	"2.ADP",    // Grilli-Ovattati.WAV
@@ -52,66 +52,38 @@ const char *ambianceFile[] =  {
 	"6.ADP"     // Mare1.WAV half volume
 };
 
-struct MusicFileEntry {
-	const char *name;
-	int sync;
-};
-
-const MusicFileEntry musicFiles[] =  {
-	{"00.ADP", 0},    {"01.ADP", 0},
-	{"02.ADP", 0},    {"03.ADP", 0},
-	{"04.ADP", 0},    {"05.ADP", 0},
-	{"06.ADP", 0},    {"07.ADP", 0},
-	{"08.ADP", 2450}, {"09.ADP", 0},
-	{"10.ADP", 0},    {"11.ADP", 0},
-	{"12.ADP", 0},    {"13.ADP", 0},
-	{"14.ADP", 0},    {"15.ADP", 0},
-	{"16.ADP", 0},    {"17.ADP", 0},
-	{"18.ADP", 0},    {"19.ADP", 0},
-	{"20.ADP", 0},    {"21.ADP", 0},
-	{"22.ADP", 0},    {"23.ADP", 0},
-	{"24.ADP", 0},    {"25.ADP", 0},
-	{"26.ADP", 0},    {"27.ADP", 0},
-	{"28.ADP", 1670}, {"29.ADP", 0},
-	{"30.ADP", 0},    {"31.ADP", 0},
-	{"32.ADP", 2900}, {"33.ADP", 0},
-	{"34.ADP", 0},    {"35.ADP", 0},
-	{"36.ADP", 0},    {"37.ADP", 0},
-	{"38.ADP", 0},    {"39.ADP", 0},
-	{"40.ADP", 0},    {"41.ADP", 1920},
-	{"42.ADP", 1560}, {"43.ADP", 1920},
-	{"44.ADP", 1920}, {"45.ADP", 1920},
-	{"46.ADP", 1920}, {"47.ADP", 1920},
-	{"48.ADP", 1920}, {"49.ADP", 1920},
-	{"50.ADP", 1920}, {"51.ADP", 1920},
-	{"52.ADP", 1920}, {"53.ADP", 0},
-	{"54.ADP", 0},    {"55.ADP", 0},
-	{"56.ADP", 0},    {"57.ADP", 0},
-	{"58.ADP", 0},    {"59.ADP", 0}
+static const MusicFileEntry kMusicFiles[] =  {
+	{"00.ADP", 0},    {"01.ADP", 0},    {"02.ADP", 0},    {"03.ADP", 0},
+	{"04.ADP", 0},    {"05.ADP", 0},    {"06.ADP", 0},    {"07.ADP", 0},
+	{"08.ADP", 2450}, {"09.ADP", 0},    {"10.ADP", 0},    {"11.ADP", 0},
+	{"12.ADP", 0},    {"13.ADP", 0},    {"14.ADP", 0},    {"15.ADP", 0},
+	{"16.ADP", 0},    {"17.ADP", 0},    {"18.ADP", 0},    {"19.ADP", 0},
+	{"20.ADP", 0},    {"21.ADP", 0},    {"22.ADP", 0},    {"23.ADP", 0},
+	{"24.ADP", 0},    {"25.ADP", 0},    {"26.ADP", 0},    {"27.ADP", 0},
+	{"28.ADP", 1670}, {"29.ADP", 0},    {"30.ADP", 0},    {"31.ADP", 0},
+	{"32.ADP", 2900}, {"33.ADP", 0},    {"34.ADP", 0},    {"35.ADP", 0},
+	{"36.ADP", 0},    {"37.ADP", 0},    {"38.ADP", 0},    {"39.ADP", 0},
+	{"40.ADP", 0},    {"41.ADP", 1920}, {"42.ADP", 1560}, {"43.ADP", 1920},
+	{"44.ADP", 1920}, {"45.ADP", 1920}, {"46.ADP", 1920}, {"47.ADP", 1920},
+	{"48.ADP", 1920}, {"49.ADP", 1920}, {"50.ADP", 1920}, {"51.ADP", 1920},
+	{"52.ADP", 1920}, {"53.ADP", 0},    {"54.ADP", 0},    {"55.ADP", 0},
+	{"56.ADP", 0},    {"57.ADP", 0},    {"58.ADP", 0},    {"59.ADP", 0}
 };
 
 
-const char *jingleFileNames[] = {
-	"S00.ADP", "S01.ADP",
-	"S02.ADP", "S03.ADP",
-	"S04.ADP", "S05.ADP",
-	"S06.ADP", "S07.ADP",
-	"S08.ADP", "S09.ADP",
-	"S10.ADP", "S11.ADP",
-	"S12.ADP", "S13.ADP",
-	"S14.ADP", "S15.ADP",
-	"S16.ADP", "S17.ADP",
-	"S18.ADP"
+static const char *const kJingleFileNames[] = {
+	"S00.ADP", "S01.ADP", "S02.ADP", "S03.ADP", "S04.ADP", 
+	"S05.ADP", "S06.ADP", "S07.ADP", "S08.ADP", "S09.ADP", 
+	"S10.ADP", "S11.ADP", "S12.ADP", "S13.ADP", "S14.ADP", 
+	"S15.ADP", "S16.ADP", "S17.ADP", "S18.ADP"
 };
 
-
-void ReapplyChangedHotspot() {
-	int i;
-	for (i = 0; i < GLOBALS._curChangedHotspot; i++)
+void reapplyChangedHotspot() {
+	for (int i = 0; i < GLOBALS._curChangedHotspot; i++)
 		GLOBALS._loc->getItemFromCode(GLOBALS._changedHotspot[i]._dwCode)->changeHotspot(RMPoint(GLOBALS._changedHotspot[i]._nX, GLOBALS._changedHotspot[i]._nY));
 }
 
-void SaveChangedHotspot(Common::OutSaveFile *f) {
+void saveChangedHotspot(Common::OutSaveFile *f) {
 	f->writeByte(GLOBALS._curChangedHotspot);
 	if (GLOBALS._curChangedHotspot > 0) {
 		for (int i = 0; i < GLOBALS._curChangedHotspot; ++i)
@@ -119,7 +91,7 @@ void SaveChangedHotspot(Common::OutSaveFile *f) {
 	}
 }
 
-void LoadChangedHotspot(Common::InSaveFile *f) {
+void loadChangedHotspot(Common::InSaveFile *f) {
 	GLOBALS._curChangedHotspot = f->readByte();
 
 	if (GLOBALS._curChangedHotspot > 0) {
@@ -128,7 +100,6 @@ void LoadChangedHotspot(Common::InSaveFile *f) {
 	}
 }
 
-
 /**
  * Classes required for custom functions
  *
@@ -139,14 +110,14 @@ void LoadChangedHotspot(Common::InSaveFile *f) {
  * AddInventory -> theEngine.AddInventory()
 */
 
-void MCharResetCodes() {
+void mCharResetCodes() {
 	for (int i = 0; i < 10; i++)
 		GLOBALS._mCharacter[i]._item = GLOBALS._loc->getItemFromCode(GLOBALS._mCharacter[i]._code);
 	for (int i = 0; i < 10; i++)
 		GLOBALS._character[i]._item = GLOBALS._loc->getItemFromCode(GLOBALS._character[i]._code);
 }
 
-void CharsSaveAll(Common::OutSaveFile *f) {
+void charsSaveAll(Common::OutSaveFile *f) {
 	for (int i = 0; i < 10; i++) {
 		f->writeByte(GLOBALS._isMChar[i]);
 		if (GLOBALS._isMChar[i]) {
@@ -157,7 +128,7 @@ void CharsSaveAll(Common::OutSaveFile *f) {
 	}
 }
 
-void CharsLoadAll(Common::InSaveFile *f) {
+void charsLoadAll(Common::InSaveFile *f) {
 	for (int i = 0; i < 10; i++) {
 		GLOBALS._isMChar[i] = f->readByte();
 		if (GLOBALS._isMChar[i])
@@ -167,28 +138,28 @@ void CharsLoadAll(Common::InSaveFile *f) {
 	}
 }
 
-DECLARE_CUSTOM_FUNCTION(FaceToMe)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void faceToMe(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	GLOBALS._tony->setPattern(GLOBALS._tony->PAT_STANDDOWN);
 }
 
-DECLARE_CUSTOM_FUNCTION(BackToMe)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void backToMe(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	GLOBALS._tony->setPattern(GLOBALS._tony->PAT_STANDUP);
 }
 
-DECLARE_CUSTOM_FUNCTION(LeftToMe)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void leftToMe(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	GLOBALS._tony->setPattern(GLOBALS._tony->PAT_STANDLEFT);
 }
 
-DECLARE_CUSTOM_FUNCTION(RightToMe)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void rightToMe(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	GLOBALS._tony->setPattern(GLOBALS._tony->PAT_STANDRIGHT);
 }
 
 
-DECLARE_CUSTOM_FUNCTION(TonySetPerorate)(CORO_PARAM, uint32 bStatus, uint32, uint32, uint32) {
+void tonySetPerorate(CORO_PARAM, uint32 bStatus, uint32, uint32, uint32) {
 	g_vm->getEngine()->setPerorate(bStatus);
 }
 
-DECLARE_CUSTOM_FUNCTION(MySleep)(CORO_PARAM, uint32 dwTime, uint32, uint32, uint32) {
+void mySleep(CORO_PARAM, uint32 dwTime, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	int i;
 	CORO_END_CONTEXT(_ctx);
@@ -201,12 +172,12 @@ DECLARE_CUSTOM_FUNCTION(MySleep)(CORO_PARAM, uint32 dwTime, uint32, uint32, uint
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(SetAlwaysDisplay)(CORO_PARAM, uint32 val, uint32, uint32, uint32) {
+void setAlwaysDisplay(CORO_PARAM, uint32 val, uint32, uint32, uint32) {
 	GLOBALS._bAlwaysDisplay = (val != 0);
 }
 
 
-DECLARE_CUSTOM_FUNCTION(SetPointer)(CORO_PARAM, uint32 dwPointer, uint32, uint32, uint32) {
+void setPointer(CORO_PARAM, uint32 dwPointer, uint32, uint32, uint32) {
 	switch (dwPointer) {
 	case 1:
 		GLOBALS._pointer->setSpecialPointer(GLOBALS._pointer->PTR_ARROWUP);
@@ -230,7 +201,7 @@ DECLARE_CUSTOM_FUNCTION(SetPointer)(CORO_PARAM, uint32 dwPointer, uint32, uint32
 	}
 }
 
-VoiceHeader *SearchVoiceHeader(uint32 codehi, uint32 codelo) {
+VoiceHeader *searchVoiceHeader(uint32 codehi, uint32 codelo) {
 	int code = (codehi << 16) | codelo;
 
 	if (g_vm->_voices.size() == 0)
@@ -245,7 +216,7 @@ VoiceHeader *SearchVoiceHeader(uint32 codehi, uint32 codelo) {
 }
 
 
-DECLARE_CUSTOM_FUNCTION(SendTonyMessage)(CORO_PARAM, uint32 dwMessage, uint32 nX, uint32 nY, uint32) {
+void sendTonyMessage(CORO_PARAM, uint32 dwMessage, uint32 nX, uint32 nY, uint32) {
 	CORO_BEGIN_CONTEXT;
 	RMMessage msg;
 	int i;
@@ -266,7 +237,7 @@ DECLARE_CUSTOM_FUNCTION(SendTonyMessage)(CORO_PARAM, uint32 dwMessage, uint32 nX
 	if (!_ctx->msg.isValid())
 		return;
 
-	_ctx->curVoc = SearchVoiceHeader(0, dwMessage);
+	_ctx->curVoc = searchVoiceHeader(0, dwMessage);
 	_ctx->voice = NULL;
 	if (_ctx->curVoc) {
 		// Is positioned within the database of entries beginning at the first
@@ -362,12 +333,12 @@ DECLARE_CUSTOM_FUNCTION(SendTonyMessage)(CORO_PARAM, uint32 dwMessage, uint32 nX
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(ChangeBoxStatus)(CORO_PARAM, uint32 nLoc, uint32 nBox, uint32 nStatus, uint32) {
+void changeBoxStatus(CORO_PARAM, uint32 nLoc, uint32 nBox, uint32 nStatus, uint32) {
 	GLOBALS._boxes->changeBoxStatus(nLoc, nBox, nStatus);
 }
 
 
-DECLARE_CUSTOM_FUNCTION(CustLoadLocation)(CORO_PARAM, uint32 nLoc, uint32 tX, uint32 tY, uint32 bUseStartPos) {
+void custLoadLocation(CORO_PARAM, uint32 nLoc, uint32 tX, uint32 tY, uint32 bUseStartPos) {
 	CORO_BEGIN_CONTEXT;
 	uint32 h;
 	CORO_END_CONTEXT(_ctx);
@@ -390,7 +361,7 @@ DECLARE_CUSTOM_FUNCTION(CustLoadLocation)(CORO_PARAM, uint32 nLoc, uint32 tX, ui
 }
 
 
-DECLARE_CUSTOM_FUNCTION(SendFullscreenMsgStart)(CORO_PARAM, uint32 nMsg, uint32 nFont, uint32, uint32) {
+void sendFullscreenMsgStart(CORO_PARAM, uint32 nMsg, uint32 nFont, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	RMMessage *msg;
 	RMGfxClearTask clear;
@@ -449,7 +420,7 @@ DECLARE_CUSTOM_FUNCTION(SendFullscreenMsgStart)(CORO_PARAM, uint32 nMsg, uint32
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(ClearScreen)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void clearScreen(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	char buf[256];
 	RMGfxClearTask clear;
@@ -469,33 +440,33 @@ DECLARE_CUSTOM_FUNCTION(ClearScreen)(CORO_PARAM, uint32, uint32, uint32, uint32)
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(SendFullscreenMsgEnd)(CORO_PARAM, uint32 bNotEnableTony, uint32, uint32, uint32) {
+void sendFullscreenMsgEnd(CORO_PARAM, uint32 bNotEnableTony, uint32, uint32, uint32) {
 	g_vm->getEngine()->loadLocation(GLOBALS._fullScreenMessageLoc, RMPoint(GLOBALS._fullScreenMessagePt._x, GLOBALS._fullScreenMessagePt._y), RMPoint(-1, -1));
 	if (!bNotEnableTony)
 		GLOBALS._tony->show();
 
-	MCharResetCodes();
-	ReapplyChangedHotspot();
+	mCharResetCodes();
+	reapplyChangedHotspot();
 }
 
 
-DECLARE_CUSTOM_FUNCTION(SendFullscreenMessage)(CORO_PARAM, uint32 nMsg, uint32 nFont, uint32, uint32) {
+void sendFullscreenMessage(CORO_PARAM, uint32 nMsg, uint32 nFont, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
 	CORO_BEGIN_CODE(_ctx);
 
-	CORO_INVOKE_4(SendFullscreenMsgStart, nMsg, nFont, 0, 0);
-	CORO_INVOKE_4(SendFullscreenMsgEnd, 0, 0, 0, 0);
+	CORO_INVOKE_4(sendFullscreenMsgStart, nMsg, nFont, 0, 0);
+	CORO_INVOKE_4(sendFullscreenMsgEnd, 0, 0, 0, 0);
 
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(NoBullsEye)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void noBullsEye(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	GLOBALS._bNoBullsEye = true;
 }
 
-DECLARE_CUSTOM_FUNCTION(CloseLocation)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void closeLocation(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
@@ -515,7 +486,7 @@ DECLARE_CUSTOM_FUNCTION(CloseLocation)(CORO_PARAM, uint32, uint32, uint32, uint3
 }
 
 
-DECLARE_CUSTOM_FUNCTION(ChangeLocation)(CORO_PARAM, uint32 nLoc, uint32 tX, uint32 tY, uint32 bUseStartPos) {
+void changeLocation(CORO_PARAM, uint32 nLoc, uint32 tX, uint32 tY, uint32 bUseStartPos) {
 	CORO_BEGIN_CONTEXT;
 	uint32 h;
 	CORO_END_CONTEXT(_ctx);
@@ -543,7 +514,7 @@ DECLARE_CUSTOM_FUNCTION(ChangeLocation)(CORO_PARAM, uint32 nLoc, uint32 tX, uint
 	if (GLOBALS._lastTappeto != GLOBALS._ambiance[nLoc]) {
 		GLOBALS._lastTappeto = GLOBALS._ambiance[nLoc];
 		if (GLOBALS._lastTappeto != 0)
-			g_vm->playMusic(4, ambianceFile[GLOBALS._lastTappeto], 0, true, 2000);
+			g_vm->playMusic(4, kAmbianceFile[GLOBALS._lastTappeto], 0, true, 2000);
 	}
 
 	if (!GLOBALS._bNoBullsEye) {
@@ -566,51 +537,49 @@ DECLARE_CUSTOM_FUNCTION(ChangeLocation)(CORO_PARAM, uint32 nLoc, uint32 tX, uint
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(SetLocStartPosition)(CORO_PARAM, uint32 nLoc, uint32 lX, uint32 lY, uint32) {
+void setLocStartPosition(CORO_PARAM, uint32 nLoc, uint32 lX, uint32 lY, uint32) {
 	GLOBALS._startLocPos[nLoc].set(lX, lY);
 }
 
-DECLARE_CUSTOM_FUNCTION(SaveTonyPosition)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void saveTonyPosition(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	GLOBALS._saveTonyPos = GLOBALS._tony->position();
 	GLOBALS._saveTonyLoc = GLOBALS._loc->TEMPGetNumLoc();
 }
 
-DECLARE_CUSTOM_FUNCTION(RestoreTonyPosition)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void restoreTonyPosition(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
 	CORO_BEGIN_CODE(_ctx);
 
-	CORO_INVOKE_4(ChangeLocation, GLOBALS._saveTonyLoc, GLOBALS._saveTonyPos._x, GLOBALS._saveTonyPos._y, 0);
+	CORO_INVOKE_4(changeLocation, GLOBALS._saveTonyLoc, GLOBALS._saveTonyPos._x, GLOBALS._saveTonyPos._y, 0);
 
-	MCharResetCodes();
+	mCharResetCodes();
 
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(DisableInput)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void disableInput(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	g_vm->getEngine()->disableInput();
 }
 
-DECLARE_CUSTOM_FUNCTION(EnableInput)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void enableInput(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	g_vm->getEngine()->enableInput();
 }
 
-DECLARE_CUSTOM_FUNCTION(StopTony)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void stopTony(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	GLOBALS._tony->stopNoAction(coroParam);
 }
 
-DECLARE_CUSTOM_FUNCTION(CustEnableGUI)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void custEnableGUI(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	GLOBALS.EnableGUI();
 }
 
-DECLARE_CUSTOM_FUNCTION(CustDisableGUI)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void custDisableGUI(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	GLOBALS.DisableGUI();
 }
 
-
-
-void TonyGenericTake1(CORO_PARAM, uint32 nDirection) {
+void tonyGenericTake1(CORO_PARAM, uint32 nDirection) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
@@ -624,7 +593,7 @@ void TonyGenericTake1(CORO_PARAM, uint32 nDirection) {
 	CORO_END_CODE;
 }
 
-void TonyGenericTake2(CORO_PARAM, uint32 nDirection) {
+void tonyGenericTake2(CORO_PARAM, uint32 nDirection) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
@@ -640,7 +609,7 @@ void TonyGenericTake2(CORO_PARAM, uint32 nDirection) {
 	CORO_END_CODE;
 }
 
-void TonyGenericPut1(CORO_PARAM, uint32 nDirection) {
+void tonyGenericPut1(CORO_PARAM, uint32 nDirection) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
@@ -654,7 +623,7 @@ void TonyGenericPut1(CORO_PARAM, uint32 nDirection) {
 	CORO_END_CODE;
 }
 
-void TonyGenericPut2(CORO_PARAM, uint32 nDirection) {
+void tonyGenericPut2(CORO_PARAM, uint32 nDirection) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
@@ -671,71 +640,65 @@ void TonyGenericPut2(CORO_PARAM, uint32 nDirection) {
 }
 
 
-DECLARE_CUSTOM_FUNCTION(TonyTakeUp1)(CORO_PARAM, uint32, uint32, uint32, uint32) {
-	TonyGenericTake1(coroParam, 0);
+void tonyTakeUp1(CORO_PARAM, uint32, uint32, uint32, uint32) {
+	tonyGenericTake1(coroParam, 0);
 }
 
 
-DECLARE_CUSTOM_FUNCTION(TonyTakeMid1)(CORO_PARAM, uint32, uint32, uint32, uint32) {
-	TonyGenericTake1(coroParam, 1);
+void tonyTakeMid1(CORO_PARAM, uint32, uint32, uint32, uint32) {
+	tonyGenericTake1(coroParam, 1);
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyTakeDown1)(CORO_PARAM, uint32, uint32, uint32, uint32) {
-	TonyGenericTake1(coroParam, 2);
+void tonyTakeDown1(CORO_PARAM, uint32, uint32, uint32, uint32) {
+	tonyGenericTake1(coroParam, 2);
 }
 
-
-
-DECLARE_CUSTOM_FUNCTION(TonyTakeUp2)(CORO_PARAM, uint32, uint32, uint32, uint32) {
-	TonyGenericTake2(coroParam, 0);
+void tonyTakeUp2(CORO_PARAM, uint32, uint32, uint32, uint32) {
+	tonyGenericTake2(coroParam, 0);
 }
 
 
-DECLARE_CUSTOM_FUNCTION(TonyTakeMid2)(CORO_PARAM, uint32, uint32, uint32, uint32) {
-	TonyGenericTake2(coroParam, 1);
+void tonyTakeMid2(CORO_PARAM, uint32, uint32, uint32, uint32) {
+	tonyGenericTake2(coroParam, 1);
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyTakeDown2)(CORO_PARAM, uint32, uint32, uint32, uint32) {
-	TonyGenericTake2(coroParam, 2);
+void tonyTakeDown2(CORO_PARAM, uint32, uint32, uint32, uint32) {
+	tonyGenericTake2(coroParam, 2);
 }
 
-
-
-DECLARE_CUSTOM_FUNCTION(TonyPutUp1)(CORO_PARAM, uint32, uint32, uint32, uint32) {
-	TonyGenericPut1(coroParam, 0);
+void tonyPutUp1(CORO_PARAM, uint32, uint32, uint32, uint32) {
+	tonyGenericPut1(coroParam, 0);
 }
 
-
-DECLARE_CUSTOM_FUNCTION(TonyPutMid1)(CORO_PARAM, uint32, uint32, uint32, uint32) {
-	TonyGenericPut1(coroParam, 1);
+void tonyPutMid1(CORO_PARAM, uint32, uint32, uint32, uint32) {
+	tonyGenericPut1(coroParam, 1);
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyPutDown1)(CORO_PARAM, uint32, uint32, uint32, uint32) {
-	TonyGenericPut1(coroParam, 2);
+void tonyPutDown1(CORO_PARAM, uint32, uint32, uint32, uint32) {
+	tonyGenericPut1(coroParam, 2);
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyPutUp2)(CORO_PARAM, uint32, uint32, uint32, uint32) {
-	TonyGenericPut2(coroParam, 0);
+void tonyPutUp2(CORO_PARAM, uint32, uint32, uint32, uint32) {
+	tonyGenericPut2(coroParam, 0);
 }
 
-
-DECLARE_CUSTOM_FUNCTION(TonyPutMid2)(CORO_PARAM, uint32, uint32, uint32, uint32) {
-	TonyGenericPut2(coroParam, 1);
+void tonyPutMid2(CORO_PARAM, uint32, uint32, uint32, uint32) {
+	tonyGenericPut2(coroParam, 1);
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyPutDown2)(CORO_PARAM, uint32, uint32, uint32, uint32) {
-	TonyGenericPut2(coroParam, 2);
+void tonyPutDown2(CORO_PARAM, uint32, uint32, uint32, uint32) {
+	tonyGenericPut2(coroParam, 2);
 }
 
 
-DECLARE_CUSTOM_FUNCTION(TonyOnTheFloor)(CORO_PARAM, uint32 dwParte, uint32, uint32, uint32) {
+void tonyOnTheFloor(CORO_PARAM, uint32 dwParte, uint32, uint32, uint32) {
 	if (dwParte == 0)
 		GLOBALS._tony->setPattern(GLOBALS._tony->PAT_ONTHEFLOORLEFT);
 	else
 		GLOBALS._tony->setPattern(GLOBALS._tony->PAT_ONTHEFLOORRIGHT);
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyGetUp)(CORO_PARAM, uint32 dwParte, uint32, uint32, uint32) {
+void tonyGetUp(CORO_PARAM, uint32 dwParte, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
@@ -752,11 +715,11 @@ DECLARE_CUSTOM_FUNCTION(TonyGetUp)(CORO_PARAM, uint32 dwParte, uint32, uint32, u
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyShepherdess)(CORO_PARAM, uint32 bIsPast, uint32, uint32, uint32) {
+void tonyShepherdess(CORO_PARAM, uint32 bIsPast, uint32, uint32, uint32) {
 	GLOBALS._tony->setShepherdess(bIsPast);
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyWhistle)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void tonyWhistle(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
@@ -771,98 +734,97 @@ DECLARE_CUSTOM_FUNCTION(TonyWhistle)(CORO_PARAM, uint32, uint32, uint32, uint32)
 	CORO_END_CODE;
 }
 
-
-void TonySetNumTexts(uint32 dwText) {
+void tonySetNumTexts(uint32 dwText) {
 	GLOBALS._dwTonyNumTexts = dwText;
 	GLOBALS._bTonyInTexts = false;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyLaugh)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
-	TonySetNumTexts(dwText);
+void tonyLaugh(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
+	tonySetNumTexts(dwText);
 	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_LAUGH;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyGiggle)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
-	TonySetNumTexts(dwText);
+void tonyGiggle(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
+	tonySetNumTexts(dwText);
 	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_LAUGH2;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyHips)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
-	TonySetNumTexts(dwText);
+void tonyHips(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
+	tonySetNumTexts(dwText);
 	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_HIPS;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonySing)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
-	TonySetNumTexts(dwText);
+void tonySing(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
+	tonySetNumTexts(dwText);
 	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_SING;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyIndicate)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
-	TonySetNumTexts(dwText);
+void tonyIndicate(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
+	tonySetNumTexts(dwText);
 	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_INDICATE;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyScaredWithHands)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
-	TonySetNumTexts(dwText);
+void tonyScaredWithHands(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
+	tonySetNumTexts(dwText);
 	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_SCARED;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyScaredWithoutHands)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
-	TonySetNumTexts(dwText);
+void tonyScaredWithoutHands(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
+	tonySetNumTexts(dwText);
 	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_SCARED2;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyWithHammer)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
-	TonySetNumTexts(dwText);
+void tonyWithHammer(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
+	tonySetNumTexts(dwText);
 	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_WITHHAMMER;
 	GLOBALS._tony->setPattern(GLOBALS._tony->PAT_WITHHAMMER);
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyWithGlasses)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
-	TonySetNumTexts(dwText);
+void tonyWithGlasses(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
+	tonySetNumTexts(dwText);
 	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_WITHGLASSES;
 	GLOBALS._tony->setPattern(GLOBALS._tony->PAT_WITHGLASSES);
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyWithWorm)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
-	TonySetNumTexts(dwText);
+void tonyWithWorm(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
+	tonySetNumTexts(dwText);
 	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_WITHWORM;
 	GLOBALS._tony->setPattern(GLOBALS._tony->PAT_WITHWORM);
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyWithRope)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
-	TonySetNumTexts(dwText);
+void tonyWithRope(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
+	tonySetNumTexts(dwText);
 	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_WITHROPE;
 	GLOBALS._tony->setPattern(GLOBALS._tony->PAT_WITHROPE);
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyWithSecretary)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
-	TonySetNumTexts(dwText);
+void tonyWithSecretary(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
+	tonySetNumTexts(dwText);
 	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_WITHSECRETARY;
 	GLOBALS._tony->setPattern(GLOBALS._tony->PAT_WITHSECRETARY);
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyWithRabbitANIM)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
-	TonySetNumTexts(dwText);
+void tonyWithRabbitANIM(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
+	tonySetNumTexts(dwText);
 	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_WITHRABBIT;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyWithRecipeANIM)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
-	TonySetNumTexts(dwText);
+void tonyWithRecipeANIM(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
+	tonySetNumTexts(dwText);
 	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_WITHRECIPE;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyWithCardsANIM)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
-	TonySetNumTexts(dwText);
+void tonyWithCardsANIM(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
+	tonySetNumTexts(dwText);
 	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_WITHCARDS;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyWithSnowmanANIM)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
-	TonySetNumTexts(dwText);
+void tonyWithSnowmanANIM(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
+	tonySetNumTexts(dwText);
 	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_WITHSNOWMAN;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyWithSnowmanStart)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void tonyWithSnowmanStart(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
@@ -875,7 +837,7 @@ DECLARE_CUSTOM_FUNCTION(TonyWithSnowmanStart)(CORO_PARAM, uint32, uint32, uint32
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyWithSnowmanEnd)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void tonyWithSnowmanEnd(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
@@ -888,7 +850,7 @@ DECLARE_CUSTOM_FUNCTION(TonyWithSnowmanEnd)(CORO_PARAM, uint32, uint32, uint32,
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyWithRabbitStart)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void tonyWithRabbitStart(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
@@ -901,7 +863,7 @@ DECLARE_CUSTOM_FUNCTION(TonyWithRabbitStart)(CORO_PARAM, uint32, uint32, uint32,
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyWithRabbitEnd)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void tonyWithRabbitEnd(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
@@ -914,7 +876,7 @@ DECLARE_CUSTOM_FUNCTION(TonyWithRabbitEnd)(CORO_PARAM, uint32, uint32, uint32, u
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyWithRecipeStart)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void tonyWithRecipeStart(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
@@ -927,7 +889,7 @@ DECLARE_CUSTOM_FUNCTION(TonyWithRecipeStart)(CORO_PARAM, uint32, uint32, uint32,
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyWithRecipeEnd)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void tonyWithRecipeEnd(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
@@ -940,7 +902,7 @@ DECLARE_CUSTOM_FUNCTION(TonyWithRecipeEnd)(CORO_PARAM, uint32, uint32, uint32, u
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyWithCardsStart)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void tonyWithCardsStart(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
@@ -953,7 +915,7 @@ DECLARE_CUSTOM_FUNCTION(TonyWithCardsStart)(CORO_PARAM, uint32, uint32, uint32,
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyWithCardsEnd)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void tonyWithCardsEnd(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
@@ -966,7 +928,7 @@ DECLARE_CUSTOM_FUNCTION(TonyWithCardsEnd)(CORO_PARAM, uint32, uint32, uint32, ui
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyWithNotebookStart)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void tonyWithNotebookStart(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
@@ -979,7 +941,7 @@ DECLARE_CUSTOM_FUNCTION(TonyWithNotebookStart)(CORO_PARAM, uint32, uint32, uint3
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyWithNotebookEnd)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void tonyWithNotebookEnd(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
@@ -992,7 +954,7 @@ DECLARE_CUSTOM_FUNCTION(TonyWithNotebookEnd)(CORO_PARAM, uint32, uint32, uint32,
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyWithMegaphoneStart)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void tonyWithMegaphoneStart(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
@@ -1005,7 +967,7 @@ DECLARE_CUSTOM_FUNCTION(TonyWithMegaphoneStart)(CORO_PARAM, uint32, uint32, uint
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyWithMegaphoneEnd)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void tonyWithMegaphoneEnd(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
@@ -1018,7 +980,7 @@ DECLARE_CUSTOM_FUNCTION(TonyWithMegaphoneEnd)(CORO_PARAM, uint32, uint32, uint32
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyWithBeardStart)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void tonyWithBeardStart(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
@@ -1031,7 +993,7 @@ DECLARE_CUSTOM_FUNCTION(TonyWithBeardStart)(CORO_PARAM, uint32, uint32, uint32,
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyWithBeardEnd)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void tonyWithBeardEnd(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
@@ -1044,7 +1006,7 @@ DECLARE_CUSTOM_FUNCTION(TonyWithBeardEnd)(CORO_PARAM, uint32, uint32, uint32, ui
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyScaredStart)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void tonyScaredStart(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
@@ -1057,7 +1019,7 @@ DECLARE_CUSTOM_FUNCTION(TonyScaredStart)(CORO_PARAM, uint32, uint32, uint32, uin
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyScaredEnd)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void tonyScaredEnd(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
@@ -1071,12 +1033,12 @@ DECLARE_CUSTOM_FUNCTION(TonyScaredEnd)(CORO_PARAM, uint32, uint32, uint32, uint3
 }
 
 
-DECLARE_CUSTOM_FUNCTION(TonyDisgusted)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
-	TonySetNumTexts(dwText);
+void tonyDisgusted(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
+	tonySetNumTexts(dwText);
 	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_DISGUSTED;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonySniffLeft)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void tonySniffLeft(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
@@ -1084,12 +1046,12 @@ DECLARE_CUSTOM_FUNCTION(TonySniffLeft)(CORO_PARAM, uint32, uint32, uint32, uint3
 
 	GLOBALS._tony->setPattern(GLOBALS._tony->PAT_SNIFF_LEFT);
 	CORO_INVOKE_0(GLOBALS._tony->waitForEndPattern);
-	CORO_INVOKE_4(LeftToMe, 0, 0, 0, 0);
+	CORO_INVOKE_4(leftToMe, 0, 0, 0, 0);
 
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonySniffRight)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void tonySniffRight(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
@@ -1097,17 +1059,17 @@ DECLARE_CUSTOM_FUNCTION(TonySniffRight)(CORO_PARAM, uint32, uint32, uint32, uint
 
 	GLOBALS._tony->setPattern(GLOBALS._tony->PAT_SNIFF_RIGHT);
 	CORO_INVOKE_0(GLOBALS._tony->waitForEndPattern);
-	CORO_INVOKE_4(RightToMe, 0, 0, 0, 0);
+	CORO_INVOKE_4(rightToMe, 0, 0, 0, 0);
 
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonySarcastic)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
-	TonySetNumTexts(dwText);
+void tonySarcastic(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
+	tonySetNumTexts(dwText);
 	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_SARCASTIC;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyMacbeth)(CORO_PARAM, uint32 nPos, uint32, uint32, uint32) {
+void tonyMacbeth(CORO_PARAM, uint32 nPos, uint32, uint32, uint32) {
 	switch (nPos) {
 	case 1:
 		GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_MACBETH1;
@@ -1140,15 +1102,15 @@ DECLARE_CUSTOM_FUNCTION(TonyMacbeth)(CORO_PARAM, uint32 nPos, uint32, uint32, ui
 }
 
 
-DECLARE_CUSTOM_FUNCTION(EnableTony)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void enableTony(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	GLOBALS._tony->show();
 }
 
-DECLARE_CUSTOM_FUNCTION(DisableTony)(CORO_PARAM, uint32 bShowShadow, uint32, uint32, uint32) {
+void disableTony(CORO_PARAM, uint32 bShowShadow, uint32, uint32, uint32) {
 	GLOBALS._tony->hide(bShowShadow);
 }
 
-DECLARE_CUSTOM_FUNCTION(WaitForPatternEnd)(CORO_PARAM, uint32 nItem, uint32, uint32, uint32) {
+void waitForPatternEnd(CORO_PARAM, uint32 nItem, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	RMItem *item;
 	CORO_END_CONTEXT(_ctx);
@@ -1164,11 +1126,11 @@ DECLARE_CUSTOM_FUNCTION(WaitForPatternEnd)(CORO_PARAM, uint32 nItem, uint32, uin
 }
 
 
-DECLARE_CUSTOM_FUNCTION(SetTonyPosition)(CORO_PARAM, uint32 nX, uint32 nY, uint32 nLoc, uint32) {
+void setTonyPosition(CORO_PARAM, uint32 nX, uint32 nY, uint32 nLoc, uint32) {
 	GLOBALS._tony->setPosition(RMPoint(nX, nY), nLoc);
 }
 
-DECLARE_CUSTOM_FUNCTION(MoveTonyAndWait)(CORO_PARAM, uint32 nX, uint32 nY, uint32, uint32) {
+void moveTonyAndWait(CORO_PARAM, uint32 nX, uint32 nY, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
@@ -1187,11 +1149,11 @@ DECLARE_CUSTOM_FUNCTION(MoveTonyAndWait)(CORO_PARAM, uint32 nX, uint32 nY, uint3
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(MoveTony)(CORO_PARAM, uint32 nX, uint32 nY, uint32, uint32) {
+void moveTony(CORO_PARAM, uint32 nX, uint32 nY, uint32, uint32) {
 	GLOBALS._tony->move(coroParam, RMPoint(nX, nY));
 }
 
-DECLARE_CUSTOM_FUNCTION(ScrollLocation)(CORO_PARAM, uint32 nX, uint32 nY, uint32 sX, uint32 sY) {
+void scrollLocation(CORO_PARAM, uint32 nX, uint32 nY, uint32 sX, uint32 sY) {
 	CORO_BEGIN_CONTEXT;
 	int lx, ly;
 	RMPoint pt;
@@ -1239,7 +1201,7 @@ DECLARE_CUSTOM_FUNCTION(ScrollLocation)(CORO_PARAM, uint32 nX, uint32 nY, uint32
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(SyncScrollLocation)(CORO_PARAM, uint32 nX, uint32 nY, uint32 sX, uint32 sY) {
+void syncScrollLocation(CORO_PARAM, uint32 nX, uint32 nY, uint32 sX, uint32 sY) {
 	CORO_BEGIN_CONTEXT;
 	int lx, ly;
 	RMPoint pt, startpt;
@@ -1321,7 +1283,7 @@ DECLARE_CUSTOM_FUNCTION(SyncScrollLocation)(CORO_PARAM, uint32 nX, uint32 nY, ui
 }
 
 
-DECLARE_CUSTOM_FUNCTION(ChangeHotspot)(CORO_PARAM, uint32 dwCode, uint32 nX, uint32 nY, uint32) {
+void changeHotspot(CORO_PARAM, uint32 dwCode, uint32 nX, uint32 nY, uint32) {
 	int i;
 
 	for (i = 0; i < GLOBALS._curChangedHotspot; i++) {
@@ -1343,15 +1305,15 @@ DECLARE_CUSTOM_FUNCTION(ChangeHotspot)(CORO_PARAM, uint32 dwCode, uint32 nX, uin
 }
 
 
-DECLARE_CUSTOM_FUNCTION(AutoSave)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void autoSave(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	g_vm->autoSave(coroParam);
 }
 
-DECLARE_CUSTOM_FUNCTION(AbortGame)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void abortGame(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	g_vm->abortGame();
 }
 
-DECLARE_CUSTOM_FUNCTION(ShakeScreen)(CORO_PARAM, uint32 nScosse, uint32, uint32, uint32) {
+void shakeScreen(CORO_PARAM, uint32 nScosse, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	uint32 i;
 	uint32 curTime;
@@ -1389,7 +1351,7 @@ DECLARE_CUSTOM_FUNCTION(ShakeScreen)(CORO_PARAM, uint32 nScosse, uint32, uint32,
  *  Characters
  */
 
-DECLARE_CUSTOM_FUNCTION(CharSetCode)(CORO_PARAM, uint32 nChar, uint32 nCode, uint32, uint32) {
+void charSetCode(CORO_PARAM, uint32 nChar, uint32 nCode, uint32, uint32) {
 	assert(nChar < 16);
 	GLOBALS._character[nChar]._code = nCode;
 	GLOBALS._character[nChar]._item = GLOBALS._loc->getItemFromCode(nCode);
@@ -1404,26 +1366,26 @@ DECLARE_CUSTOM_FUNCTION(CharSetCode)(CORO_PARAM, uint32 nChar, uint32 nCode, uin
 	GLOBALS._isMChar[nChar] = false;
 }
 
-DECLARE_CUSTOM_FUNCTION(CharSetColor)(CORO_PARAM, uint32 nChar, uint32 r, uint32 g, uint32 b) {
+void charSetColor(CORO_PARAM, uint32 nChar, uint32 r, uint32 g, uint32 b) {
 	assert(nChar < 16);
 	GLOBALS._character[nChar]._r = r;
 	GLOBALS._character[nChar]._g = g;
 	GLOBALS._character[nChar]._b = b;
 }
 
-DECLARE_CUSTOM_FUNCTION(CharSetTalkPattern)(CORO_PARAM, uint32 nChar, uint32 tp, uint32 sp, uint32) {
+void charSetTalkPattern(CORO_PARAM, uint32 nChar, uint32 tp, uint32 sp, uint32) {
 	assert(nChar < 16);
 	GLOBALS._character[nChar]._talkPattern = tp;
 	GLOBALS._character[nChar]._standPattern = sp;
 }
 
-DECLARE_CUSTOM_FUNCTION(CharSetStartEndTalkPattern)(CORO_PARAM, uint32 nChar, uint32 sp, uint32 ep, uint32) {
+void charSetStartEndTalkPattern(CORO_PARAM, uint32 nChar, uint32 sp, uint32 ep, uint32) {
 	assert(nChar < 16);
 	GLOBALS._character[nChar]._startTalkPattern = sp;
 	GLOBALS._character[nChar]._endTalkPattern = ep;
 }
 
-DECLARE_CUSTOM_FUNCTION(CharSendMessage)(CORO_PARAM, uint32 nChar, uint32 dwMessage, uint32 bIsBack, uint32) {
+void charSendMessage(CORO_PARAM, uint32 nChar, uint32 dwMessage, uint32 bIsBack, uint32) {
 	CORO_BEGIN_CONTEXT;
 	RMMessage *msg;
 	int i;
@@ -1450,7 +1412,7 @@ DECLARE_CUSTOM_FUNCTION(CharSendMessage)(CORO_PARAM, uint32 nChar, uint32 dwMess
 
 	GLOBALS._character[nChar]._item->setPattern(GLOBALS._character[nChar]._talkPattern);
 
-	_ctx->curVoc = SearchVoiceHeader(0, dwMessage);
+	_ctx->curVoc = searchVoiceHeader(0, dwMessage);
 	_ctx->voice = NULL;
 	if (_ctx->curVoc) {
 		// Position within the database of entries, beginning at the first
@@ -1530,15 +1492,15 @@ DECLARE_CUSTOM_FUNCTION(CharSendMessage)(CORO_PARAM, uint32 nChar, uint32 dwMess
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(AddInventory)(CORO_PARAM, uint32 dwCode, uint32, uint32, uint32) {
+void addInventory(CORO_PARAM, uint32 dwCode, uint32, uint32, uint32) {
 	GLOBALS._inventory->addItem(dwCode);
 }
 
-DECLARE_CUSTOM_FUNCTION(RemoveInventory)(CORO_PARAM, uint32 dwCode, uint32, uint32, uint32) {
+void removeInventory(CORO_PARAM, uint32 dwCode, uint32, uint32, uint32) {
 	GLOBALS._inventory->removeItem(dwCode);
 }
 
-DECLARE_CUSTOM_FUNCTION(ChangeInventoryStatus)(CORO_PARAM, uint32 dwCode, uint32 dwStatus, uint32, uint32) {
+void changeInventoryStatus(CORO_PARAM, uint32 dwCode, uint32 dwStatus, uint32, uint32) {
 	GLOBALS._inventory->changeItemStatus(dwCode, dwStatus);
 }
 
@@ -1547,7 +1509,7 @@ DECLARE_CUSTOM_FUNCTION(ChangeInventoryStatus)(CORO_PARAM, uint32 dwCode, uint32
  * Master Characters
  */
 
-DECLARE_CUSTOM_FUNCTION(MCharSetCode)(CORO_PARAM, uint32 nChar, uint32 nCode, uint32, uint32) {
+void mCharSetCode(CORO_PARAM, uint32 nChar, uint32 nCode, uint32, uint32) {
 	assert(nChar < 10);
 	GLOBALS._mCharacter[nChar]._code = nCode;
 	if (nCode == 0)
@@ -1569,56 +1531,52 @@ DECLARE_CUSTOM_FUNCTION(MCharSetCode)(CORO_PARAM, uint32 nChar, uint32 nCode, ui
 	GLOBALS._isMChar[nChar] = true;
 }
 
-DECLARE_CUSTOM_FUNCTION(MCharResetCode)(CORO_PARAM, uint32 nChar, uint32, uint32, uint32) {
+void mCharResetCode(CORO_PARAM, uint32 nChar, uint32, uint32, uint32) {
 	GLOBALS._mCharacter[nChar]._item = GLOBALS._loc->getItemFromCode(GLOBALS._mCharacter[nChar]._code);
 }
 
 
-DECLARE_CUSTOM_FUNCTION(MCharSetPosition)(CORO_PARAM, uint32 nChar, uint32 nX, uint32 nY, uint32) {
+void mCharSetPosition(CORO_PARAM, uint32 nChar, uint32 nX, uint32 nY, uint32) {
 	assert(nChar < 10);
 	GLOBALS._mCharacter[nChar]._x = nX;
 	GLOBALS._mCharacter[nChar]._y = nY;
 }
 
-
-DECLARE_CUSTOM_FUNCTION(MCharSetColor)(CORO_PARAM, uint32 nChar, uint32 r, uint32 g, uint32 b) {
+void mCharSetColor(CORO_PARAM, uint32 nChar, uint32 r, uint32 g, uint32 b) {
 	assert(nChar < 10);
 	GLOBALS._mCharacter[nChar]._r = r;
 	GLOBALS._mCharacter[nChar]._g = g;
 	GLOBALS._mCharacter[nChar]._b = b;
 }
 
-
-DECLARE_CUSTOM_FUNCTION(MCharSetNumTalksInGroup)(CORO_PARAM, uint32 nChar, uint32 nGroup, uint32 nTalks, uint32) {
+void mCharSetNumTalksInGroup(CORO_PARAM, uint32 nChar, uint32 nGroup, uint32 nTalks, uint32) {
 	assert(nChar < 10);
 	assert(nGroup < 10);
 
 	GLOBALS._mCharacter[nChar]._numTalks[nGroup] = nTalks;
 }
 
-
-DECLARE_CUSTOM_FUNCTION(MCharSetCurrentGroup)(CORO_PARAM, uint32 nChar, uint32 nGroup, uint32, uint32) {
+void mCharSetCurrentGroup(CORO_PARAM, uint32 nChar, uint32 nGroup, uint32, uint32) {
 	assert(nChar < 10);
 	assert(nGroup < 10);
 
 	GLOBALS._mCharacter[nChar]._curGroup = nGroup;
 }
 
-DECLARE_CUSTOM_FUNCTION(MCharSetNumTexts)(CORO_PARAM, uint32 nChar, uint32 nTexts, uint32, uint32) {
+void mCharSetNumTexts(CORO_PARAM, uint32 nChar, uint32 nTexts, uint32, uint32) {
 	assert(nChar < 10);
 
 	GLOBALS._mCharacter[nChar]._numTexts = nTexts - 1;
 	GLOBALS._mCharacter[nChar]._bInTexts = false;
 }
 
-DECLARE_CUSTOM_FUNCTION(MCharSetAlwaysBack)(CORO_PARAM, uint32 nChar, uint32 bAlwaysBack, uint32, uint32) {
+void mCharSetAlwaysBack(CORO_PARAM, uint32 nChar, uint32 bAlwaysBack, uint32, uint32) {
 	assert(nChar < 10);
 
 	GLOBALS._mCharacter[nChar]._bAlwaysBack = bAlwaysBack;
 }
 
-
-DECLARE_CUSTOM_FUNCTION(MCharSendMessage)(CORO_PARAM, uint32 nChar, uint32 dwMessage, uint32 bIsBack, uint32 nFont) {
+void mCharSendMessage(CORO_PARAM, uint32 nChar, uint32 dwMessage, uint32 bIsBack, uint32 nFont) {
 	CORO_BEGIN_CONTEXT;
 	RMMessage *msg;
 	int i;
@@ -1658,11 +1616,10 @@ DECLARE_CUSTOM_FUNCTION(MCharSendMessage)(CORO_PARAM, uint32 nChar, uint32 dwMes
 		}
 	}
 
-	_ctx->curVoc = SearchVoiceHeader(0, dwMessage);
+	_ctx->curVoc = searchVoiceHeader(0, dwMessage);
 	_ctx->voice = NULL;
 	if (_ctx->curVoc) {
 		// Position within the database of entries, beginning at the first
-		// fseek(g_vm->m_vdbFP, curVoc->offset, SEEK_SET);
 		g_vm->_vdbFP.seek(_ctx->curVoc->_offset);
 		_ctx->curOffset = _ctx->curVoc->_offset;
 	}
@@ -1744,9 +1701,7 @@ DECLARE_CUSTOM_FUNCTION(MCharSendMessage)(CORO_PARAM, uint32 nChar, uint32 dwMes
  *  Dialogs
  */
 
-int g_curDialog;
-
-DECLARE_CUSTOM_FUNCTION(SendDialogMessage)(CORO_PARAM, uint32 nPers, uint32 nMsg, uint32, uint32) {
+void sendDialogMessage(CORO_PARAM, uint32 nPers, uint32 nMsg, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	char *string;
 	RMTextDialog *text;
@@ -1766,7 +1721,7 @@ DECLARE_CUSTOM_FUNCTION(SendDialogMessage)(CORO_PARAM, uint32 nPers, uint32 nMsg
 	if (nPers != 0 && GLOBALS._isMChar[nPers] && GLOBALS._mCharacter[nPers]._bAlwaysBack)
 		_ctx->bIsBack = true;
 
-	_ctx->curVoc = SearchVoiceHeader(g_curDialog, nMsg);
+	_ctx->curVoc = searchVoiceHeader(GLOBALS._curDialog, nMsg);
 	_ctx->voice = NULL;
 
 	if (_ctx->curVoc) {
@@ -1927,7 +1882,7 @@ DECLARE_CUSTOM_FUNCTION(SendDialogMessage)(CORO_PARAM, uint32 nPers, uint32 nMsg
 
 // @@@@ This cannot be skipped!!!!!!!!!!!!!!!!!!!
 
-DECLARE_CUSTOM_FUNCTION(StartDialog)(CORO_PARAM, uint32 nDialog, uint32 nStartGroup, uint32, uint32) {
+void startDialog(CORO_PARAM, uint32 nDialog, uint32 nStartGroup, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	uint32 nChoice;
 	uint32 *sl;
@@ -1939,7 +1894,7 @@ DECLARE_CUSTOM_FUNCTION(StartDialog)(CORO_PARAM, uint32 nDialog, uint32 nStartGr
 
 	CORO_BEGIN_CODE(_ctx);
 
-	g_curDialog = nDialog;
+	GLOBALS._curDialog = nDialog;
 
 	// Call MPAL to start the dialog
 	mpalQueryDoDialog(nDialog, nStartGroup);
@@ -2010,7 +1965,7 @@ DECLARE_CUSTOM_FUNCTION(StartDialog)(CORO_PARAM, uint32 nDialog, uint32 nStartGr
  *  Sync between idle and mpal
  */
 
-DECLARE_CUSTOM_FUNCTION(TakeOwnership)(CORO_PARAM, uint32 num, uint32, uint32, uint32) {
+void takeOwnership(CORO_PARAM, uint32 num, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
@@ -2028,7 +1983,7 @@ DECLARE_CUSTOM_FUNCTION(TakeOwnership)(CORO_PARAM, uint32 num, uint32, uint32, u
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(ReleaseOwnership)(CORO_PARAM, uint32 num, uint32, uint32, uint32) {
+void releaseOwnership(CORO_PARAM, uint32 num, uint32, uint32, uint32) {
 	if (!GLOBALS._mut[num]._lockCount) {
 		warning("ReleaseOwnership tried to release mutex %d, which isn't held", num);
 		return;
@@ -2058,7 +2013,7 @@ DECLARE_CUSTOM_FUNCTION(ReleaseOwnership)(CORO_PARAM, uint32 num, uint32, uint32
  *
  */
 
-void ThreadFadeInMusic(CORO_PARAM, const void *nMusic) {
+void threadFadeInMusic(CORO_PARAM, const void *nMusic) {
 	CORO_BEGIN_CONTEXT;
 	int i;
 	CORO_END_CONTEXT(_ctx);
@@ -2083,7 +2038,7 @@ void ThreadFadeInMusic(CORO_PARAM, const void *nMusic) {
 	CORO_END_CODE;
 }
 
-void ThreadFadeOutMusic(CORO_PARAM, const void *nMusic) {
+void threadFadeOutMusic(CORO_PARAM, const void *nMusic) {
 	CORO_BEGIN_CONTEXT;
 	int i;
 	int startVolume;
@@ -2114,52 +2069,52 @@ void ThreadFadeOutMusic(CORO_PARAM, const void *nMusic) {
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(FadeInSoundEffect)(CORO_PARAM, uint32, uint32, uint32, uint32) {
-	CoroScheduler.createProcess(ThreadFadeInMusic, &GLOBALS._curSoundEffect, sizeof(int));
+void fadeInSoundEffect(CORO_PARAM, uint32, uint32, uint32, uint32) {
+	CoroScheduler.createProcess(threadFadeInMusic, &GLOBALS._curSoundEffect, sizeof(int));
 }
 
-DECLARE_CUSTOM_FUNCTION(FadeOutSoundEffect)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void fadeOutSoundEffect(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	GLOBALS._bFadeOutStop = false;
-	CoroScheduler.createProcess(ThreadFadeOutMusic, &GLOBALS._curSoundEffect, sizeof(int));
+	CoroScheduler.createProcess(threadFadeOutMusic, &GLOBALS._curSoundEffect, sizeof(int));
 }
 
-DECLARE_CUSTOM_FUNCTION(FadeOutJingle)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void fadeOutJingle(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	GLOBALS._bFadeOutStop = false;
 	int channel = 2;
-	CoroScheduler.createProcess(ThreadFadeOutMusic, &channel, sizeof(int));
+	CoroScheduler.createProcess(threadFadeOutMusic, &channel, sizeof(int));
 }
 
-DECLARE_CUSTOM_FUNCTION(FadeInJingle)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void fadeInJingle(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	int channel = 2;
-	CoroScheduler.createProcess(ThreadFadeInMusic, &channel, sizeof(int));
+	CoroScheduler.createProcess(threadFadeInMusic, &channel, sizeof(int));
 }
 
-DECLARE_CUSTOM_FUNCTION(StopSoundEffect)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void stopSoundEffect(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	g_vm->stopMusic(GLOBALS._curSoundEffect);
 }
 
-DECLARE_CUSTOM_FUNCTION(StopJingle)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void stopJingle(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	g_vm->stopMusic(2);
 }
 
-DECLARE_CUSTOM_FUNCTION(MuteSoundEffect)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void muteSoundEffect(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	g_vm->setMusicVolume(GLOBALS._curSoundEffect, 0);
 }
 
-DECLARE_CUSTOM_FUNCTION(DemuteSoundEffect)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void demuteSoundEffect(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	GLOBALS._bFadeOutStop = true;
 	g_vm->setMusicVolume(GLOBALS._curSoundEffect, 64);
 }
 
-DECLARE_CUSTOM_FUNCTION(MuteJingle)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void muteJingle(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	g_vm->setMusicVolume(2, 0);
 }
 
-DECLARE_CUSTOM_FUNCTION(DemuteJingle)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void demuteJingle(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	g_vm->setMusicVolume(2, 64);
 }
 
-void CustPlayMusic(uint32 nChannel, const char *mFN, uint32 nFX, bool bLoop, int nSync = 0) {
+void custPlayMusic(uint32 nChannel, const char *mFN, uint32 nFX, bool bLoop, int nSync = 0) {
 	if (nSync == 0)
 		nSync = 2000;
 	debugC(DEBUG_INTERMEDIATE, kTonyDebugMusic, "Start CustPlayMusic");
@@ -2167,21 +2122,21 @@ void CustPlayMusic(uint32 nChannel, const char *mFN, uint32 nFX, bool bLoop, int
 	debugC(DEBUG_INTERMEDIATE, kTonyDebugMusic, "End CustPlayMusic");
 }
 
-DECLARE_CUSTOM_FUNCTION(PlaySoundEffect)(CORO_PARAM, uint32 nMusic, uint32 nFX, uint32 bNoLoop, uint32) {
+void playSoundEffect(CORO_PARAM, uint32 nMusic, uint32 nFX, uint32 bNoLoop, uint32) {
 	if (nFX == 0 || nFX == 1 || nFX == 2) {
 		debugC(DEBUG_INTERMEDIATE, kTonyDebugSound, "PlaySoundEffect stop fadeout");
 		GLOBALS._bFadeOutStop = true;
 	}
 
 	GLOBALS._lastMusic = nMusic;
-	CustPlayMusic(GLOBALS._curSoundEffect, musicFiles[nMusic].name, nFX, bNoLoop ? false : true, musicFiles[nMusic].sync);
+	custPlayMusic(GLOBALS._curSoundEffect, kMusicFiles[nMusic]._name, nFX, bNoLoop ? false : true, kMusicFiles[nMusic]._sync);
 }
 
-DECLARE_CUSTOM_FUNCTION(PlayJingle)(CORO_PARAM, uint32 nMusic, uint32 nFX, uint32 bLoop, uint32) {
-	CustPlayMusic(2, jingleFileNames[nMusic], nFX, bLoop);
+void playJingle(CORO_PARAM, uint32 nMusic, uint32 nFX, uint32 bLoop, uint32) {
+	custPlayMusic(2, kJingleFileNames[nMusic], nFX, bLoop);
 }
 
-DECLARE_CUSTOM_FUNCTION(PlayItemSfx)(CORO_PARAM, uint32 nItem, uint32 nSFX, uint32, uint32) {
+void playItemSfx(CORO_PARAM, uint32 nItem, uint32 nSFX, uint32, uint32) {
 	if (nItem == 0) {
 		GLOBALS._tony->playSfx(nSFX);
 	} else {
@@ -2191,76 +2146,71 @@ DECLARE_CUSTOM_FUNCTION(PlayItemSfx)(CORO_PARAM, uint32 nItem, uint32 nSFX, uint
 	}
 }
 
-
-void RestoreMusic(CORO_PARAM) {
+void restoreMusic(CORO_PARAM) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
 	CORO_BEGIN_CODE(_ctx);
 
-	CORO_INVOKE_4(PlaySoundEffect, GLOBALS._lastMusic, 0, 0, 0);
+	CORO_INVOKE_4(playSoundEffect, GLOBALS._lastMusic, 0, 0, 0);
 
 	if (GLOBALS._lastTappeto != 0)
-		CustPlayMusic(4, ambianceFile[GLOBALS._lastTappeto], 0, true);
+		custPlayMusic(4, kAmbianceFile[GLOBALS._lastTappeto], 0, true);
 
 	CORO_END_CODE;
 }
 
-void SaveMusic(Common::OutSaveFile *f) {
+void saveMusic(Common::OutSaveFile *f) {
 	f->writeByte(GLOBALS._lastMusic);
 	f->writeByte(GLOBALS._lastTappeto);
 }
 
-void LoadMusic(Common::InSaveFile *f) {
+void loadMusic(Common::InSaveFile *f) {
 	GLOBALS._lastMusic = f->readByte();
 	GLOBALS._lastTappeto = f->readByte();
 }
 
-
-DECLARE_CUSTOM_FUNCTION(JingleFadeStart)(CORO_PARAM, uint32 nJingle, uint32 bLoop, uint32, uint32) {
+void jingleFadeStart(CORO_PARAM, uint32 nJingle, uint32 bLoop, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
 	CORO_BEGIN_CODE(_ctx);
 
-	CORO_INVOKE_4(FadeOutSoundEffect, 0, 0, 0, 0);
-	CORO_INVOKE_4(MuteJingle, 0, 0, 0, 0);
-	CORO_INVOKE_4(PlayJingle, nJingle, 0, bLoop, 0);
-	CORO_INVOKE_4(FadeInJingle, 0, 0, 0, 0);
+	CORO_INVOKE_4(fadeOutSoundEffect, 0, 0, 0, 0);
+	CORO_INVOKE_4(muteJingle, 0, 0, 0, 0);
+	CORO_INVOKE_4(playJingle, nJingle, 0, bLoop, 0);
+	CORO_INVOKE_4(fadeInJingle, 0, 0, 0, 0);
 
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(JingleFadeEnd)(CORO_PARAM, uint32 nJingle, uint32 bLoop, uint32, uint32) {
+void jingleFadeEnd(CORO_PARAM, uint32 nJingle, uint32 bLoop, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
 	CORO_BEGIN_CODE(_ctx);
 
-	CORO_INVOKE_4(FadeOutJingle, 0, 0, 0, 0);
-	CORO_INVOKE_4(FadeInSoundEffect, 0, 0, 0, 0);
+	CORO_INVOKE_4(fadeOutJingle, 0, 0, 0, 0);
+	CORO_INVOKE_4(fadeInSoundEffect, 0, 0, 0, 0);
 
 	CORO_END_CODE;
 }
 
-
-
-
-DECLARE_CUSTOM_FUNCTION(MustSkipIdleStart)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void mustSkipIdleStart(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	GLOBALS._bSkipIdle = true;
 	CoroScheduler.setEvent(GLOBALS._hSkipIdle);
 }
 
-DECLARE_CUSTOM_FUNCTION(MustSkipIdleEnd)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void mustSkipIdleEnd(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	GLOBALS._bSkipIdle = false;
 	CoroScheduler.resetEvent(GLOBALS._hSkipIdle);
 }
 
-DECLARE_CUSTOM_FUNCTION(PatIrqFreeze)(CORO_PARAM, uint32 bStatus, uint32, uint32, uint32) {
+void patIrqFreeze(CORO_PARAM, uint32 bStatus, uint32, uint32, uint32) {
 	// Unused in ScummVM.
 }
 
-DECLARE_CUSTOM_FUNCTION(OpenInitLoadMenu)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void openInitLoadMenu(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
@@ -2271,7 +2221,7 @@ DECLARE_CUSTOM_FUNCTION(OpenInitLoadMenu)(CORO_PARAM, uint32, uint32, uint32, ui
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(OpenInitOptions)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+void openInitOptions(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
@@ -2282,8 +2232,7 @@ DECLARE_CUSTOM_FUNCTION(OpenInitOptions)(CORO_PARAM, uint32, uint32, uint32, uin
 	CORO_END_CODE;
 }
 
-
-DECLARE_CUSTOM_FUNCTION(DoCredits)(CORO_PARAM, uint32 nMsg, uint32 dwTime, uint32, uint32) {
+void doCredits(CORO_PARAM, uint32 nMsg, uint32 dwTime, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	RMMessage *msg;
 	RMTextDialog *text;
@@ -2355,159 +2304,157 @@ DECLARE_CUSTOM_FUNCTION(DoCredits)(CORO_PARAM, uint32 nMsg, uint32 dwTime, uint3
 	CORO_END_CODE;
 }
 
-
-
 BEGIN_CUSTOM_FUNCTION_MAP()
 
-ASSIGN(1,   CustLoadLocation)
-ASSIGN(2,   MySleep)
-ASSIGN(3,   SetPointer)
-ASSIGN(5,   MoveTony)
-ASSIGN(6,   FaceToMe)
-ASSIGN(7,   BackToMe)
-ASSIGN(8,   LeftToMe)
-ASSIGN(9,   RightToMe)
-ASSIGN(10,  SendTonyMessage)
-ASSIGN(11,  ChangeBoxStatus)
-ASSIGN(12,  ChangeLocation)
-ASSIGN(13,  DisableTony)
-ASSIGN(14,  EnableTony)
-ASSIGN(15,  WaitForPatternEnd)
-ASSIGN(16,  SetLocStartPosition)
-ASSIGN(17,  ScrollLocation)
-ASSIGN(18,  MoveTonyAndWait)
-ASSIGN(19,  ChangeHotspot)
-ASSIGN(20,  AddInventory)
-ASSIGN(21,  RemoveInventory)
-ASSIGN(22,  ChangeInventoryStatus)
-ASSIGN(23,  SetTonyPosition)
-ASSIGN(24,  SendFullscreenMessage)
-ASSIGN(25,  SaveTonyPosition)
-ASSIGN(26,  RestoreTonyPosition)
-ASSIGN(27,  DisableInput)
-ASSIGN(28,  EnableInput)
-ASSIGN(29,  StopTony)
-
-ASSIGN(30,  TonyTakeUp1)
-ASSIGN(31,  TonyTakeMid1)
-ASSIGN(32,  TonyTakeDown1)
-ASSIGN(33,  TonyTakeUp2)
-ASSIGN(34,  TonyTakeMid2)
-ASSIGN(35,  TonyTakeDown2)
-
-ASSIGN(72,  TonyPutUp1)
-ASSIGN(73,  TonyPutMid1)
-ASSIGN(74,  TonyPutDown1)
-ASSIGN(75,  TonyPutUp2)
-ASSIGN(76,  TonyPutMid2)
-ASSIGN(77,  TonyPutDown2)
-
-ASSIGN(36,  TonyOnTheFloor)
-ASSIGN(37,  TonyGetUp)
-ASSIGN(38,  TonyShepherdess)
-ASSIGN(39,  TonyWhistle)
-
-ASSIGN(40,  TonyLaugh)
-ASSIGN(41,  TonyHips)
-ASSIGN(42,  TonySing)
-ASSIGN(43,  TonyIndicate)
-ASSIGN(44,  TonyScaredWithHands)
-ASSIGN(49,  TonyScaredWithoutHands)
-ASSIGN(45,  TonyWithGlasses)
-ASSIGN(46,  TonyWithWorm)
-ASSIGN(47,  TonyWithHammer)
-ASSIGN(48,  TonyWithRope)
-ASSIGN(90,  TonyWithRabbitANIM)
-ASSIGN(91,  TonyWithRecipeANIM)
-ASSIGN(92,  TonyWithCardsANIM)
-ASSIGN(93,  TonyWithSnowmanANIM)
-ASSIGN(94,  TonyWithSnowmanStart)
-ASSIGN(95,  TonyWithSnowmanEnd)
-ASSIGN(96,  TonyWithRabbitStart)
-ASSIGN(97,  TonyWithRabbitEnd)
-ASSIGN(98,  TonyWithRecipeStart)
-ASSIGN(99,  TonyWithRecipeEnd)
-ASSIGN(100, TonyWithCardsStart)
-ASSIGN(101, TonyWithCardsEnd)
-ASSIGN(102, TonyWithNotebookStart)
-ASSIGN(103, TonyWithNotebookEnd)
-ASSIGN(104, TonyWithMegaphoneStart)
-ASSIGN(105, TonyWithMegaphoneEnd)
-ASSIGN(106, TonyWithBeardStart)
-ASSIGN(107, TonyWithBeardEnd)
-ASSIGN(108, TonyGiggle)
-ASSIGN(109, TonyDisgusted)
-ASSIGN(110, TonySarcastic)
-ASSIGN(111, TonyMacbeth)
-ASSIGN(112, TonySniffLeft)
-ASSIGN(113, TonySniffRight)
-ASSIGN(114, TonyScaredStart)
-ASSIGN(115, TonyScaredEnd)
-ASSIGN(116, TonyWithSecretary)
-
-ASSIGN(50,  CharSetCode)
-ASSIGN(51,  CharSetColor)
-ASSIGN(52,  CharSetTalkPattern)
-ASSIGN(53,  CharSendMessage)
-ASSIGN(54,  CharSetStartEndTalkPattern)
-
-ASSIGN(60,  MCharSetCode)
-ASSIGN(61,  MCharSetColor)
-ASSIGN(62,  MCharSetCurrentGroup)
-ASSIGN(63,  MCharSetNumTalksInGroup)
-ASSIGN(64,  MCharSetNumTexts)
-ASSIGN(65,  MCharSendMessage)
-ASSIGN(66,  MCharSetPosition)
-ASSIGN(67,  MCharSetAlwaysBack)
-ASSIGN(68,  MCharResetCode)
-
-ASSIGN(70,  StartDialog)
-ASSIGN(71,  SendDialogMessage)
-
-ASSIGN(80,  TakeOwnership)
-ASSIGN(81,  ReleaseOwnership)
-
-ASSIGN(86,  PlaySoundEffect)
-ASSIGN(87,  PlayJingle)
-ASSIGN(88,  FadeInSoundEffect)
-ASSIGN(89,  FadeOutSoundEffect)
-ASSIGN(123, FadeInJingle)
-ASSIGN(124, FadeOutJingle)
-ASSIGN(125, MuteSoundEffect)
-ASSIGN(126, DemuteSoundEffect)
-ASSIGN(127, MuteJingle)
-ASSIGN(128, DemuteJingle)
-ASSIGN(84,  StopSoundEffect)
-ASSIGN(85,  StopJingle)
-ASSIGN(83,  PlayItemSfx)
-ASSIGN(129, JingleFadeStart)
-ASSIGN(130, JingleFadeEnd)
-
-ASSIGN(120, ShakeScreen)
-ASSIGN(121, AutoSave)
-ASSIGN(122, AbortGame)
-ASSIGN(131, NoBullsEye)
-ASSIGN(132, SendFullscreenMsgStart)
-ASSIGN(133, SendFullscreenMsgEnd)
-ASSIGN(134, CustEnableGUI)
-ASSIGN(135, CustDisableGUI)
-ASSIGN(136, ClearScreen)
-ASSIGN(137, PatIrqFreeze)
-ASSIGN(138, TonySetPerorate)
-ASSIGN(139, OpenInitLoadMenu)
-ASSIGN(140, OpenInitOptions)
-ASSIGN(141, SyncScrollLocation)
-ASSIGN(142, CloseLocation)
-ASSIGN(143, SetAlwaysDisplay)
-ASSIGN(144, DoCredits)
-
-ASSIGN(200, MustSkipIdleStart);
-ASSIGN(201, MustSkipIdleEnd);
+ASSIGN(1,   custLoadLocation)
+ASSIGN(2,   mySleep)
+ASSIGN(3,   setPointer)
+ASSIGN(5,   moveTony)
+ASSIGN(6,   faceToMe)
+ASSIGN(7,   backToMe)
+ASSIGN(8,   leftToMe)
+ASSIGN(9,   rightToMe)
+ASSIGN(10,  sendTonyMessage)
+ASSIGN(11,  changeBoxStatus)
+ASSIGN(12,  changeLocation)
+ASSIGN(13,  disableTony)
+ASSIGN(14,  enableTony)
+ASSIGN(15,  waitForPatternEnd)
+ASSIGN(16,  setLocStartPosition)
+ASSIGN(17,  scrollLocation)
+ASSIGN(18,  moveTonyAndWait)
+ASSIGN(19,  changeHotspot)
+ASSIGN(20,  addInventory)
+ASSIGN(21,  removeInventory)
+ASSIGN(22,  changeInventoryStatus)
+ASSIGN(23,  setTonyPosition)
+ASSIGN(24,  sendFullscreenMessage)
+ASSIGN(25,  saveTonyPosition)
+ASSIGN(26,  restoreTonyPosition)
+ASSIGN(27,  disableInput)
+ASSIGN(28,  enableInput)
+ASSIGN(29,  stopTony)
+
+ASSIGN(30,  tonyTakeUp1)
+ASSIGN(31,  tonyTakeMid1)
+ASSIGN(32,  tonyTakeDown1)
+ASSIGN(33,  tonyTakeUp2)
+ASSIGN(34,  tonyTakeMid2)
+ASSIGN(35,  tonyTakeDown2)
+
+ASSIGN(72,  tonyPutUp1)
+ASSIGN(73,  tonyPutMid1)
+ASSIGN(74,  tonyPutDown1)
+ASSIGN(75,  tonyPutUp2)
+ASSIGN(76,  tonyPutMid2)
+ASSIGN(77,  tonyPutDown2)
+
+ASSIGN(36,  tonyOnTheFloor)
+ASSIGN(37,  tonyGetUp)
+ASSIGN(38,  tonyShepherdess)
+ASSIGN(39,  tonyWhistle)
+
+ASSIGN(40,  tonyLaugh)
+ASSIGN(41,  tonyHips)
+ASSIGN(42,  tonySing)
+ASSIGN(43,  tonyIndicate)
+ASSIGN(44,  tonyScaredWithHands)
+ASSIGN(49,  tonyScaredWithoutHands)
+ASSIGN(45,  tonyWithGlasses)
+ASSIGN(46,  tonyWithWorm)
+ASSIGN(47,  tonyWithHammer)
+ASSIGN(48,  tonyWithRope)
+ASSIGN(90,  tonyWithRabbitANIM)
+ASSIGN(91,  tonyWithRecipeANIM)
+ASSIGN(92,  tonyWithCardsANIM)
+ASSIGN(93,  tonyWithSnowmanANIM)
+ASSIGN(94,  tonyWithSnowmanStart)
+ASSIGN(95,  tonyWithSnowmanEnd)
+ASSIGN(96,  tonyWithRabbitStart)
+ASSIGN(97,  tonyWithRabbitEnd)
+ASSIGN(98,  tonyWithRecipeStart)
+ASSIGN(99,  tonyWithRecipeEnd)
+ASSIGN(100, tonyWithCardsStart)
+ASSIGN(101, tonyWithCardsEnd)
+ASSIGN(102, tonyWithNotebookStart)
+ASSIGN(103, tonyWithNotebookEnd)
+ASSIGN(104, tonyWithMegaphoneStart)
+ASSIGN(105, tonyWithMegaphoneEnd)
+ASSIGN(106, tonyWithBeardStart)
+ASSIGN(107, tonyWithBeardEnd)
+ASSIGN(108, tonyGiggle)
+ASSIGN(109, tonyDisgusted)
+ASSIGN(110, tonySarcastic)
+ASSIGN(111, tonyMacbeth)
+ASSIGN(112, tonySniffLeft)
+ASSIGN(113, tonySniffRight)
+ASSIGN(114, tonyScaredStart)
+ASSIGN(115, tonyScaredEnd)
+ASSIGN(116, tonyWithSecretary)
+
+ASSIGN(50,  charSetCode)
+ASSIGN(51,  charSetColor)
+ASSIGN(52,  charSetTalkPattern)
+ASSIGN(53,  charSendMessage)
+ASSIGN(54,  charSetStartEndTalkPattern)
+
+ASSIGN(60,  mCharSetCode)
+ASSIGN(61,  mCharSetColor)
+ASSIGN(62,  mCharSetCurrentGroup)
+ASSIGN(63,  mCharSetNumTalksInGroup)
+ASSIGN(64,  mCharSetNumTexts)
+ASSIGN(65,  mCharSendMessage)
+ASSIGN(66,  mCharSetPosition)
+ASSIGN(67,  mCharSetAlwaysBack)
+ASSIGN(68,  mCharResetCode)
+
+ASSIGN(70,  startDialog)
+ASSIGN(71,  sendDialogMessage)
+
+ASSIGN(80,  takeOwnership)
+ASSIGN(81,  releaseOwnership)
+
+ASSIGN(86,  playSoundEffect)
+ASSIGN(87,  playJingle)
+ASSIGN(88,  fadeInSoundEffect)
+ASSIGN(89,  fadeOutSoundEffect)
+ASSIGN(123, fadeInJingle)
+ASSIGN(124, fadeOutJingle)
+ASSIGN(125, muteSoundEffect)
+ASSIGN(126, demuteSoundEffect)
+ASSIGN(127, muteJingle)
+ASSIGN(128, demuteJingle)
+ASSIGN(84,  stopSoundEffect)
+ASSIGN(85,  stopJingle)
+ASSIGN(83,  playItemSfx)
+ASSIGN(129, jingleFadeStart)
+ASSIGN(130, jingleFadeEnd)
+
+ASSIGN(120, shakeScreen)
+ASSIGN(121, autoSave)
+ASSIGN(122, abortGame)
+ASSIGN(131, noBullsEye)
+ASSIGN(132, sendFullscreenMsgStart)
+ASSIGN(133, sendFullscreenMsgEnd)
+ASSIGN(134, custEnableGUI)
+ASSIGN(135, custDisableGUI)
+ASSIGN(136, clearScreen)
+ASSIGN(137, patIrqFreeze)
+ASSIGN(138, tonySetPerorate)
+ASSIGN(139, openInitLoadMenu)
+ASSIGN(140, openInitOptions)
+ASSIGN(141, syncScrollLocation)
+ASSIGN(142, closeLocation)
+ASSIGN(143, setAlwaysDisplay)
+ASSIGN(144, doCredits)
+
+ASSIGN(200, mustSkipIdleStart);
+ASSIGN(201, mustSkipIdleEnd);
 
 END_CUSTOM_FUNCTION_MAP()
 
 void processKilledCallback(Common::PROCESS *p) {
-	for (uint i = 0; i < 10; i++)
+	for (uint i = 0; i < 10; i++) {
 		if (GLOBALS._mut[i]._ownerPid == p->pid) {
 			// Handle scripts which don't call ReleaseOwnership, such as
 			// the one in loc37's vEnter when Tony is chasing the mouse.
@@ -2517,6 +2464,7 @@ void processKilledCallback(Common::PROCESS *p) {
 			GLOBALS._mut[i]._lockCount = 0;
 			CoroScheduler.setEvent(GLOBALS._mut[i]._eventId);
 		}
+	}
 }
 
 void setupGlobalVars(RMTony *tony, RMPointer *ptr, RMGameBoxes *box, RMLocation *loc, RMInventory *inv, RMInput *input) {
@@ -2531,13 +2479,12 @@ void setupGlobalVars(RMTony *tony, RMPointer *ptr, RMGameBoxes *box, RMLocation
 	GLOBALS.EnableGUI = mainEnableGUI;
 
 	GLOBALS._bAlwaysDisplay = false;
-	int i;
 
 	CoroScheduler.setResourceCallback(processKilledCallback);
-	for (i = 0; i < 10; i++)
+	for (int i = 0; i < 10; i++)
 		GLOBALS._mut[i]._eventId = CoroScheduler.createEvent(false, true);
 
-	for (i = 0; i < 200; i++)
+	for (int i = 0; i < 200; i++)
 		GLOBALS._ambiance[i] = 0;
 
 	GLOBALS._ambiance[6] =  AMBIANCE_CRICKETS;
diff --git a/engines/tony/custom.h b/engines/tony/custom.h
index 524ab14aab..0f1061e8cd 100644
--- a/engines/tony/custom.h
+++ b/engines/tony/custom.h
@@ -36,9 +36,12 @@ namespace Tony {
 
 using namespace MPAL;
 
-#define INIT_CUSTOM_FUNCTION            MapCustomFunctions
+struct MusicFileEntry {
+	const char *_name;
+	int _sync;
+};
 
-#define DECLARE_CUSTOM_FUNCTION(x)      void x
+#define INIT_CUSTOM_FUNCTION            MapCustomFunctions
 
 #define BEGIN_CUSTOM_FUNCTION_MAP()                                            \
 	static void AssignError(int num) {                                           \
@@ -63,6 +66,17 @@ class RMLocation;
 class RMInventory;
 class RMInput;
 
+void charsSaveAll(Common::OutSaveFile *f);
+void charsLoadAll(Common::InSaveFile *f);
+void mCharResetCodes();
+void saveChangedHotspot(Common::OutSaveFile *f);
+void loadChangedHotspot(Common::InSaveFile *f);
+void reapplyChangedHotspot();
+
+void restoreMusic(CORO_PARAM);
+void saveMusic(Common::OutSaveFile *f);
+void loadMusic(Common::InSaveFile *f);
+
 void INIT_CUSTOM_FUNCTION(LPCUSTOMFUNCTION *lpMap, Common::String *lpStrMap);
 void setupGlobalVars(RMTony *tony, RMPointer *ptr, RMGameBoxes *box, RMLocation *loc, RMInventory *inv, RMInput *input);
 
diff --git a/engines/tony/detection_tables.h b/engines/tony/detection_tables.h
index f9881c29f2..d2bd81f083 100644
--- a/engines/tony/detection_tables.h
+++ b/engines/tony/detection_tables.h
@@ -139,6 +139,39 @@ static const TonyGameDescription gameDescriptions[] = {
 			GUIO1(GUIO_NONE)
 		},
 	},
+	{
+		// Tony Tough German "Gamestar" provided in bug #3566035
+		{
+			"tony",
+			0,
+			{
+				{"roasted.mpr", 0, "06203dbbc85fdd1e6dc8fc211c1a6207", 135911071},
+				{"roasted.mpc", 0, "187de6f88f4083808cb66342ab55a7fd", 389904},
+				AD_LISTEND
+			},
+			Common::DE_DEU,
+			Common::kPlatformWindows,
+			ADGF_NO_FLAGS,
+			GUIO1(GUIO_NONE)
+		},
+	},
+	{
+		// Tony Tough Czech provided in bug #3565765
+		{
+			"tony",
+			0,
+			{
+				// {"data1.cab", 0, "c6d5dd8f0c1241a6e3f7861b7f27bf7b", 4350},
+				{"roasted.mpr", 0, "06203dbbc85fdd1e6dc8fc211c1a6207", 135911071},
+				{"roasted.mpc", 0, "a8283a101878f3ca105f1f83f07e2c40", 386491},
+				AD_LISTEND
+			},
+			Common::CZ_CZE,
+			Common::kPlatformWindows,
+			ADGF_NO_FLAGS,
+			GUIO1(GUIO_NONE)
+		},
+	},
 	{ AD_TABLE_END_MARKER }
 };
 
diff --git a/engines/tony/font.cpp b/engines/tony/font.cpp
index 927adf9006..c8919dbdb5 100644
--- a/engines/tony/font.cpp
+++ b/engines/tony/font.cpp
@@ -84,10 +84,9 @@ void RMFont::unload() {
 
 RMGfxPrimitive *RMFont::makeLetterPrimitive(byte bChar, int &nLength) {
 	RMFontPrimitive *prim;
-	int nLett;
 
 	// Convert from character to glyph index
-	nLett = convertToLetter(bChar);
+	int nLett = convertToLetter(bChar);
 	assert(nLett < _nLetters);
 
 	// Create primitive font
@@ -120,12 +119,11 @@ void RMFont::close() {
 }
 
 int RMFont::stringLen(const Common::String &text) {
-	uint len, i;
-
 	if (text.empty())
 		return letterLength('\0');
 
-	len = 0;
+	uint len = 0;
+	uint i;
 	for (i = 0; i < text.size() - 1; i++)
 		len += letterLength(text[i], text[i + 1]);
 	len += letterLength(text[i]);
@@ -157,7 +155,6 @@ void RMFontColor::setBaseColor(byte r1, byte g1, byte b1) {
 	int gstep = g / 14;
 	int bstep = b / 14;
 
-	int i;
 	byte pal[768 * 3];
 
 	// Check if we are already on the right color
@@ -169,7 +166,7 @@ void RMFontColor::setBaseColor(byte r1, byte g1, byte b1) {
 	_fontB = b1;
 
 	// Constructs a new palette for the font
-	for (i = 1; i < 16; i++) {
+	for (int i = 1; i < 16; i++) {
 		pal[i * 3 + 0] = r >> 16;
 		pal[i * 3 + 1] = g >> 16;
 		pal[i * 3 + 2] = b >> 16;
@@ -184,7 +181,7 @@ void RMFontColor::setBaseColor(byte r1, byte g1, byte b1) {
 	pal[15 * 3 + 2] += 8;
 
 	// Puts in all the letters
-	for (i = 0; i < _nLetters; i++)
+	for (int i = 0; i < _nLetters; i++)
 		_letter[i].loadPaletteWA(pal);
 }
 
@@ -204,8 +201,6 @@ int RMFontWithTables::letterLength(int nChar, int nNext) {
 \****************************************************************************/
 
 void RMFontDialog::init() {
-	int i;
-
 	// bernie: Number of characters in the font
 	int nchars =
 	    112    // base
@@ -222,7 +217,7 @@ void RMFontDialog::init() {
 	_hDefault = 18;
 	Common::fill(&_l2Table[0][0], &_l2Table[0][0] + (256 * 256), '\0');
 
-	for (i = 0; i < 256; i++) {
+	for (int i = 0; i < 256; i++) {
 		_cTable[i] = g_vm->_cTableDialog[i];
 		_lTable[i] = g_vm->_lTableDialog[i];
 	}
@@ -234,8 +229,6 @@ void RMFontDialog::init() {
 \****************************************************************************/
 
 void RMFontMacc::init() {
-	int i;
-
 	// bernie: Number of characters in the font
 	int nchars =
 	    102    // base
@@ -245,7 +238,6 @@ void RMFontMacc::init() {
 	    +  8    // francais
 	    +  5;   // deutsch
 
-
 	load(RES_F_MACC, nchars, 11, 16);
 
 	// Default
@@ -253,7 +245,7 @@ void RMFontMacc::init() {
 	_hDefault = 17;
 	Common::fill(&_l2Table[0][0], &_l2Table[0][0] + (256 * 256), '\0');
 
-	for (i = 0; i < 256; i++) {
+	for (int i = 0; i < 256; i++) {
 		_cTable[i] = g_vm->_cTableMacc[i];
 		_lTable[i] = g_vm->_lTableMacc[i];
 	}
@@ -264,8 +256,6 @@ void RMFontMacc::init() {
 \****************************************************************************/
 
 void RMFontCredits::init() {
-	int i;
-
 	// bernie: Number of characters in the font
 	int nchars =
 	    112    // base
@@ -275,7 +265,6 @@ void RMFontCredits::init() {
 	    +  8    // french
 	    +  2;   // deutsch
 
-
 	load(RES_F_CREDITS, nchars, 27, 28, RES_F_CPAL);
 
 	// Default
@@ -283,7 +272,7 @@ void RMFontCredits::init() {
 	_hDefault = 28;
 	Common::fill(&_l2Table[0][0], &_l2Table[0][0] + (256 * 256), '\0');
 
-	for (i = 0; i < 256; i++) {
+	for (int i = 0; i < 256; i++) {
 		_cTable[i] = g_vm->_cTableCred[i];
 		_lTable[i] = g_vm->_lTableCred[i];
 	}
@@ -305,10 +294,7 @@ void RMFontObj::setBothCase(int nChar, int nNext, signed char spiazz) {
 	_l2Table[TOLOWER(nChar)][TOLOWER(nNext)] = spiazz;
 }
 
-
 void RMFontObj::init() {
-	int i;
-
 	//bernie: Number of characters in the font (solo maiuscolo)
 	int nchars =
 	    85    // base
@@ -318,7 +304,6 @@ void RMFontObj::init() {
 	    +  0    // francais (no uppercase chars)
 	    +  1;   // deutsch
 
-
 	load(RES_F_OBJ, nchars, 25, 30);
 
 	// Initialize the font table
@@ -326,7 +311,7 @@ void RMFontObj::init() {
 	_hDefault = 30;
 	Common::fill(&_l2Table[0][0], &_l2Table[0][0] + (256 * 256), '\0');
 
-	for (i = 0; i < 256; i++) {
+	for (int i = 0; i < 256; i++) {
 		_cTable[i] = g_vm->_cTableObj[i];
 		_lTable[i] = g_vm->_lTableObj[i];
 	}
@@ -345,7 +330,6 @@ void RMFontObj::init() {
 	setBothCase('R', 'U', 3);
 }
 
-
 /****************************************************************************\
 *       RMText Methods
 \****************************************************************************/
@@ -409,11 +393,6 @@ void RMText::writeText(const Common::String &text, int nFont, int *time) {
 
 void RMText::writeText(Common::String text, RMFontColor *font, int *time) {
 	RMGfxPrimitive *prim;
-	uint p, old_p;
-	int j, x, y;
-	int len;
-	int numchar;
-	int width, height;
 
 	// Set the base color
 	font->setBaseColor(_textR, _textG, _textB);
@@ -428,8 +407,9 @@ void RMText::writeText(Common::String text, RMFontColor *font, int *time) {
 	// Divide the words into lines. In this cycle, X contains the maximum length reached by a line,
 	// and the number of lines
 	Common::Array<Common::String> lines;
-	p = 0;
-	j = x = 0;
+	uint p = 0;
+	int j = 0;
+	int x = 0;
 	while (p < text.size()) {
 		j += font->stringLen(text[p]);
 		if (j > (((_aHorType == HLEFTPAR) && (lines.size() > 0)) ? _maxLineLength - 25 : _maxLineLength)) {
@@ -443,7 +423,7 @@ void RMText::writeText(Common::String text, RMFontColor *font, int *time) {
 			// width of a line caused discontinuation of the whole sentence.
 			// This workaround has the partial word broken up so it will still display
 			//
-			old_p = p;
+			uint old_p = p;
 			while (text[p] != ' ' && text[p] != '-' && p > 0)
 				p--;
 
@@ -475,8 +455,8 @@ void RMText::writeText(Common::String text, RMFontColor *font, int *time) {
 	x += 8;
 
 	// Starting position for the surface: X1, Y
-	width = x;
-	height = (lines.size() - 1) * font->letterHeight() + font->_fontDimy;
+	int width = x;
+	int height = (lines.size() - 1) * font->letterHeight() + font->_fontDimy;
 
 	// Create the surface
 	create(width, height);
@@ -484,8 +464,8 @@ void RMText::writeText(Common::String text, RMFontColor *font, int *time) {
 
 	p = 0;
 
-	y = 0;
-	numchar = 0;
+	int y = 0;
+	int numchar = 0;
 	for (uint i = 0; i < lines.size(); ++i) {
 		const Common::String &line = lines[i];
 
@@ -522,6 +502,7 @@ void RMText::writeText(Common::String text, RMFontColor *font, int *time) {
 				continue;
 			}
 
+			int len;
 			prim = font->makeLetterPrimitive(line[p], len);
 			prim->getDst()._x1 = x;
 			prim->getDst()._y1 = y;
@@ -737,8 +718,8 @@ void RMTextDialog::removeThis(CORO_PARAM, bool &result) {
 	CORO_END_CODE;
 }
 
-void RMTextDialog::Unregister() {
-	RMGfxTask::Unregister();
+void RMTextDialog::unregister() {
+	RMGfxTask::unregister();
 	assert(_nInList == 0);
 	CoroScheduler.setEvent(_hEndDisplay);
 }
@@ -908,7 +889,7 @@ RMPoint RMTextItemName::getHotspot() {
 	if (_item == NULL)
 		return _mpos + _curscroll;
 	else
-		return _item->hotspot();
+		return _item->getHotspot();
 }
 
 RMItem *RMTextItemName::getSelectedItem() {
@@ -953,8 +934,8 @@ RMDialogChoice::~RMDialogChoice() {
 	CoroScheduler.closeEvent(_hUnreg);
 }
 
-void RMDialogChoice::Unregister() {
-	RMGfxWoodyBuffer::Unregister();
+void RMDialogChoice::unregister() {
+	RMGfxWoodyBuffer::unregister();
 	assert(!_nInList);
 	CoroScheduler.pulseEvent(_hUnreg);
 
@@ -987,8 +968,6 @@ void RMDialogChoice::close() {
 }
 
 void RMDialogChoice::setNumChoices(int num) {
-	int i;
-
 	_numChoices = num;
 	_curAdded = 0;
 
@@ -997,7 +976,7 @@ void RMDialogChoice::setNumChoices(int num) {
 	_ptDrawStrings = new RMPoint[num];
 
 	// Initialization
-	for (i = 0; i < _numChoices; i++) {
+	for (int i = 0; i < _numChoices; i++) {
 		_drawedStrings[i].setColor(0, 255, 0);
 		_drawedStrings[i].setAlignType(RMText::HLEFTPAR, RMText::VTOP);
 		_drawedStrings[i].setMaxLineLength(600);
diff --git a/engines/tony/font.h b/engines/tony/font.h
index 99b20571b1..13c1ddf268 100644
--- a/engines/tony/font.h
+++ b/engines/tony/font.h
@@ -252,7 +252,7 @@ public:
 	virtual void removeThis(CORO_PARAM, bool &result);
 
 	// Overloaded de-registration
-	virtual void Unregister();
+	virtual void unregister();
 
 	// Overloading of the Draw to center the text, if necessary
 	virtual void draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim);
@@ -344,7 +344,7 @@ protected:
 public:
 	virtual void removeThis(CORO_PARAM, bool &result);
 	virtual void draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim);
-	void Unregister();
+	void unregister();
 
 public:
 	// Initialization
diff --git a/engines/tony/game.cpp b/engines/tony/game.cpp
index 2bcfdc7fc2..1a19f2836c 100644
--- a/engines/tony/game.cpp
+++ b/engines/tony/game.cpp
@@ -34,7 +34,6 @@
 #include "tony/mpal/memory.h"
 #include "tony/mpal/mpal.h"
 #include "tony/mpal/mpalutils.h"
-#include "tony/custom.h"
 #include "tony/game.h"
 #include "tony/gfxengine.h"
 #include "tony/tony.h"
@@ -288,9 +287,7 @@ RMOptionScreen::RMOptionScreen() {
 	_buttonSave_ArrowRight = NULL;
 	_bEditSaveName = false;
 
-	int i;
-
-	for (i = 0; i < 6; i++) {
+	for (int i = 0; i < 6; i++) {
 		_curThumb[i] = NULL;
 		_buttonSave_States[i] = NULL;
 	}
@@ -501,9 +498,7 @@ void RMOptionScreen::refreshAll(CORO_PARAM) {
 }
 
 void RMOptionScreen::refreshThumbnails() {
-	int i;
-
-	for (i = 0; i < 6; i++) {
+	for (int i = 0; i < 6; i++) {
 		if (_curThumb[i])
 			delete _curThumb[i];
 
@@ -691,9 +686,7 @@ void RMOptionScreen::closeState() {
 	_buttonExit = NULL;
 
 	if (_nState == MENULOAD || _nState == MENUSAVE) {
-		int i;
-
-		for (i = 0; i < 6; i++) {
+		for (int i = 0; i < 6; i++) {
 			if (_curThumb[i] != NULL) {
 				delete _curThumb[i];
 				_curThumb[i] = NULL;
@@ -1343,9 +1336,7 @@ void RMOptionScreen::removeThis(CORO_PARAM, bool &result) {
 
 
 bool RMOptionScreen::loadThumbnailFromSaveState(int nState, byte *lpDestBuf, Common::String &name, byte &diff) {
-	Common::String buf;
 	char namebuf[256];
-	int i;
 	Common::InSaveFile *f;
 	char id[4];
 
@@ -1355,7 +1346,7 @@ bool RMOptionScreen::loadThumbnailFromSaveState(int nState, byte *lpDestBuf, Com
 	diff = 10;
 
 	// Get the savegame filename for the given slot
-	buf = g_vm->getSaveStateFileName(nState);
+	Common::String buf = g_vm->getSaveStateFileName(nState);
 
 	// Try and open the savegame
 	f = g_system->getSavefileManager()->openForLoading(buf);
@@ -1410,9 +1401,9 @@ bool RMOptionScreen::loadThumbnailFromSaveState(int nState, byte *lpDestBuf, Com
 		return true;
 	}
 
-	i = f->readByte();
-	f->read(namebuf, i);
-	namebuf[i] = '\0';
+	int bufSize = f->readByte();
+	f->read(namebuf, bufSize);
+	namebuf[bufSize] = '\0';
 	name = namebuf;
 
 	delete f;
@@ -1436,9 +1427,7 @@ RMPointer::~RMPointer() {
 }
 
 void RMPointer::init() {
-	int i;
-
-	for (i = 0; i < 5; i++) {
+	for (int i = 0; i < 5; i++) {
 		RMResRaw res(RES_P_GO + i);
 
 		_pointer[i] = new RMGfxSourceBuffer8RLEByteAA;
@@ -1446,7 +1435,7 @@ void RMPointer::init() {
 		_pointer[i]->loadPaletteWA(RES_P_PAL);
 	}
 
-	for (i = 0; i < 5; i++) {
+	for (int i = 0; i < 5; i++) {
 		RMRes res(RES_P_PAP1 + i);
 		Common::SeekableReadStream *ds = res.getReadStream();
 		_specialPointer[i] = new RMItem;
@@ -1467,9 +1456,7 @@ void RMPointer::init() {
 }
 
 void RMPointer::close() {
-	int i;
-
-	for (i = 0; i < 5; i++) {
+	for (int i = 0; i < 5; i++) {
 		if (_pointer[i] != NULL) {
 			delete _pointer[i];
 			_pointer[i] = NULL;
diff --git a/engines/tony/gfxcore.cpp b/engines/tony/gfxcore.cpp
index 71bf31396c..25ea10d417 100644
--- a/engines/tony/gfxcore.cpp
+++ b/engines/tony/gfxcore.cpp
@@ -56,7 +56,7 @@ void RMGfxTask::Register() {
 	_nInList++;
 }
 
-void RMGfxTask::Unregister() {
+void RMGfxTask::unregister() {
 	_nInList--;
 	assert(_nInList >= 0);
 }
@@ -269,7 +269,7 @@ void RMGfxTargetBuffer::clearOT() {
 	cur = _otlist;
 
 	while (cur != NULL) {
-		cur->_prim->_task->Unregister();
+		cur->_prim->_task->unregister();
 		delete cur->_prim;
 		n = cur->_next;
 		delete cur;
@@ -303,7 +303,7 @@ void RMGfxTargetBuffer::drawOT(CORO_PARAM) {
 		CORO_INVOKE_1(_ctx->cur->_prim->_task->removeThis, _ctx->result);
 		if (_ctx->result) {
 			// De-register the task
-			_ctx->cur->_prim->_task->Unregister();
+			_ctx->cur->_prim->_task->unregister();
 
 			// Delete task, freeing the memory
 			delete _ctx->cur->_prim;
@@ -507,9 +507,7 @@ int RMGfxSourceBufferPal::loadPaletteWA(const byte *buf, bool bSwapped) {
 }
 
 int RMGfxSourceBufferPal::loadPalette(const byte *buf) {
-	int i;
-
-	for (i = 0; i < 256; i++)
+	for (int i = 0; i < 256; i++)
 		memcpy(_pal + i * 3, buf + i * 4, 3);
 
 	preparePalette();
@@ -518,9 +516,7 @@ int RMGfxSourceBufferPal::loadPalette(const byte *buf) {
 }
 
 void RMGfxSourceBufferPal::preparePalette() {
-	int i;
-
-	for (i = 0; i < 256; i++) {
+	for (int i = 0; i < 256; i++) {
 		_palFinal[i] = (((int)_pal[i * 3 + 0] >> 3) <<  10) |
 		                (((int)_pal[i * 3 + 1] >> 3) <<  5) |
 		                (((int)_pal[i * 3 + 2] >> 3) <<  0);
@@ -528,10 +524,8 @@ void RMGfxSourceBufferPal::preparePalette() {
 }
 
 int RMGfxSourceBufferPal::init(const byte *buf, int dimx, int dimy, bool bLoadPalette) {
-	int read;
-
 	// Load the RAW image
-	read = RMGfxSourceBuffer::init(buf, dimx, dimy);
+	int read = RMGfxSourceBuffer::init(buf, dimx, dimy);
 
 	// Load the palette if necessary
 	if (bLoadPalette)
@@ -596,7 +590,7 @@ RMGfxSourceBuffer8::~RMGfxSourceBuffer8() {
 }
 
 void RMGfxSourceBuffer8::draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim) {
-	int x, y, width, height, u, v;
+	int width, height, u, v;
 	int bufx = bigBuf.getDimx();
 	uint16 *buf = bigBuf;
 	byte *raw = _buf;
@@ -623,10 +617,10 @@ void RMGfxSourceBuffer8::draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimit
 
 	// Normal step
 	if (_bTrasp0) {
-		for (y = 0; y < height; y++) {
+		for (int y = 0; y < height; y++) {
 			raw = _buf + (y + v) * _dimx + u;
 
-			for (x = 0; x < width; x++) {
+			for (int x = 0; x < width; x++) {
 				if (*raw)
 					*buf = _palFinal[*raw];
 				buf++;
@@ -636,10 +630,10 @@ void RMGfxSourceBuffer8::draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimit
 			buf += bufx - width;
 		}
 	} else {
-		for (y = 0; y < height; y++) {
+		for (int y = 0; y < height; y++) {
 			raw = _buf + (y + v) * _dimx + u;
 
-			for (x = 0; x < width; x += 2) {
+			for (int x = 0; x < width; x += 2) {
 				buf[0] = _palFinal[raw[0]];
 				buf[1] = _palFinal[raw[1]];
 
@@ -693,11 +687,9 @@ RMGfxSourceBuffer8AB::~RMGfxSourceBuffer8AB() {
 }
 
 int RMGfxSourceBuffer8AB::calcTrasp(int fore, int back) {
-	int r, g, b;
-
-	r = (GETRED(fore) >> 2) + (GETRED(back) >> 1);
-	g = (GETGREEN(fore) >> 2) + (GETGREEN(back) >> 1);
-	b = (GETBLUE(fore) >> 2) + (GETBLUE(back) >> 1);
+	int r = (GETRED(fore) >> 2) + (GETRED(back) >> 1);
+	int g = (GETGREEN(fore) >> 2) + (GETGREEN(back) >> 1);
+	int b = (GETBLUE(fore) >> 2) + (GETBLUE(back) >> 1);
 
 	if (r > 0x1F)
 		r = 0x1F;
@@ -713,7 +705,7 @@ int RMGfxSourceBuffer8AB::calcTrasp(int fore, int back) {
 
 
 void RMGfxSourceBuffer8AB::draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim) {
-	int x, y, width, height, u, v;
+	int width, height, u, v;
 	int bufx = bigBuf.getDimx();
 	uint16 *buf = bigBuf;
 	byte *raw = _buf;
@@ -740,10 +732,10 @@ void RMGfxSourceBuffer8AB::draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrim
 
 	// Passaggio normale
 	if (_bTrasp0) {
-		for (y = 0; y < height; y++) {
+		for (int y = 0; y < height; y++) {
 			raw = _buf + (y + v) * _dimx + u;
 
-			for (x = 0; x < width; x++) {
+			for (int x = 0; x < width; x++) {
 				if (*raw)
 					*buf = calcTrasp(_palFinal[*raw], *buf);
 
@@ -754,10 +746,10 @@ void RMGfxSourceBuffer8AB::draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrim
 			buf += bufx - width;
 		}
 	} else {
-		for (y = 0; y < height; y++) {
+		for (int y = 0; y < height; y++) {
 			raw = _buf + (y + v) * _dimx + u;
 
-			for (x = 0; x < width; x += 2) {
+			for (int x = 0; x < width; x += 2) {
 				buf[0] = calcTrasp(_palFinal[raw[0]], buf[0]);
 				buf[1] = calcTrasp(_palFinal[raw[1]], buf[1]);
 
@@ -809,9 +801,7 @@ void RMGfxSourceBuffer8RLE::init(Common::ReadStream &ds, int dimx, int dimy, boo
 	if (_bNeedRLECompress) {
 		RMGfxSourceBufferPal::init(ds, dimx, dimy, bLoadPalette);
 	} else {
-		int size;
-
-		size = ds.readSint32LE();
+		int size = ds.readSint32LE();
 		_buf = new byte[size];
 		ds.read(_buf, size);
 
@@ -845,7 +835,6 @@ void RMGfxSourceBuffer8RLE::setAlreadyCompressed() {
 }
 
 void RMGfxSourceBuffer8RLE::compressRLE() {
-	int x, y;
 	byte *startline;
 	byte *cur;
 	byte curdata;
@@ -856,7 +845,7 @@ void RMGfxSourceBuffer8RLE::compressRLE() {
 	// Perform RLE compression for lines
 	cur = _megaRLEBuf;
 	src = _buf;
-	for (y = 0; y < _dimy; y++) {
+	for (int y = 0; y < _dimy; y++) {
 		// Save the beginning of the line
 		startline = cur;
 
@@ -867,7 +856,7 @@ void RMGfxSourceBuffer8RLE::compressRLE() {
 		curdata = 0;
 		rep = 0;
 		startsrc = src;
-		for (x = 0; x < _dimx;) {
+		for (int x = 0; x < _dimx;) {
 			if ((curdata == 0 && *src == 0) || (curdata == 1 && *src == _alphaBlendColor)
 			        || (curdata == 2 && (*src != _alphaBlendColor && *src != 0))) {
 				src++;
@@ -875,13 +864,13 @@ void RMGfxSourceBuffer8RLE::compressRLE() {
 				x++;
 			} else {
 				if (curdata == 0) {
-					RLEWriteTrasp(cur, rep);
+					rleWriteTrasp(cur, rep);
 					curdata++;
 				} else if (curdata == 1) {
-					RLEWriteAlphaBlend(cur, rep);
+					rleWriteAlphaBlend(cur, rep);
 					curdata++;
 				} else {
-					RLEWriteData(cur, rep, startsrc);
+					rleWriteData(cur, rep, startsrc);
 					curdata = 0;
 				}
 
@@ -892,16 +881,16 @@ void RMGfxSourceBuffer8RLE::compressRLE() {
 
 		// Pending data?
 		if (curdata == 1) {
-			RLEWriteAlphaBlend(cur, rep);
-			RLEWriteData(cur, 0, NULL);
+			rleWriteAlphaBlend(cur, rep);
+			rleWriteData(cur, 0, NULL);
 		}
 
 		if (curdata == 2) {
-			RLEWriteData(cur, rep, startsrc);
+			rleWriteData(cur, rep, startsrc);
 		}
 
 		// End of line
-		RLEWriteEOL(cur);
+		rleWriteEOL(cur);
 
 		// Write the length of the line
 		WRITE_LE_UINT16(startline, (uint16)(cur - startline));
@@ -911,26 +900,25 @@ void RMGfxSourceBuffer8RLE::compressRLE() {
 	delete[] _buf;
 
 	// Copy the compressed image
-	x = cur - _megaRLEBuf;
-	_buf = new byte[x];
-	Common::copy(_megaRLEBuf, _megaRLEBuf + x, _buf);
+	int bufSize = cur - _megaRLEBuf;
+	_buf = new byte[bufSize];
+	Common::copy(_megaRLEBuf, _megaRLEBuf + bufSize, _buf);
 }
 
 void RMGfxSourceBuffer8RLE::draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim) {
-	int y;
 	byte *src;
 	uint16 *buf = bigBuf;
-	int x1, y1, u, v, width, height;
+	int u, v, width, height;
 
 	// Clipping
-	x1 = prim->getDst()._x1;
-	y1 = prim->getDst()._y1;
+	int x1 = prim->getDst()._x1;
+	int y1 = prim->getDst()._y1;
 	if (!clip2D(x1, y1, u, v, width, height, false, &bigBuf))
 		return;
 
 	// Go forward through the RLE lines
 	src = _buf;
-	for (y = 0; y < v; y++)
+	for (int y = 0; y < v; y++)
 		src += READ_LE_UINT16(src);
 
 	// Calculate the position in the destination buffer
@@ -952,9 +940,9 @@ void RMGfxSourceBuffer8RLE::draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPri
 		// Specify the drawn area
 		bigBuf.addDirtyRect(Common::Rect(x1 - width, y1, x1 + 1, y1 + height));
 
-		for (y = 0; y < height; y++) {
+		for (int y = 0; y < height; y++) {
 			// Decompression
-			RLEDecompressLineFlipped(buf + x1, src + 2, u, width);
+			rleDecompressLineFlipped(buf + x1, src + 2, u, width);
 
 			// Next line
 			src += READ_LE_UINT16(src);
@@ -966,9 +954,9 @@ void RMGfxSourceBuffer8RLE::draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPri
 		// Specify the drawn area
 		bigBuf.addDirtyRect(Common::Rect(x1, y1, x1 + width, y1 + height));
 
-		for (y = 0; y < height; y++) {
+		for (int y = 0; y < height; y++) {
 			// Decompression
-			RLEDecompressLine(buf + x1, src + 2, u, width);
+			rleDecompressLine(buf + x1, src + 2, u, width);
 
 			// Next line
 			src += READ_LE_UINT16(src);
@@ -985,20 +973,19 @@ void RMGfxSourceBuffer8RLE::draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPri
 \****************************************************************************/
 
 RMGfxSourceBuffer8RLEByte::~RMGfxSourceBuffer8RLEByte() {
-
 }
 
-void RMGfxSourceBuffer8RLEByte::RLEWriteTrasp(byte *&cur, int rep) {
+void RMGfxSourceBuffer8RLEByte::rleWriteTrasp(byte *&cur, int rep) {
 	assert(rep < 255);
 	*cur ++ = rep;
 }
 
-void RMGfxSourceBuffer8RLEByte::RLEWriteAlphaBlend(byte *&cur, int rep) {
+void RMGfxSourceBuffer8RLEByte::rleWriteAlphaBlend(byte *&cur, int rep) {
 	assert(rep < 255);
 	*cur ++ = rep;
 }
 
-void RMGfxSourceBuffer8RLEByte::RLEWriteData(byte *&cur, int rep, byte *src) {
+void RMGfxSourceBuffer8RLEByte::rleWriteData(byte *&cur, int rep, byte *src) {
 	assert(rep < 256);
 
 	*cur ++ = rep;
@@ -1011,13 +998,12 @@ void RMGfxSourceBuffer8RLEByte::RLEWriteData(byte *&cur, int rep, byte *src) {
 	return;
 }
 
-void RMGfxSourceBuffer8RLEByte::RLEWriteEOL(byte *&cur) {
+void RMGfxSourceBuffer8RLEByte::rleWriteEOL(byte *&cur) {
 	*cur ++ = 0xFF;
 }
 
-void RMGfxSourceBuffer8RLEByte::RLEDecompressLine(uint16 *dst, byte *src, int nStartSkip, int nLength) {
-	int i, n;
-	int r, g, b;
+void RMGfxSourceBuffer8RLEByte::rleDecompressLine(uint16 *dst, byte *src, int nStartSkip, int nLength) {
+	int n;
 
 	if (nStartSkip == 0)
 		goto RLEByteDoTrasp;
@@ -1086,10 +1072,10 @@ RLEByteDoAlpha:
 RLEByteDoAlpha2:
 		if (n > nLength)
 			n = nLength;
-		for (i = 0; i < n; i++) {
-			r = (*dst >> 10) & 0x1F;
-			g = (*dst >> 5) & 0x1F;
-			b = *dst & 0x1F;
+		for (int i = 0; i < n; i++) {
+			int r = (*dst >> 10) & 0x1F;
+			int g = (*dst >> 5) & 0x1F;
+			int b = *dst & 0x1F;
 
 			r = (r >> 2) + (_alphaR >> 1);
 			g = (g >> 2) + (_alphaG >> 1);
@@ -1111,7 +1097,7 @@ RLEByteDoCopy2:
 		if (n > nLength)
 			n = nLength;
 
-		for (i = 0; i < n; i++)
+		for (int i = 0; i < n; i++)
 			*dst ++ = _palFinal[*src++];
 
 		nLength -= n;
@@ -1121,9 +1107,8 @@ RLEByteDoCopy2:
 	}
 }
 
-void RMGfxSourceBuffer8RLEByte::RLEDecompressLineFlipped(uint16 *dst, byte *src, int nStartSkip, int nLength) {
-	int i, n;
-	int r, g, b;
+void RMGfxSourceBuffer8RLEByte::rleDecompressLineFlipped(uint16 *dst, byte *src, int nStartSkip, int nLength) {
+	int n;
 
 	if (nStartSkip == 0)
 		goto RLEByteFlippedDoTrasp;
@@ -1192,10 +1177,10 @@ RLEByteFlippedDoAlpha:
 RLEByteFlippedDoAlpha2:
 		if (n > nLength)
 			n = nLength;
-		for (i = 0; i < n; i++) {
-			r = (*dst >> 10) & 0x1F;
-			g = (*dst >> 5) & 0x1F;
-			b = *dst & 0x1F;
+		for (int i = 0; i < n; i++) {
+			int r = (*dst >> 10) & 0x1F;
+			int g = (*dst >> 5) & 0x1F;
+			int b = *dst & 0x1F;
 
 			r = (r >> 2) + (_alphaR >> 1);
 			g = (g >> 2) + (_alphaG >> 1);
@@ -1217,7 +1202,7 @@ RLEByteFlippedDoCopy2:
 		if (n > nLength)
 			n = nLength;
 
-		for (i = 0; i < n; i++)
+		for (int i = 0; i < n; i++)
 			*dst-- = _palFinal[*src++];
 
 		nLength -= n;
@@ -1236,17 +1221,17 @@ RMGfxSourceBuffer8RLEWord::~RMGfxSourceBuffer8RLEWord() {
 
 }
 
-void RMGfxSourceBuffer8RLEWord::RLEWriteTrasp(byte *&cur, int rep) {
+void RMGfxSourceBuffer8RLEWord::rleWriteTrasp(byte *&cur, int rep) {
 	WRITE_LE_UINT16(cur, rep);
 	cur += 2;
 }
 
-void RMGfxSourceBuffer8RLEWord::RLEWriteAlphaBlend(byte *&cur, int rep) {
+void RMGfxSourceBuffer8RLEWord::rleWriteAlphaBlend(byte *&cur, int rep) {
 	WRITE_LE_UINT16(cur, rep);
 	cur += 2;
 }
 
-void RMGfxSourceBuffer8RLEWord::RLEWriteData(byte *&cur, int rep, byte *src) {
+void RMGfxSourceBuffer8RLEWord::rleWriteData(byte *&cur, int rep, byte *src) {
 	WRITE_LE_UINT16(cur, rep);
 	cur += 2;
 
@@ -1257,14 +1242,13 @@ void RMGfxSourceBuffer8RLEWord::RLEWriteData(byte *&cur, int rep, byte *src) {
 	}
 }
 
-void RMGfxSourceBuffer8RLEWord::RLEWriteEOL(byte *&cur) {
+void RMGfxSourceBuffer8RLEWord::rleWriteEOL(byte *&cur) {
 	*cur ++ = 0xFF;
 	*cur ++ = 0xFF;
 }
 
-void RMGfxSourceBuffer8RLEWord::RLEDecompressLine(uint16 *dst, byte *src, int nStartSkip, int nLength) {
-	int i, n;
-	int r, g, b;
+void RMGfxSourceBuffer8RLEWord::rleDecompressLine(uint16 *dst, byte *src, int nStartSkip, int nLength) {
+	int n;
 
 	if (nStartSkip == 0)
 		goto RLEWordDoTrasp;
@@ -1341,10 +1325,10 @@ RLEWordDoAlpha2:
 		if (n > nLength)
 			n = nLength;
 
-		for (i = 0; i < n; i++) {
-			r = (*dst >> 10) & 0x1F;
-			g = (*dst >> 5) & 0x1F;
-			b = *dst & 0x1F;
+		for (int i = 0; i < n; i++) {
+			int r = (*dst >> 10) & 0x1F;
+			int g = (*dst >> 5) & 0x1F;
+			int b = *dst & 0x1F;
 
 			r = (r >> 2) + (_alphaR >> 1);
 			g = (g >> 2) + (_alphaG >> 1);
@@ -1368,7 +1352,7 @@ RLEWordDoCopy2:
 		if (n > nLength)
 			n = nLength;
 
-		for (i = 0; i < n; i++)
+		for (int i = 0; i < n; i++)
 			*dst++ = _palFinal[*src++];
 
 		nLength -= n;
@@ -1380,9 +1364,8 @@ RLEWordDoCopy2:
 	}
 }
 
-void RMGfxSourceBuffer8RLEWord::RLEDecompressLineFlipped(uint16 *dst, byte *src, int nStartSkip, int nLength) {
-	int i, n;
-	int r, g, b;
+void RMGfxSourceBuffer8RLEWord::rleDecompressLineFlipped(uint16 *dst, byte *src, int nStartSkip, int nLength) {
+	int n;
 
 	if (nStartSkip == 0)
 		goto RLEWordFlippedDoTrasp;
@@ -1459,10 +1442,10 @@ RLEWordFlippedDoAlpha2:
 		if (n > nLength)
 			n = nLength;
 
-		for (i = 0; i < n; i++) {
-			r = (*dst >> 10) & 0x1F;
-			g = (*dst >> 5) & 0x1F;
-			b = *dst & 0x1F;
+		for (int i = 0; i < n; i++) {
+			int r = (*dst >> 10) & 0x1F;
+			int g = (*dst >> 5) & 0x1F;
+			int b = *dst & 0x1F;
 
 			r = (r >> 2) + (_alphaR >> 1);
 			g = (g >> 2) + (_alphaG >> 1);
@@ -1486,7 +1469,7 @@ RLEWordFlippedDoCopy2:
 		if (n > nLength)
 			n = nLength;
 
-		for (i = 0; i < n; i++)
+		for (int i = 0; i < n; i++)
 			*dst-- = _palFinal[*src++];
 
 		nLength -= n;
@@ -1505,12 +1488,11 @@ RMGfxSourceBuffer8RLEWordAB::~RMGfxSourceBuffer8RLEWordAB() {
 
 }
 
-void RMGfxSourceBuffer8RLEWordAB::RLEDecompressLine(uint16 *dst, byte *src,  int nStartSkip, int nLength) {
-	int i, n;
-	int r, g, b, r2, g2, b2;
+void RMGfxSourceBuffer8RLEWordAB::rleDecompressLine(uint16 *dst, byte *src,  int nStartSkip, int nLength) {
+	int n;
 
 	if (!GLOBALS._bCfgTransparence) {
-		RMGfxSourceBuffer8RLEWord::RLEDecompressLine(dst, src, nStartSkip, nLength);
+		RMGfxSourceBuffer8RLEWord::rleDecompressLine(dst, src, nStartSkip, nLength);
 		return;
 	}
 
@@ -1590,10 +1572,10 @@ RLEWordDoAlpha2:
 			n = nLength;
 
 		// @@@ SHOULD NOT BE THERE !!!!!
-		for (i = 0; i < n; i++) {
-			r = (*dst >> 10) & 0x1F;
-			g = (*dst >> 5) & 0x1F;
-			b = *dst & 0x1F;
+		for (int i = 0; i < n; i++) {
+			int r = (*dst >> 10) & 0x1F;
+			int g = (*dst >> 5) & 0x1F;
+			int b = *dst & 0x1F;
 
 			r = (r >> 2) + (_alphaR >> 1);
 			g = (g >> 2) + (_alphaG >> 1);
@@ -1617,14 +1599,14 @@ RLEWordDoCopy2:
 		if (n > nLength)
 			n = nLength;
 
-		for (i = 0; i < n; i++) {
-			r = (*dst >> 10) & 0x1F;
-			g = (*dst >> 5) & 0x1F;
-			b = *dst & 0x1F;
+		for (int i = 0; i < n; i++) {
+			int r = (*dst >> 10) & 0x1F;
+			int g = (*dst >> 5) & 0x1F;
+			int b = *dst & 0x1F;
 
-			r2 = (_palFinal[*src] >> 10) & 0x1F;
-			g2 = (_palFinal[*src] >> 5) & 0x1F;
-			b2 = _palFinal[*src] & 0x1F;
+			int r2 = (_palFinal[*src] >> 10) & 0x1F;
+			int g2 = (_palFinal[*src] >> 5) & 0x1F;
+			int b2 = _palFinal[*src] & 0x1F;
 
 			r = (r >> 1) + (r2 >> 1);
 			g = (g >> 1) + (g2 >> 1);
@@ -1658,7 +1640,6 @@ void RMGfxSourceBuffer8AA::prepareImage() {
 }
 
 void RMGfxSourceBuffer8AA::calculateAA() {
-	int x, y;
 	byte *src, *srcaa;
 
 	// First pass: fill the edges
@@ -1666,8 +1647,8 @@ void RMGfxSourceBuffer8AA::calculateAA() {
 
 	src = _buf;
 	srcaa = _megaAABuf;
-	for (y = 0; y < _dimy; y++) {
-		for (x = 0; x < _dimx; x++) {
+	for (int y = 0; y < _dimy; y++) {
+		for (int x = 0; x < _dimx; x++) {
 			if (*src == 0) {
 				if ((y > 0 && src[-_dimx] != 0) ||
 				        (y < _dimy - 1 && src[_dimx] != 0) ||
@@ -1683,8 +1664,8 @@ void RMGfxSourceBuffer8AA::calculateAA() {
 
 	src = _buf;
 	srcaa = _megaAABuf;
-	for (y = 0; y < _dimy; y++) {
-		for (x = 0; x < _dimx; x++) {
+	for (int y = 0; y < _dimy; y++) {
+		for (int x = 0; x < _dimx; x++) {
 			if (*src != 0) {
 				if ((y > 0 && srcaa[-_dimx] == 1) ||
 				        (y < _dimy - 1 && srcaa[_dimx] == 1) ||
@@ -1715,23 +1696,20 @@ RMGfxSourceBuffer8AA::~RMGfxSourceBuffer8AA() {
 }
 
 void RMGfxSourceBuffer8AA::drawAA(RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim) {
-	int x, y;
 	byte *src;
 	uint16 *mybuf;
 	uint16 *buf;
-	int x1, y1, u, v, width, height;
-	int r, g, b;
-	int step;
+	int u, v, width, height;
 
 	// Clip the sprite
-	x1 = prim->getDst()._x1;
-	y1 = prim->getDst()._y1;
+	int x1 = prim->getDst()._x1;
+	int y1 = prim->getDst()._y1;
 	if (!clip2D(x1, y1, u, v, width, height, false, &bigBuf))
 		return;
 
 	// Go forward through the RLE lines
 	src = _buf;
-	for (y = 0; y < v; y++)
+	for (int y = 0; y < v; y++)
 		src += READ_LE_UINT16(src);
 
 	// Eliminate horizontal clipping
@@ -1758,6 +1736,7 @@ void RMGfxSourceBuffer8AA::drawAA(RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *pri
 	buf = bigBuf;
 	buf += y1 * bigBuf.getDimx();
 
+	int step;
 	if (prim->isFlipped())
 		step = -1;
 	else
@@ -1765,17 +1744,17 @@ void RMGfxSourceBuffer8AA::drawAA(RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *pri
 
 	// Loop
 	buf += bigBuf.getDimx(); // Skip the first line
-	for (y = 1; y < height - 1; y++) {
+	for (int y = 1; y < height - 1; y++) {
 		// if (prim->IsFlipped())
 		//	mybuf=&buf[x1+m_dimx-1];
 		// else
 		mybuf = &buf[x1];
 
-		for (x = 0; x < width; x++, mybuf += step) {
+		for (int x = 0; x < width; x++, mybuf += step) {
 			if (_aabuf[(y + v) * _dimx + x + u] == 2 && x != 0 && x != width - 1) {
-				r = GETRED(mybuf[1]) + GETRED(mybuf[-1]) + GETRED(mybuf[-bigBuf.getDimx()]) + GETRED(mybuf[bigBuf.getDimx()]);
-				g = GETGREEN(mybuf[1]) + GETGREEN(mybuf[-1]) + GETGREEN(mybuf[-bigBuf.getDimx()]) + GETGREEN(mybuf[bigBuf.getDimx()]);
-				b = GETBLUE(mybuf[1]) + GETBLUE(mybuf[-1]) + GETBLUE(mybuf[-bigBuf.getDimx()]) + GETBLUE(mybuf[bigBuf.getDimx()]);
+				int r = GETRED(mybuf[1]) + GETRED(mybuf[-1]) + GETRED(mybuf[-bigBuf.getDimx()]) + GETRED(mybuf[bigBuf.getDimx()]);
+				int g = GETGREEN(mybuf[1]) + GETGREEN(mybuf[-1]) + GETGREEN(mybuf[-bigBuf.getDimx()]) + GETGREEN(mybuf[bigBuf.getDimx()]);
+				int b = GETBLUE(mybuf[1]) + GETBLUE(mybuf[-1]) + GETBLUE(mybuf[-bigBuf.getDimx()]) + GETBLUE(mybuf[bigBuf.getDimx()]);
 
 				r += GETRED(mybuf[0]);
 				g += GETGREEN(mybuf[0]);
@@ -1785,9 +1764,12 @@ void RMGfxSourceBuffer8AA::drawAA(RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *pri
 				g /= 5;
 				b /= 5;
 
-				if (r > 31) r = 31;
-				if (g > 31) g = 31;
-				if (b > 31) b = 31;
+				if (r > 31)
+					r = 31;
+				if (g > 31)
+					g = 31;
+				if (b > 31)
+					b = 31;
 
 				mybuf[0] = (r << 10) | (g << 5) | b;
 			}
@@ -1803,17 +1785,17 @@ void RMGfxSourceBuffer8AA::drawAA(RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *pri
 
 	// Looppone
 	buf += bigBuf.getDimx();
-	for (y = 1; y < height - 1; y++) {
+	for (int y = 1; y < height - 1; y++) {
 		// if (prim->IsFlipped())
 		// 	mybuf=&buf[x1+m_dimx-1];
 		// else
 		mybuf = &buf[x1];
 
-		for (x = 0; x < width; x++, mybuf += step) {
+		for (int x = 0; x < width; x++, mybuf += step) {
 			if (_aabuf[(y + v) * _dimx + x + u] == 1 && x != 0 && x != width - 1) {
-				r = GETRED(mybuf[1]) + GETRED(mybuf[-1]) + GETRED(mybuf[-bigBuf.getDimx()]) + GETRED(mybuf[bigBuf.getDimx()]);
-				g = GETGREEN(mybuf[1]) + GETGREEN(mybuf[-1]) + GETGREEN(mybuf[-bigBuf.getDimx()]) + GETGREEN(mybuf[bigBuf.getDimx()]);
-				b = GETBLUE(mybuf[1]) + GETBLUE(mybuf[-1]) + GETBLUE(mybuf[-bigBuf.getDimx()]) + GETBLUE(mybuf[bigBuf.getDimx()]);
+				int r = GETRED(mybuf[1]) + GETRED(mybuf[-1]) + GETRED(mybuf[-bigBuf.getDimx()]) + GETRED(mybuf[bigBuf.getDimx()]);
+				int g = GETGREEN(mybuf[1]) + GETGREEN(mybuf[-1]) + GETGREEN(mybuf[-bigBuf.getDimx()]) + GETGREEN(mybuf[bigBuf.getDimx()]);
+				int b = GETBLUE(mybuf[1]) + GETBLUE(mybuf[-1]) + GETBLUE(mybuf[-bigBuf.getDimx()]) + GETBLUE(mybuf[bigBuf.getDimx()]);
 
 				r += GETRED(mybuf[0]) * 2;
 				g += GETGREEN(mybuf[0]) * 2;
@@ -1823,9 +1805,12 @@ void RMGfxSourceBuffer8AA::drawAA(RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *pri
 				g /= 6;
 				b /= 6;
 
-				if (r > 31) r = 31;
-				if (g > 31) g = 31;
-				if (b > 31) b = 31;
+				if (r > 31)
+					r = 31;
+				if (g > 31)
+					g = 31;
+				if (b > 31)
+					b = 31;
 
 				mybuf[0] = (r << 10) | (g << 5) | b;
 			}
@@ -1941,16 +1926,13 @@ RMGfxSourceBuffer16::~RMGfxSourceBuffer16() {
 void RMGfxSourceBuffer16::draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim) {
 	uint16 *buf = bigBuf;
 	uint16 *raw = (uint16 *)_buf;
-	int dimx, dimy;
-	int u, v;
-	int x1, y1;
 
-	dimx = _dimx;
-	dimy = _dimy;
-	u = 0;
-	v = 0;
-	x1 = 0;
-	y1 = 0;
+	int dimx = _dimx;
+	int dimy = _dimy;
+	int u = 0;
+	int v = 0;
+	int x1 = 0;
+	int y1 = 0;
 
 	if (prim->haveSrc()) {
 		u = prim->getSrc()._x1;
@@ -1999,10 +1981,9 @@ void RMGfxSourceBuffer16::draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimi
 
 void RMGfxSourceBuffer16::prepareImage() {
 	// Color space conversion if necessary!
-	int i;
 	uint16 *buf = (uint16 *)_buf;
 
-	for (i = 0; i < _dimx * _dimy; i++)
+	for (int i = 0; i < _dimx * _dimy; i++)
 		WRITE_LE_UINT16(&buf[i], FROM_LE_16(buf[i]) & 0x7FFF);
 }
 
@@ -2041,7 +2022,6 @@ void RMGfxBox::setColor(byte r, byte g, byte b) {
 }
 
 void RMGfxBox::draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim) {
-	int i, j;
 	uint16 *buf = bigBuf;
 	RMRect rcDst;
 
@@ -2050,8 +2030,8 @@ void RMGfxBox::draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim)
 	buf += rcDst._y1 * bigBuf.getDimx() + rcDst._x1;
 
 	// Loop through the pixels
-	for (j = 0; j < rcDst.height(); j++) {
-		for (i = 0; i < rcDst.width(); i++)
+	for (int j = 0; j < rcDst.height(); j++) {
+		for (int i = 0; i < rcDst.width(); i++)
 			*buf++ = _wFillColor;
 
 		buf += bigBuf.getDimx() - rcDst.width();
diff --git a/engines/tony/gfxcore.h b/engines/tony/gfxcore.h
index ac4eee05e4..f0deed83ee 100644
--- a/engines/tony/gfxcore.h
+++ b/engines/tony/gfxcore.h
@@ -146,7 +146,7 @@ public:
 
 	// Registration
 	virtual void Register();
-	virtual void Unregister();
+	virtual void unregister();
 };
 
 
@@ -303,12 +303,12 @@ protected:
 protected:
 	static byte _megaRLEBuf[];
 
-	virtual void RLEWriteTrasp(byte *&cur, int rep) = 0;
-	virtual void RLEWriteData(byte *&cur, int rep, byte *src) = 0;
-	virtual void RLEWriteEOL(byte *&cur) = 0;
-	virtual void RLEWriteAlphaBlend(byte *&cur, int rep) = 0;
-	virtual void RLEDecompressLine(uint16 *dst, byte *src, int nStartSkip, int nLength) = 0;
-	virtual void RLEDecompressLineFlipped(uint16 *dst, byte *src, int nStartSkip, int nLength) = 0;
+	virtual void rleWriteTrasp(byte *&cur, int rep) = 0;
+	virtual void rleWriteData(byte *&cur, int rep, byte *src) = 0;
+	virtual void rleWriteEOL(byte *&cur) = 0;
+	virtual void rleWriteAlphaBlend(byte *&cur, int rep) = 0;
+	virtual void rleDecompressLine(uint16 *dst, byte *src, int nStartSkip, int nLength) = 0;
+	virtual void rleDecompressLineFlipped(uint16 *dst, byte *src, int nStartSkip, int nLength) = 0;
 
 	// Perform image compression in RLE
 	void compressRLE();
@@ -338,12 +338,12 @@ public:
 
 class RMGfxSourceBuffer8RLEByte : public RMGfxSourceBuffer8RLE {
 protected:
-	void RLEWriteTrasp(byte *  &cur, int rep);
-	void RLEWriteAlphaBlend(byte *  &cur, int rep);
-	void RLEWriteData(byte *  &cur, int rep, byte *src);
-	void RLEWriteEOL(byte *  &cur);
-	void RLEDecompressLine(uint16 *dst, byte *src, int nStartSkip, int nLength);
-	void RLEDecompressLineFlipped(uint16 *dst, byte *src, int nStartSkip, int nLength);
+	void rleWriteTrasp(byte *  &cur, int rep);
+	void rleWriteAlphaBlend(byte *  &cur, int rep);
+	void rleWriteData(byte *  &cur, int rep, byte *src);
+	void rleWriteEOL(byte *  &cur);
+	void rleDecompressLine(uint16 *dst, byte *src, int nStartSkip, int nLength);
+	void rleDecompressLineFlipped(uint16 *dst, byte *src, int nStartSkip, int nLength);
 
 public:
 	virtual ~RMGfxSourceBuffer8RLEByte();
@@ -351,12 +351,12 @@ public:
 
 class RMGfxSourceBuffer8RLEWord : public RMGfxSourceBuffer8RLE {
 protected:
-	void RLEWriteTrasp(byte *  &cur, int rep);
-	void RLEWriteAlphaBlend(byte *  &cur, int rep);
-	void RLEWriteData(byte *  &cur, int rep, byte *src);
-	void RLEWriteEOL(byte *  &cur);
-	virtual void RLEDecompressLine(uint16 *dst, byte *src, int nStartSkip, int nLength);
-	virtual void RLEDecompressLineFlipped(uint16 *dst, byte *src, int nStartSkip, int nLength);
+	void rleWriteTrasp(byte *  &cur, int rep);
+	void rleWriteAlphaBlend(byte *  &cur, int rep);
+	void rleWriteData(byte *  &cur, int rep, byte *src);
+	void rleWriteEOL(byte *  &cur);
+	virtual void rleDecompressLine(uint16 *dst, byte *src, int nStartSkip, int nLength);
+	virtual void rleDecompressLineFlipped(uint16 *dst, byte *src, int nStartSkip, int nLength);
 
 public:
 	virtual ~RMGfxSourceBuffer8RLEWord();
@@ -364,7 +364,7 @@ public:
 
 class RMGfxSourceBuffer8RLEWordAB : public RMGfxSourceBuffer8RLEWord {
 protected:
-	virtual void RLEDecompressLine(uint16 *dst, byte *src, int nStartSkip, int nLength);
+	virtual void rleDecompressLine(uint16 *dst, byte *src, int nStartSkip, int nLength);
 
 public:
 	virtual ~RMGfxSourceBuffer8RLEWordAB();
diff --git a/engines/tony/gfxengine.cpp b/engines/tony/gfxengine.cpp
index 5c038e154d..59fb024622 100644
--- a/engines/tony/gfxengine.cpp
+++ b/engines/tony/gfxengine.cpp
@@ -40,7 +40,7 @@ namespace Tony {
 *       RMGfxEngine Methods
 \****************************************************************************/
 
-void ExitAllIdles(CORO_PARAM, const void *param) {
+void exitAllIdles(CORO_PARAM, const void *param) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
@@ -129,7 +129,7 @@ void RMGfxEngine::openOptionScreen(CORO_PARAM, int type) {
 
 			GLOBALS._bIdleExited = false;
 
-			CoroScheduler.createProcess(ExitAllIdles, &_nCurLoc, sizeof(int));
+			CoroScheduler.createProcess(exitAllIdles, &_nCurLoc, sizeof(int));
 		}
 	}
 
@@ -394,13 +394,10 @@ void RMGfxEngine::initForNewLocation(int nLoc, RMPoint ptTonyStart, RMPoint star
 }
 
 uint32 RMGfxEngine::loadLocation(int nLoc, RMPoint ptTonyStart, RMPoint start) {
-	bool bLoaded;
-	int i;
-
 	_nCurLoc = nLoc;
 
-	bLoaded = false;
-	for (i = 0; i < 5; i++) {
+	bool bLoaded = false;
+	for (int i = 0; i < 5; i++) {
 		// Try the loading of the location
 		RMRes res(_nCurLoc);
 		if (!res.isValid())
@@ -532,36 +529,22 @@ void RMGfxEngine::disableMouse() {
 	_bAlwaysDrawMouse = false;
 }
 
-void CharsSaveAll(Common::OutSaveFile *f);
-void CharsLoadAll(Common::InSaveFile *f);
-void MCharResetCodes();
-void SaveChangedHotspot(Common::OutSaveFile *f);
-void LoadChangedHotspot(Common::InSaveFile *f);
-void ReapplyChangedHotspot();
-
-void RestoreMusic(CORO_PARAM);
-void SaveMusic(Common::OutSaveFile *f);
-void LoadMusic(Common::InSaveFile *f);
-
 #define TONY_SAVEGAME_VERSION 8
 
 void RMGfxEngine::saveState(const Common::String &fn, byte *curThumb, const Common::String &name) {
 	Common::OutSaveFile *f;
 	byte *state;
-	uint thumbsize;
-	uint size;
-	int i;
 	char buf[4];
 	RMPoint tp = _tony.position();
 
 	// Saving: MPAL variables, current location, and Tony inventory position
 
 	// For now, we only save the MPAL state
-	size = mpalGetSaveStateSize();
+	uint size = mpalGetSaveStateSize();
 	state = new byte[size];
 	mpalSaveState(state);
 
-	thumbsize = 160 * 120 * 2;
+	uint thumbsize = 160 * 120 * 2;
 
 	buf[0] = 'R';
 	buf[1] = 'M';
@@ -577,7 +560,7 @@ void RMGfxEngine::saveState(const Common::String &fn, byte *curThumb, const Comm
 	f->write(curThumb, thumbsize);
 
 	// Difficulty level
-	i = mpalQueryGlobalVar("VERSIONEFACILE");
+	int i = mpalQueryGlobalVar("VERSIONEFACILE");
 	f->writeByte(i);
 
 	i = strlen(name.c_str());
@@ -608,16 +591,14 @@ void RMGfxEngine::saveState(const Common::String &fn, byte *curThumb, const Comm
 	delete[] state;
 
 	// New Ver5
-	bool bStat;
-
 	// Saves the state of the shepherdess and show yourself
-	bStat = _tony.getShepherdess();
+	bool bStat = _tony.getShepherdess();
 	f->writeByte(bStat);
 	bStat = _inter.getPerorate();
 	f->writeByte(bStat);
 
 	// Save the chars
-	CharsSaveAll(f);
+	charsSaveAll(f);
 
 	// Save the options
 	f->writeByte(GLOBALS._bCfgInvLocked);
@@ -639,10 +620,10 @@ void RMGfxEngine::saveState(const Common::String &fn, byte *curThumb, const Comm
 	f->writeByte(GLOBALS._nCfgSFXVolume);
 
 	// Save the hotspots
-	SaveChangedHotspot(f);
+	saveChangedHotspot(f);
 
 	// Save the music
-	SaveMusic(f);
+	saveMusic(f);
 
 	f->finalize();
 	delete f;
@@ -734,7 +715,7 @@ void RMGfxEngine::loadState(CORO_PARAM, const Common::String &fn) {
 	_inv.loadState(_ctx->state);
 	delete[] _ctx->state;
 
-	if (_ctx->ver >= 0x2) {   // Versione 2: box please
+	if (_ctx->ver >= 0x2) {   // Version 2: box please
 		_ctx->size = _ctx->f->readUint32LE();
 		_ctx->state = new byte[_ctx->size];
 		_ctx->f->read(_ctx->state, _ctx->size);
@@ -743,7 +724,7 @@ void RMGfxEngine::loadState(CORO_PARAM, const Common::String &fn) {
 	}
 
 	if (_ctx->ver >= 5) {
-		// Versione 5
+		// Version 5
 		bool bStat = false;
 
 		bStat = _ctx->f->readByte();
@@ -751,7 +732,7 @@ void RMGfxEngine::loadState(CORO_PARAM, const Common::String &fn) {
 		bStat = _ctx->f->readByte();
 		_inter.setPerorate(bStat);
 
-		CharsLoadAll(_ctx->f);
+		charsLoadAll(_ctx->f);
 	}
 
 	if (_ctx->ver >= 6) {
@@ -775,11 +756,11 @@ void RMGfxEngine::loadState(CORO_PARAM, const Common::String &fn) {
 		GLOBALS._nCfgSFXVolume = _ctx->f->readByte();
 
 		// Load hotspots
-		LoadChangedHotspot(_ctx->f);
+		loadChangedHotspot(_ctx->f);
 	}
 
 	if (_ctx->ver >= 7) {
-		LoadMusic(_ctx->f);
+		loadMusic(_ctx->f);
 	}
 
 	delete _ctx->f;
@@ -793,13 +774,13 @@ void RMGfxEngine::loadState(CORO_PARAM, const Common::String &fn) {
 		mpalQueryDoAction(0, _ctx->loc, 0);
 	else {
 		// In the new ones, we just reset the mcode
-		MCharResetCodes();
+		mCharResetCodes();
 	}
 
 	if (_ctx->ver >= 6)
-		ReapplyChangedHotspot();
+		reapplyChangedHotspot();
 
-	CORO_INVOKE_0(RestoreMusic);
+	CORO_INVOKE_0(restoreMusic);
 
 	_bGUIInterface = true;
 	_bGUIInventory = true;
diff --git a/engines/tony/inventory.cpp b/engines/tony/inventory.cpp
index 81d62a035c..d758c3ff74 100644
--- a/engines/tony/inventory.cpp
+++ b/engines/tony/inventory.cpp
@@ -73,9 +73,6 @@ bool RMInventory::checkPointInside(const RMPoint &pt) {
 
 
 void RMInventory::init() {
-	int i, j;
-	int curres;
-
 	// Create the main buffer
 	create(RM_SX, 68);
 	setPriority(185);
@@ -89,10 +86,10 @@ void RMInventory::init() {
 	_nItems = 78;  // @@@ Number of takeable items
 	_items = new RMInventoryItem[_nItems + 1];
 
-	curres = 10500;
+	int curres = 10500;
 
 	// Loop through the items
-	for (i = 0; i <= _nItems; i++) {
+	for (int i = 0; i <= _nItems; i++) {
 		// Load the items from the resource
 		RMRes res(curres);
 		assert(res.isValid());
@@ -115,7 +112,7 @@ void RMInventory::init() {
 
 		_items[i]._pointer = new RMGfxSourceBuffer8RLEByteAA[_items[i]._icon.numPattern()];
 
-		for (j = 0; j < _items[i]._icon.numPattern(); j++) {
+		for (int j = 0; j < _items[i]._icon.numPattern(); j++) {
 			RMResRaw raw(curres);
 
 			assert(raw.isValid());
@@ -232,9 +229,7 @@ void RMInventory::removeThis(CORO_PARAM, bool &result) {
 }
 
 void RMInventory::removeItem(int code) {
-	int i;
-
-	for (i = 0; i < _nInv; i++)
+	for (int i = 0; i < _nInv; i++) {
 		if (_inv[i] == code - 10000) {
 			g_system->lockMutex(_csModifyInterface);
 
@@ -247,6 +242,7 @@ void RMInventory::removeItem(int code) {
 			g_system->unlockMutex(_csModifyInterface);
 			return;
 		}
+	}
 }
 
 void RMInventory::addItem(int code) {
@@ -286,9 +282,7 @@ void RMInventory::changeItemStatus(uint32 code, uint32 dwStatus) {
 
 
 void RMInventory::prepare() {
-	int i;
-
-	for (i = 1; i < RM_SX / 64 - 1; i++) {
+	for (int i = 1; i < RM_SX / 64 - 1; i++) {
 		if (i - 1 + _curPos < _nInv)
 			addPrim(new RMGfxPrimitive(&_items[_inv[i - 1 + _curPos]]._icon, RMPoint(i * 64, 0)));
 		else
@@ -325,10 +319,8 @@ void RMInventory::endCombine() {
 }
 
 bool RMInventory::leftClick(const RMPoint &mpos, int &nCombineObj) {
-	int n;
-
 	// The left click picks an item from your inventory to use it with the background
-	n = mpos._x / 64;
+	int n = mpos._x / 64;
 
 	if (_state == OPENED) {
 		if (n > 0 && n < RM_SX / 64 - 1 && _inv[n - 1 + _curPos] != 0) {
@@ -679,18 +671,17 @@ RMItem *RMInventory::whichItemIsIn(const RMPoint &mpt) {
 
 int RMInventory::getSaveStateSize() {
 	//     m_inv   pattern   m_nInv
-	return 256 * 4 + 256 * 4   +  4     ;
+	return 256 * 4 + 256 * 4   +  4;
 }
 
 void RMInventory::saveState(byte *state) {
-	int i, x;
-
 	WRITE_LE_UINT32(state, _nInv);
 	state += 4;
 	Common::copy(_inv, _inv + 256, (uint32 *)state);
 	state += 256 * 4;
 
-	for (i = 0; i < 256; i++) {
+	int x;
+	for (int i = 0; i < 256; i++) {
 		if (i < _nItems)
 			x = _items[i]._status;
 		else
@@ -702,14 +693,13 @@ void RMInventory::saveState(byte *state) {
 }
 
 int RMInventory::loadState(byte *state) {
-	int i, x;
-
 	_nInv = READ_LE_UINT32(state);
 	state += 4;
 	Common::copy((uint32 *)state, (uint32 *)state + 256, _inv);
 	state += 256 * 4;
 
-	for (i = 0; i < 256; i++) {
+	int x;
+	for (int i = 0; i < 256; i++) {
 		x = READ_LE_UINT32(state);
 		state += 4;
 
@@ -768,17 +758,15 @@ bool RMInterface::active() {
 }
 
 int RMInterface::onWhichBox(RMPoint pt) {
-	int max, i;
-
 	pt -= _openStart;
 
 	// Check how many verbs you have to consider
-	max = 4;
+	int max = 4;
 	if (_bPerorate)
 		max = 5;
 
 	// Find the verb
-	for (i = 0; i < max; i++) {
+	for (int i = 0; i < max; i++) {
 		if (_hotbbox[i].ptInRect(pt))
 			return i;
 	}
@@ -895,7 +883,6 @@ bool RMInterface::getPerorate() {
 }
 
 void RMInterface::init() {
-	int i;
 	RMResRaw inter(RES_I_INTERFACE);
 	RMRes pal(RES_I_INTERPPAL);
 
@@ -904,7 +891,7 @@ void RMInterface::init() {
 	RMGfxSourceBuffer::init(inter, inter.width(), inter.height());
 	loadPaletteWA(RES_I_INTERPAL);
 
-	for (i = 0; i < 5; i++) {
+	for (int i = 0; i < 5; i++) {
 		RMResRaw part(RES_I_INTERP1 + i);
 
 		_hotzone[i].init(part, part.width(), part.height());
@@ -942,11 +929,9 @@ void RMInterface::init() {
 }
 
 void RMInterface::close() {
-	int i;
-
 	destroy();
 
-	for (i = 0; i < 5; i++)
+	for (int i = 0; i < 5; i++)
 		_hotzone[i].destroy();
 }
 
diff --git a/engines/tony/loc.cpp b/engines/tony/loc.cpp
index 4fe19594f9..665afa9180 100644
--- a/engines/tony/loc.cpp
+++ b/engines/tony/loc.cpp
@@ -51,10 +51,8 @@ void RMPalette::readFromStream(Common::ReadStream &ds) {
 \****************************************************************************/
 
 void RMPattern::RMSlot::readFromStream(Common::ReadStream &ds, bool bLOX) {
-	byte type;
-
 	// Type
-	type = ds.readByte();
+	byte type = ds.readByte();
 	_type = (RMPattern::RMSlotType)type;
 
 	// Data
@@ -73,8 +71,6 @@ void RMPattern::RMSlot::readFromStream(Common::ReadStream &ds, bool bLOX) {
 \****************************************************************************/
 
 void RMPattern::readFromStream(Common::ReadStream &ds, bool bLOX) {
-	int i;
-
 	// Pattern name
 	if (!bLOX)
 		_name = readString(ds);
@@ -94,7 +90,7 @@ void RMPattern::readFromStream(Common::ReadStream &ds, bool bLOX) {
 	// Create and read the slots
 	_slots = new RMSlot[_nSlots];
 
-	for (i = 0; i < _nSlots && !ds.err(); i++) {
+	for (int i = 0; i < _nSlots && !ds.err(); i++) {
 		if (bLOX)
 			_slots[i].readFromStream(ds, true);
 		else
@@ -118,14 +114,12 @@ void RMPattern::stopSfx(RMSfx *sfx) {
 }
 
 int RMPattern::init(RMSfx *sfx, bool bPlayP0, byte *bFlag) {
-	int i;
-
 	// Read the current time
 	_nStartTime = g_vm->getTime();
 	_nCurSlot = 0;
 
 	// Find the first frame of the pattern
-	i = 0;
+	int i = 0;
 	while (_slots[i]._type != SPRITE) {
 		assert(i + 1 < _nSlots);
 		i++;
@@ -297,15 +291,13 @@ void RMSprite::getSizeFromStream(Common::SeekableReadStream &ds, int *dimx, int
 }
 
 void RMSprite::readFromStream(Common::SeekableReadStream &ds, bool bLOX) {
-	int dimx, dimy;
-
 	// Sprite name
 	if (!bLOX)
 		_name = readString(ds);
 
 	// Dimensions
-	dimx = ds.readSint32LE();
-	dimy = ds.readSint32LE();
+	int dimx = ds.readSint32LE();
+	int dimy = ds.readSint32LE();
 
 	// Bounding box
 	_rcBox.readFromStream(ds);
@@ -343,12 +335,10 @@ RMSprite::~RMSprite() {
 \****************************************************************************/
 
 void RMSfx::readFromStream(Common::ReadStream &ds, bool bLOX) {
-	int size;
-
 	// sfx name
 	_name = readString(ds);
 
-	size = ds.readSint32LE();
+	int size = ds.readSint32LE();
 
 	// Read the entire buffer into a MemoryReadStream
 	byte *buffer = (byte *)malloc(size);
@@ -390,7 +380,7 @@ void RMSfx::setVolume(int vol) {
 
 void RMSfx::pause(bool bPause) {
 	if (_fx) {
-		_fx->pause(bPause);
+		_fx->setPause(bPause);
 	}
 }
 
@@ -463,9 +453,6 @@ bool RMItem::isIn(const RMPoint &pt, int *size)  {
 }
 
 void RMItem::readFromStream(Common::SeekableReadStream &ds, bool bLOX) {
-	int i, dimx, dimy;
-	byte cm;
-
 	// MPAL code
 	_mpalCode = ds.readSint32LE();
 
@@ -490,7 +477,7 @@ void RMItem::readFromStream(Common::SeekableReadStream &ds, bool bLOX) {
 	_nPatterns = ds.readSint32LE();
 
 	// Color mode
-	cm = ds.readByte();
+	byte cm = ds.readByte();
 	_cm = (RMColorMode)cm;
 
 	// Flag for the presence of custom palette differences
@@ -519,9 +506,10 @@ void RMItem::readFromStream(Common::SeekableReadStream &ds, bool bLOX) {
 		_sfx = new RMSfx[_nSfx];
 	_patterns = new RMPattern[_nPatterns + 1];
 
+	int dimx, dimy;
 	// Read in class data
-	if (!ds.err())
-		for (i = 0; i < _nSprites && !ds.err(); i++) {
+	if (!ds.err()) {
+		for (int i = 0; i < _nSprites && !ds.err(); i++) {
 			// Download the sprites
 			if (bLOX) {
 				_sprites[i].LOXGetSizeFromStream(ds, &dimx, &dimy);
@@ -536,23 +524,26 @@ void RMItem::readFromStream(Common::SeekableReadStream &ds, bool bLOX) {
 			if (_cm == CM_256 && _bPal)
 				_sprites[i].setPalette(_pal._data);
 		}
+	}
 
-	if (!ds.err())
-		for (i = 0; i < _nSfx && !ds.err(); i++) {
+	if (!ds.err()) {
+		for (int i = 0; i < _nSfx && !ds.err(); i++) {
 			if (bLOX)
 				_sfx[i].readFromStream(ds, true);
 			else
 				_sfx[i].readFromStream(ds, false);
 		}
+	}
 
 	// Read the pattern from pattern 1
-	if (!ds.err())
-		for (i = 1; i <= _nPatterns && !ds.err(); i++) {
+	if (!ds.err()) {
+		for (int i = 1; i <= _nPatterns && !ds.err(); i++) {
 			if (bLOX)
 				_patterns[i].readFromStream(ds, true);
 			else
 				_patterns[i].readFromStream(ds, false);
 		}
+	}
 
 	// Initialize the current pattern
 	if (_bInitCurPattern)
@@ -662,7 +653,7 @@ void RMItem::setStatus(int nStatus) {
 	_bIsActive = (nStatus > 0);
 }
 
-RMPoint RMItem::hotspot() {
+RMPoint RMItem::getHotspot() {
 	return _hot;
 }
 
@@ -789,14 +780,11 @@ void RMItem::playSfx(int nSfx) {
 }
 
 void RMItem::pauseSound(bool bPause) {
-	int i;
-
-	for (i = 0; i < _nSfx; i++)
+	for (int i = 0; i < _nSfx; i++)
 		_sfx[i].pause(bPause);
 }
 
 
-
 /****************************************************************************\
 *       RMWipe Methods
 \****************************************************************************/
@@ -823,8 +811,8 @@ int RMWipe::priority() {
 	return 200;
 }
 
-void RMWipe::Unregister() {
-	RMGfxTask::Unregister();
+void RMWipe::unregister() {
+	RMGfxTask::unregister();
 	assert(_nInList == 0);
 	CoroScheduler.setEvent(_hUnregistered);
 }
@@ -952,7 +940,7 @@ short RMCharacter::findPath(short source, short destination) {
 		error = 1;                         // Possible error
 
 		// 1st cycle: explore possible new nodes
-		for (int i = 0; i < cur->_numbBox; i++)
+		for (int i = 0; i < cur->_numbBox; i++) {
 			if (valid[i] == 1) {
 				error = 0;                 // Failure de-bunked
 				int j = 0;
@@ -967,12 +955,13 @@ short RMCharacter::findPath(short source, short destination) {
 						minCost = nodeCost[i] + 1;
 				}
 			}
+		}
 
 		if (error)
 			finish = true;                                 // All nodes saturated
 
 		// 2nd cycle: adding new nodes that were found, saturate old nodes
-		for (int i = 0; i < cur->_numbBox; i++)
+		for (int i = 0; i < cur->_numbBox; i++) {
 			if ((valid[i] == 1) && ((nodeCost[i] + 1) == minCost)) {
 				box[i]._adj[nextNode[i]] = 2;
 				nodeCost[nextNode[i]] = minCost;
@@ -984,6 +973,7 @@ short RMCharacter::findPath(short source, short destination) {
 				if (nextNode[i] == destination)
 					finish = true;
 			}
+		}
 	}
 
 	// Remove the path from the adjacent modified matrixes
@@ -1079,91 +1069,91 @@ void RMCharacter::goTo(CORO_PARAM, RMPoint destcoord, bool bReversed) {
 }
 
 
-RMPoint RMCharacter::searching(char UP, char DOWN, char RIGHT, char LEFT, RMPoint punto) {
-	short passi, minimo;
-	RMPoint nuovo, trovato;
-	minimo = 32000;
+RMPoint RMCharacter::searching(char UP, char DOWN, char RIGHT, char LEFT, RMPoint point) {
+	short steps;
+	RMPoint newPt, foundPt;
+	short minStep = 32000;
 
 	if (UP) {
-		nuovo = punto;
-		passi = 0;
-		while ((inWhichBox(nuovo) == -1) && (nuovo._y >= 0)) {
-			nuovo._y--;
-			passi++;
+		newPt = point;
+		steps = 0;
+		while ((inWhichBox(newPt) == -1) && (newPt._y >= 0)) {
+			newPt._y--;
+			steps++;
 		}
-		if ((inWhichBox(nuovo) != -1) && (passi < minimo) &&
-		        findPath(inWhichBox(_pos), inWhichBox(nuovo))) {
-			minimo = passi;
-			nuovo._y--;       // to avoid error?
-			trovato = nuovo;
+		if ((inWhichBox(newPt) != -1) && (steps < minStep) &&
+		        findPath(inWhichBox(_pos), inWhichBox(newPt))) {
+			minStep = steps;
+			newPt._y--;       // to avoid error?
+			foundPt = newPt;
 		}
 	}
 
 	if (DOWN) {
-		nuovo = punto;
-		passi = 0;
-		while ((inWhichBox(nuovo) == -1) && (nuovo._y < 480)) {
-			nuovo._y++;
-			passi++;
+		newPt = point;
+		steps = 0;
+		while ((inWhichBox(newPt) == -1) && (newPt._y < 480)) {
+			newPt._y++;
+			steps++;
 		}
-		if ((inWhichBox(nuovo) != -1) && (passi < minimo) &&
-		        findPath(inWhichBox(_pos), inWhichBox(nuovo))) {
-			minimo = passi;
-			nuovo._y++;     // to avoid error?
-			trovato = nuovo;
+		if ((inWhichBox(newPt) != -1) && (steps < minStep) &&
+		        findPath(inWhichBox(_pos), inWhichBox(newPt))) {
+			minStep = steps;
+			newPt._y++;     // to avoid error?
+			foundPt = newPt;
 		}
 	}
 
 	if (RIGHT) {
-		nuovo = punto;
-		passi = 0;
-		while ((inWhichBox(nuovo) == -1) && (nuovo._x < 640)) {
-			nuovo._x++;
-			passi++;
+		newPt = point;
+		steps = 0;
+		while ((inWhichBox(newPt) == -1) && (newPt._x < 640)) {
+			newPt._x++;
+			steps++;
 		}
-		if ((inWhichBox(nuovo) != -1) && (passi < minimo) &&
-		        findPath(inWhichBox(_pos), inWhichBox(nuovo))) {
-			minimo = passi;
-			nuovo._x++;     // to avoid error?
-			trovato = nuovo;
+		if ((inWhichBox(newPt) != -1) && (steps < minStep) &&
+		        findPath(inWhichBox(_pos), inWhichBox(newPt))) {
+			minStep = steps;
+			newPt._x++;     // to avoid error?
+			foundPt = newPt;
 		}
 	}
 
 	if (LEFT) {
-		nuovo = punto;
-		passi = 0;
-		while ((inWhichBox(nuovo) == -1) && (nuovo._x >= 0)) {
-			nuovo._x--;
-			passi++;
+		newPt = point;
+		steps = 0;
+		while ((inWhichBox(newPt) == -1) && (newPt._x >= 0)) {
+			newPt._x--;
+			steps++;
 		}
-		if ((inWhichBox(nuovo) != -1) && (passi < minimo) &&
-		        findPath(inWhichBox(_pos), inWhichBox(nuovo))) {
-			minimo = passi;
-			nuovo._x--;     // to avoid error?
-			trovato = nuovo;
+		if ((inWhichBox(newPt) != -1) && (steps < minStep) &&
+		        findPath(inWhichBox(_pos), inWhichBox(newPt))) {
+			minStep = steps;
+			newPt._x--;     // to avoid error?
+			foundPt = newPt;
 		}
 	}
 
-	if (minimo == 32000)
-		trovato = punto;
+	if (minStep == 32000)
+		foundPt = point;
 
-	return trovato;
+	return foundPt;
 }
 
 
-RMPoint RMCharacter::nearestPoint(const RMPoint &punto) {
-	return searching(1, 1, 1, 1, punto);
+RMPoint RMCharacter::nearestPoint(const RMPoint &point) {
+	return searching(1, 1, 1, 1, point);
 }
 
 
-short RMCharacter::scanLine(const RMPoint &punto) {
+short RMCharacter::scanLine(const RMPoint &point) {
 	int Ldx, Ldy, Lcount;
 	float Lfx, Lfy, Lslope;
 	RMPoint Lstart, Lend, Lscan;
 	signed char Lspeed, Lstatus;
 
 	Lstart = _pos;
-	Lend = punto;
+	Lend = point;
 	Ldx = Lstart._x - Lend._x;
 	Ldy = Lstart._y - Lend._y;
 	Lfx = Ldx;
@@ -1209,60 +1199,60 @@ short RMCharacter::scanLine(const RMPoint &punto) {
 /**
  * Calculates intersections between the straight line and the closest BBOX
  */
-RMPoint RMCharacter::invScanLine(const RMPoint &punto) {
-	int Ldx, Ldy, Lcount;
-	float Lfx, Lfy, Lslope;
-	RMPoint Lstart, Lend, Lscan;
-	signed char Lspeed, Lstatus, Lbox = -1;
-
-	Lstart = punto;      // Exchange!
-	Lend = _pos;    // :-)
-	Ldx = Lstart._x - Lend._x;
-	Ldy = Lstart._y - Lend._y;
-	Lfx = Ldx;
-	Lfy = Ldy;
-	Ldx = ABS(Ldx);
-	Ldy = ABS(Ldy);
-	Lspeed = 1;
-	Lcount = 0;
-
-	if (Ldx > Ldy) {
-		Lslope = Lfy / Lfx;
-		if (Lend._x < Lstart._x)
-			Lspeed = -Lspeed;
-		Lstatus = 1;
+RMPoint RMCharacter::invScanLine(const RMPoint &point) {
+	RMPoint lStart = point;      // Exchange!
+	RMPoint lEnd = _pos;    // :-)
+	int lDx = lStart._x - lEnd._x;
+	int lDy = lStart._y - lEnd._y;
+	float lFx = lDx;
+	float lFy = lDy;
+	lDx = ABS(lDx);
+	lDy = ABS(lDy);
+	signed char lSpeed = 1;
+	int lCount = 0;
+
+	signed char lStatus;
+	float lSlope;
+
+	if (lDx > lDy) {
+		lSlope = lFy / lFx;
+		if (lEnd._x < lStart._x)
+			lSpeed = -lSpeed;
+		lStatus = 1;
 	} else {
-		Lslope = Lfx / Lfy;
-		if (Lend._y < Lstart._y)
-			Lspeed = -Lspeed;
-		Lstatus = 0;
+		lSlope = lFx / lFy;
+		if (lEnd._y < lStart._y)
+			lSpeed = -lSpeed;
+		lStatus = 0;
 	}
-	Lscan = Lstart;
+
+	RMPoint lScan = lStart;
+	signed char lBox = -1;
 
 	for (;;) {
-		if (inWhichBox(Lscan) != -1) {
-			if (inWhichBox(Lscan) != Lbox) {
-				if (inWhichBox(_pos) == inWhichBox(Lscan) || findPath(inWhichBox(_pos), inWhichBox(Lscan)))
-					return Lscan;
+		if (inWhichBox(lScan) != -1) {
+			if (inWhichBox(lScan) != lBox) {
+				if (inWhichBox(_pos) == inWhichBox(lScan) || findPath(inWhichBox(_pos), inWhichBox(lScan)))
+					return lScan;
 				else
-					Lbox = inWhichBox(Lscan);
+					lBox = inWhichBox(lScan);
 			}
 		}
 
-		Lcount++;
-		if (Lstatus) {
-			Ldx = Lspeed * Lcount;
-			Ldy = (int)(Lslope * Ldx);
+		lCount++;
+		if (lStatus) {
+			lDx = lSpeed * lCount;
+			lDy = (int)(lSlope * lDx);
 		} else {
-			Ldy = Lspeed * Lcount;
-			Ldx = (int)(Lslope * Ldy);
+			lDy = lSpeed * lCount;
+			lDx = (int)(lSlope * lDy);
 		}
-		Lscan._x = Lstart._x + Ldx;
-		Lscan._y = Lstart._y + Ldy;
+		lScan._x = lStart._x + lDx;
+		lScan._y = lStart._y + lDy;
 
 		// WORKAROUND: Handles cases where the points never fall inside a bounding box
-		if (Lscan._x < -100 || Lscan._y < -100 || Lscan._x >= 1000 || Lscan._y >= 1000)
-			return punto;
+		if (lScan._x < -100 || lScan._y < -100 || lScan._x >= 1000 || lScan._y >= 1000)
+			return point;
 	}
 }
 
@@ -1272,25 +1262,24 @@ RMPoint RMCharacter::invScanLine(const RMPoint &punto) {
  */
 
 RMPoint RMCharacter::nearestHotSpot(int sourcebox, int destbox) {
-	RMPoint puntocaldo;
-	short cc;
-	int x, y, distanzaminima;
-	distanzaminima = 10000000;
+	RMPoint hotspot;
+	int x, y;
+	int minDist = 10000000;
 	RMBoxLoc *cur = _theBoxes->getBoxes(_curLocation);
 
-	for (cc = 0; cc < cur->_boxes[sourcebox]._numHotspot; cc++)
+	for (short cc = 0; cc < cur->_boxes[sourcebox]._numHotspot; cc++)
 		if ((cur->_boxes[sourcebox]._hotspot[cc]._destination) == destbox) {
 			x = ABS(cur->_boxes[sourcebox]._hotspot[cc]._hotx - _pos._x);
 			y = ABS(cur->_boxes[sourcebox]._hotspot[cc]._hoty - _pos._y);
 
-			if ((x * x + y * y) < distanzaminima) {
-				distanzaminima = x * x + y * y;
-				puntocaldo._x = cur->_boxes[sourcebox]._hotspot[cc]._hotx;
-				puntocaldo._y = cur->_boxes[sourcebox]._hotspot[cc]._hoty;
+			if ((x * x + y * y) < minDist) {
+				minDist = x * x + y * y;
+				hotspot._x = cur->_boxes[sourcebox]._hotspot[cc]._hotx;
+				hotspot._y = cur->_boxes[sourcebox]._hotspot[cc]._hoty;
 			}
 		}
 
-	return puntocaldo;
+	return hotspot;
 }
 
 void RMCharacter::draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim) {
@@ -1310,13 +1299,12 @@ void RMCharacter::draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *pr
 
 void RMCharacter::newBoxEntered(int nBox) {
 	RMBoxLoc *cur;
-	bool bOldReverse;
 
 	// Recall on ExitBox
 	mpalQueryDoAction(3, _curLocation, _curBox);
 
 	cur = _theBoxes->getBoxes(_curLocation);
-	bOldReverse = cur->_boxes[_curBox]._bReversed;
+	bool bOldReverse = cur->_boxes[_curBox]._bReversed;
 	_curBox = nBox;
 
 	// If Z is changed, we must remove it from the OT
@@ -1693,10 +1681,6 @@ void RMCharacter::linkToBoxes(RMGameBoxes *boxes) {
 \****************************************************************************/
 
 void RMBox::readFromStream(Common::ReadStream &ds) {
-	uint16 w;
-	int i;
-	byte b;
-
 	// Bbox
 	_left = ds.readSint32LE();
 	_top = ds.readSint32LE();
@@ -1704,24 +1688,25 @@ void RMBox::readFromStream(Common::ReadStream &ds) {
 	_bottom = ds.readSint32LE();
 
 	// Adjacency
-	for (i = 0; i < MAXBOXES; i++) {
+	for (int i = 0; i < MAXBOXES; i++) {
 		_adj[i] = ds.readSint32LE();
 	}
 
 	// Misc
 	_numHotspot = ds.readSint32LE();
 	_destZ = ds.readByte();
-	b = ds.readByte();
+	byte b = ds.readByte();
 	_bActive = b;
 	b = ds.readByte();
 	_bReversed = b;
 
 	// Reversed expansion space
-	for (i = 0; i < 30; i++)
+	for (int i = 0; i < 30; i++)
 		ds.readByte();
 
+	uint16 w;
 	// Hotspots
-	for (i = 0; i < _numHotspot; i++) {
+	for (int i = 0; i < _numHotspot; i++) {
 		w = ds.readUint16LE();
 		_hotspot[i]._hotx = w;
 		w = ds.readUint16LE();
@@ -1745,14 +1730,12 @@ RMBoxLoc::~RMBoxLoc() {
 }
 
 void RMBoxLoc::readFromStream(Common::ReadStream &ds) {
-	int i;
 	char buf[2];
-	byte ver;
 
 	// ID and version
 	buf[0] = ds.readByte();
 	buf[1] = ds.readByte();
-	ver = ds.readByte();
+	byte ver = ds.readByte();
 	assert(buf[0] == 'B' && buf[1] == 'X');
 	assert(ver == 3);
 
@@ -1763,19 +1746,18 @@ void RMBoxLoc::readFromStream(Common::ReadStream &ds) {
 	_boxes = new RMBox[_numbBox];
 
 	// Read in boxes
-	for (i = 0; i < _numbBox; i++)
+	for (int i = 0; i < _numbBox; i++)
 		_boxes[i].readFromStream(ds);
 }
 
 void RMBoxLoc::recalcAllAdj() {
-	int i, j;
-
-	for (i = 0; i < _numbBox; i++) {
+	for (int i = 0; i < _numbBox; i++) {
 		Common::fill(_boxes[i]._adj, _boxes[i]._adj + MAXBOXES, 0);
 
-		for (j = 0; j < _boxes[i]._numHotspot; j++)
+		for (int j = 0; j < _boxes[i]._numHotspot; j++) {
 			if (_boxes[_boxes[i]._hotspot[j]._destination]._bActive)
 				_boxes[i]._adj[_boxes[i]._hotspot[j]._destination] = 1;
+		}
 	}
 }
 
@@ -1794,11 +1776,9 @@ RMGameBoxes::~RMGameBoxes() {
 }
 
 void RMGameBoxes::init() {
-	int i;
-
 	// Load boxes from disk
 	_nLocBoxes = 130;
-	for (i = 1; i <= _nLocBoxes; i++) {
+	for (int i = 1; i <= _nLocBoxes; i++) {
 		RMRes res(10000 + i);
 
 		Common::SeekableReadStream *ds = res.getReadStream();
@@ -1834,13 +1814,12 @@ bool RMGameBoxes::isInBox(int nLoc, int nBox, const RMPoint &pt) {
 }
 
 int RMGameBoxes::whichBox(int nLoc, const RMPoint &punto) {
-	int i;
 	RMBoxLoc *cur = getBoxes(nLoc);
 
 	if (!cur)
 		return -1;
 
-	for (i = 0; i < cur->_numbBox; i++) {
+	for (int i = 0; i < cur->_numbBox; i++) {
 		if (cur->_boxes[i]._bActive) {
 			if ((punto._x >= cur->_boxes[i]._left) && (punto._x <= cur->_boxes[i]._right) &&
 			        (punto._y >= cur->_boxes[i]._top)  && (punto._y <= cur->_boxes[i]._bottom))
@@ -1857,12 +1836,9 @@ void RMGameBoxes::changeBoxStatus(int nLoc, int nBox, int status) {
 }
 
 int RMGameBoxes::getSaveStateSize() {
-	int size;
-	int i;
+	int size = 4;
 
-	size = 4;
-
-	for (i = 1; i <= _nLocBoxes; i++) {
+	for (int i = 1; i <= _nLocBoxes; i++) {
 		size += 4;
 		size += _allBoxes[i]->_numbBox;
 	}
@@ -1871,38 +1847,34 @@ int RMGameBoxes::getSaveStateSize() {
 }
 
 void RMGameBoxes::saveState(byte *state) {
-	int i, j;
-
 	// Save the number of locations with boxes
 	WRITE_LE_UINT32(state, _nLocBoxes);
 	state += 4;
 
 	// For each location, write out the number of boxes and their status
-	for (i = 1; i <= _nLocBoxes; i++) {
+	for (int i = 1; i <= _nLocBoxes; i++) {
 		WRITE_LE_UINT32(state, _allBoxes[i]->_numbBox);
 		state += 4;
 
-		for (j = 0; j < _allBoxes[i]->_numbBox; j++)
+		for (int j = 0; j < _allBoxes[i]->_numbBox; j++)
 			*state++ = _allBoxes[i]->_boxes[j]._bActive;
 	}
 }
 
 void RMGameBoxes::loadState(byte *state) {
-	int i, j;
-	int nloc, nbox;
-
 	// Load number of items
-	nloc = READ_LE_UINT32(state);
+	int nloc = READ_LE_UINT32(state);
 	state += 4;
 
 	assert(nloc <= _nLocBoxes);
 
+	int nbox;
 	// For each location, read the number of boxes and their status
-	for (i = 1; i <= nloc; i++) {
+	for (int i = 1; i <= nloc; i++) {
 		nbox = READ_LE_UINT32(state);
 		state += 4;
 
-		for (j = 0; j < nbox ; j++) {
+		for (int j = 0; j < nbox ; j++) {
 			if (j < _allBoxes[i]->_numbBox)
 				_allBoxes[i]->_boxes[j]._bActive = *state;
 
@@ -1944,10 +1916,6 @@ int RMLocation::TEMPGetNumLoc() {
  */
 bool RMLocation::load(Common::SeekableReadStream &ds) {
 	char id[3];
-	int dimx, dimy;
-	byte ver;
-	byte cm;
-	int i;
 
 	// Reset dirty rectangling
 	_prevScroll.set(-1, -1);
@@ -1965,7 +1933,7 @@ bool RMLocation::load(Common::SeekableReadStream &ds) {
 		return false;
 
 	// Version
-	ver = ds.readByte();
+	byte ver = ds.readByte();
 	assert(ver == 6);
 
 	// Location name
@@ -1981,12 +1949,12 @@ bool RMLocation::load(Common::SeekableReadStream &ds) {
 	ds.skip(1);
 
 	// Location dimensions
-	dimx = ds.readSint32LE();
-	dimy = ds.readSint32LE();
+	int dimx = ds.readSint32LE();
+	int dimy = ds.readSint32LE();
 	_curScroll.set(0, 0);
 
 	// Read the color mode
-	cm = ds.readByte();
+	byte cm = ds.readByte();
 	_cmode = (RMColorMode)cm;
 
 	// Initialize the source buffer and read the location
@@ -2019,7 +1987,7 @@ bool RMLocation::load(Common::SeekableReadStream &ds) {
 
 
 	g_vm->freezeTime();
-	for (i = 0; i < _nItems && !ds.err(); i++)
+	for (int i = 0; i < _nItems && !ds.err(); i++)
 		_items[i].readFromStream(ds);
 	g_vm->unfreezeTime();
 
@@ -2028,12 +1996,8 @@ bool RMLocation::load(Common::SeekableReadStream &ds) {
 
 
 bool RMLocation::loadLOX(Common::SeekableReadStream &ds) {
-	int dimx, dimy;
-	byte ver;
-	int i;
-
 	// Version
-	ver = ds.readByte();
+	byte ver = ds.readByte();
 	assert(ver == 1);
 
 	// Location name
@@ -2045,8 +2009,8 @@ bool RMLocation::loadLOX(Common::SeekableReadStream &ds) {
 	TEMPTonyStart._y = ds.readSint32LE();
 
 	// Dimensions
-	dimx = ds.readSint32LE();
-	dimy = ds.readSint32LE();
+	int dimx = ds.readSint32LE();
+	int dimy = ds.readSint32LE();
 	_curScroll.set(0, 0);
 
 	// It's always 65K (16-bit) mode
@@ -2063,7 +2027,7 @@ bool RMLocation::loadLOX(Common::SeekableReadStream &ds) {
 	if (_nItems > 0)
 		_items = new RMItem[_nItems];
 
-	for (i = 0; i < _nItems && !ds.err(); i++)
+	for (int i = 0; i < _nItems && !ds.err(); i++)
 		_items[i].readFromStream(ds, true);
 
 	return ds.err();
@@ -2111,22 +2075,18 @@ void RMLocation::draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *pri
  * Prepare a frame, adding the location to the OT list, and all the items that have changed animation frame.
  */
 void RMLocation::doFrame(RMGfxTargetBuffer *bigBuf) {
-	int i;
-
 	// If the location is not in the OT list, add it in
 	if (!_nInList)
 		bigBuf->addPrim(new RMGfxPrimitive(this));
 
 	// Process all the location items
-	for (i = 0; i < _nItems; i++)
+	for (int i = 0; i < _nItems; i++)
 		_items[i].doFrame(bigBuf);
 }
 
 
 RMItem *RMLocation::getItemFromCode(uint32 dwCode) {
-	int i;
-
-	for (i = 0; i < _nItems; i++) {
+	for (int i = 0; i < _nItems; i++) {
 		if (_items[i].mpalCode() == (int)dwCode)
 			return &_items[i];
 	}
@@ -2239,9 +2199,7 @@ void RMLocation::setScrollPosition(const RMPoint &scroll) {
 
 
 void RMLocation::pauseSound(bool bPause) {
-	int i;
-
-	for (i = 0; i < _nItems; i++)
+	for (int i = 0; i < _nItems; i++)
 		_items[i].pauseSound(bPause);
 }
 
diff --git a/engines/tony/loc.h b/engines/tony/loc.h
index 61eece2440..04ba772458 100644
--- a/engines/tony/loc.h
+++ b/engines/tony/loc.h
@@ -256,7 +256,7 @@ public:
 	void setStatus(int nStatus);
 
 	bool isIn(const RMPoint &pt, int *size = NULL);
-	RMPoint hotspot();
+	RMPoint getHotspot();
 	bool getName(Common::String &name);
 	int mpalCode();
 
@@ -403,12 +403,12 @@ private:
 	int inWhichBox(const RMPoint &pt);
 
 	short findPath(short source, short destination);
-	RMPoint searching(char UP, char DOWN, char RIGHT, char LEFT, RMPoint punto);
+	RMPoint searching(char UP, char DOWN, char RIGHT, char LEFT, RMPoint point);
 	RMPoint nearestPoint(const RMPoint &punto);
 
 	void goTo(CORO_PARAM, RMPoint destcoord, bool bReversed = false);
-	short scanLine(const RMPoint &punto);
-	RMPoint invScanLine(const RMPoint &punto);
+	short scanLine(const RMPoint &point);
+	RMPoint invScanLine(const RMPoint &point);
 	RMPoint nearestHotSpot(int sourcebox, int destbox);
 
 	void newBoxEntered(int nBox);
@@ -478,7 +478,7 @@ public:
 	void closeFade();
 	void waitForFadeEnd(CORO_PARAM);
 
-	virtual void Unregister();
+	virtual void unregister();
 	virtual void removeThis(CORO_PARAM, bool &result);
 	virtual int priority();
 };
diff --git a/engines/tony/mpal/expr.cpp b/engines/tony/mpal/expr.cpp
index 7923d263c0..824cd91651 100644
--- a/engines/tony/mpal/expr.cpp
+++ b/engines/tony/mpal/expr.cpp
@@ -35,68 +35,6 @@ namespace Tony {
 
 namespace MPAL {
 
-/**
- * @defgroup Mathamatical operations
- */
-//@{
-
-#define OP_MUL     ((1  << 4) | 0)
-#define OP_DIV     ((1  << 4) | 1)
-#define OP_MODULE  ((1  << 4) | 2)
-#define OP_ADD     ((2  << 4) | 0)
-#define OP_SUB     ((2  << 4) | 1)
-#define OP_SHL     ((3  << 4) | 0)
-#define OP_SHR     ((3  << 4) | 1)
-#define OP_MINOR   ((4  << 4) | 0)
-#define OP_MAJOR   ((4  << 4) | 1)
-#define OP_MINEQ   ((4  << 4) | 2)
-#define OP_MAJEQ   ((4  << 4) | 3)
-#define OP_EQUAL   ((5  << 4) | 0)
-#define OP_NOEQUAL ((5  << 4) | 1)
-#define OP_BITAND  ((6  << 4) | 0)
-#define OP_BITXOR  ((7  << 4) | 0)
-#define OP_BITOR   ((8  << 4) | 0)
-#define OP_AND     ((9  << 4) | 0)
-#define OP_OR      ((10 << 4) | 0)
-
-
-/**
- * Object types that can be contained in an EXPRESSION structure
- */
-enum ExprListTypes {
-	ELT_NUMBER   = 1,
-	ELT_VAR      = 2,
-	ELT_PARENTH  = 3,
-	ELT_PARENTH2 = 4
-};
-
-//@}
-
-/**
- * @defgroup Structures
- */
-//@{
-
-/**
- * Mathamatical framework to manage operations
- */
-typedef struct {
-	byte _type;                     // Tipo di oggetto (vedi enum ExprListTypes)
-	byte _unary;                    // Unary operatore (NON SUPPORTATO)
-
-	union {
-		int _num;                   // Numero (se type==ELT_NUMBER)
-		char *_name;                // Nome variabile (se type==ELT_VAR)
-		MpalHandle _son;            // Handle a espressione (type==ELT_PARENTH)
-		byte *_pson;                // Handle lockato (type==ELT_PARENTH2)
-	} _val;
-
-	byte _symbol;                   // Simbolo matematico (vedi #define OP_*)
-
-} Expression;
-typedef Expression *LpExpression;
-
-//@}
 
 /**
  * Duplicate a mathematical expression.
@@ -106,15 +44,14 @@ typedef Expression *LpExpression;
  */
 static byte *duplicateExpression(MpalHandle h) {
 	byte *orig, *clone;
-	LpExpression one, two;
 
 	orig = (byte *)globalLock(h);
 
 	int num = *(byte *)orig;
-	one = (LpExpression)(orig+1);
+	LpExpression one = (LpExpression)(orig+1);
 
 	clone = (byte *)globalAlloc(GMEM_FIXED, sizeof(Expression) * num + 1);
-	two = (LpExpression)(clone + 1);
+	LpExpression two = (LpExpression)(clone + 1);
 
 	memcpy(clone, orig, sizeof(Expression) * num + 1);
 
@@ -180,7 +117,6 @@ static int Compute(int a, int b, byte symbol) {
 
 static void solve(LpExpression one, int num) {
 	LpExpression two, three;
-	int j;
 
 	while (num > 1) {
 		two = one + 1;
@@ -189,7 +125,7 @@ static void solve(LpExpression one, int num) {
 			memmove(one, two, (num - 1) * sizeof(Expression));
 			--num;
 		} else {
-			j = 1;
+			int j = 1;
 			three = two + 1;
 			while ((three->_symbol != 0) && (two->_symbol & 0xF0) > (three->_symbol & 0xF0)) {
 				++two;
@@ -213,13 +149,11 @@ static void solve(LpExpression one, int num) {
  * @returns		Value
  */
 static int evaluateAndFreeExpression(byte *expr) {
-	LpExpression one, cur;
-
 	int num = *expr;
-	one = (LpExpression)(expr + 1);
+	LpExpression one = (LpExpression)(expr + 1);
 
 	// 1) Substitutions of variables
-	cur = one;
+	LpExpression cur = one;
 	for (int i = 0; i < num; i++, cur++) {
 		if (cur->_type == ELT_VAR) {
 			cur->_type = ELT_NUMBER;
@@ -254,7 +188,6 @@ static int evaluateAndFreeExpression(byte *expr) {
  * @returns		Pointer to the buffer immediately after the expression, or NULL if error.
  */
 const byte *parseExpression(const byte *lpBuf, MpalHandle *h) {
-	LpExpression cur;
 	byte *start;
 
 	uint32 num = *lpBuf;
@@ -270,12 +203,14 @@ const byte *parseExpression(const byte *lpBuf, MpalHandle *h) {
 	start = (byte *)globalLock(*h);
 	*start = (byte)num;
 
-	cur = (LpExpression)(start + 1);
+	LpExpression cur = (LpExpression)(start + 1);
 
 	for (uint32 i = 0;i < num; i++) {
 		cur->_type = *(lpBuf);
-		cur->_unary = *(lpBuf + 1);
+
+		// *(lpBuf + 1) contains the unary operator, unused => skipped
 		lpBuf += 2;
+
 		switch (cur->_type) {
 		case ELT_NUMBER:
 			cur->_val._num = (int32)READ_LE_UINT32(lpBuf);
@@ -322,10 +257,8 @@ const byte *parseExpression(const byte *lpBuf, MpalHandle *h) {
  * @returns		Numeric value
  */
 int evaluateExpression(MpalHandle h) {
-	int ret;
-
 	lockVar();
-	ret = evaluateAndFreeExpression(duplicateExpression(h));
+	int ret = evaluateAndFreeExpression(duplicateExpression(h));
 	unlockVar();
 
 	return ret;
@@ -339,7 +272,6 @@ int evaluateExpression(MpalHandle h) {
  */
 bool compareExpressions(MpalHandle h1, MpalHandle h2) {
 	byte *e1, *e2;
-	LpExpression one, two;
 
 	e1 = (byte *)globalLock(h1);
 	e2 = (byte *)globalLock(h2);
@@ -353,8 +285,8 @@ bool compareExpressions(MpalHandle h1, MpalHandle h2) {
 		return false;
 	}
 
-	one = (LpExpression)(e1 + 1);
-	two = (LpExpression)(e2 + 1);
+	LpExpression one = (LpExpression)(e1 + 1);
+	LpExpression two = (LpExpression)(e2 + 1);
 
 	for (int i = 0; i < num1; i++) {
 		if (one->_type != two->_type || (i != num1 - 1 && one->_symbol != two->_symbol)) {
diff --git a/engines/tony/mpal/expr.h b/engines/tony/mpal/expr.h
index 9036099993..405624b4fe 100644
--- a/engines/tony/mpal/expr.h
+++ b/engines/tony/mpal/expr.h
@@ -35,6 +35,67 @@ namespace Tony {
 
 namespace MPAL {
 
+/**
+ * @defgroup Mathamatical operations
+ */
+//@{
+
+#define OP_MUL     ((1  << 4) | 0)
+#define OP_DIV     ((1  << 4) | 1)
+#define OP_MODULE  ((1  << 4) | 2)
+#define OP_ADD     ((2  << 4) | 0)
+#define OP_SUB     ((2  << 4) | 1)
+#define OP_SHL     ((3  << 4) | 0)
+#define OP_SHR     ((3  << 4) | 1)
+#define OP_MINOR   ((4  << 4) | 0)
+#define OP_MAJOR   ((4  << 4) | 1)
+#define OP_MINEQ   ((4  << 4) | 2)
+#define OP_MAJEQ   ((4  << 4) | 3)
+#define OP_EQUAL   ((5  << 4) | 0)
+#define OP_NOEQUAL ((5  << 4) | 1)
+#define OP_BITAND  ((6  << 4) | 0)
+#define OP_BITXOR  ((7  << 4) | 0)
+#define OP_BITOR   ((8  << 4) | 0)
+#define OP_AND     ((9  << 4) | 0)
+#define OP_OR      ((10 << 4) | 0)
+
+//@}
+
+/**
+ * @defgroup Structures
+ */
+
+//@{
+/**
+ * Mathamatical framework to manage operations
+ */
+typedef struct {
+	byte _type;                     // Object Type (see enum ExprListTypes)
+
+	union {
+		int _num;                   // Identifier (if type == ELT_NUMBER)
+		char *_name;                // Variable name (if type == ELT_VAR)
+		MpalHandle _son;            // Handle expressions (if type == ELT_PARENTH)
+		byte *_pson;                // Handle lockato (if type == ELT_PARENTH2)
+	} _val;
+
+	byte _symbol;                   // Mathematic symbols (see #define OP_*)
+
+} Expression;
+typedef Expression *LpExpression;
+
+//@}
+
+/**
+ * Object types that can be contained in an EXPRESSION structure
+ */
+enum ExprListTypes {
+	ELT_NUMBER   = 1,
+	ELT_VAR      = 2,
+	ELT_PARENTH  = 3,
+	ELT_PARENTH2 = 4
+};
+
 /****************************************************************************\
 *       Function Prototypes
 \****************************************************************************/
diff --git a/engines/tony/mpal/loadmpc.cpp b/engines/tony/mpal/loadmpc.cpp
index 953820be74..9c45cdf982 100644
--- a/engines/tony/mpal/loadmpc.cpp
+++ b/engines/tony/mpal/loadmpc.cpp
@@ -139,7 +139,6 @@ static void FreeScript(LpMpalScript lpmsScript) {
  * @returns		Pointer to the buffer after the item, or NULL on failure.
  */
 static const byte *parseDialog(const byte *lpBuf, LpMpalDialog lpmdDialog) {
-	uint32 num2, num3;
 	byte *lpLock;
 
 	lpmdDialog->_nObj = READ_LE_UINT32(lpBuf);
@@ -266,7 +265,7 @@ static const byte *parseDialog(const byte *lpBuf, LpMpalDialog lpmdDialog) {
 		lpmdDialog->_choice[i]._nChoice = READ_LE_UINT16(lpBuf);
 		lpBuf += 2;
 
-		num2 = *lpBuf++;
+		uint32 num2 = *lpBuf++;
 
 		if (num2 >= MAX_SELECTS_PER_CHOICE)
 			error("Too much selects in choice #%d in dialog #%d", lpmdDialog->_choice[i]._nChoice, lpmdDialog->_nObj);
@@ -296,7 +295,7 @@ static const byte *parseDialog(const byte *lpBuf, LpMpalDialog lpmdDialog) {
 			lpBuf += 4;
 
 			// PlayGroup
-			num3 = *lpBuf++;
+			uint32 num3 = *lpBuf++;
 
 			if (num3 >= MAX_PLAYGROUPS_PER_SELECT)
 				error("Too much playgroups in select #%d in choice #%d in dialog #%d", j, lpmdDialog->_choice[i]._nChoice, lpmdDialog->_nObj);
@@ -365,7 +364,6 @@ static const byte *parseItem(const byte *lpBuf, LpMpalItem lpmiItem) {
 			lpBuf++;
 		}
 
-
 		if (*lpBuf == 0) {
 			lpBuf++;
 			lpmiItem->_action[i]._when = NULL;
diff --git a/engines/tony/mpal/memory.cpp b/engines/tony/mpal/memory.cpp
index 78b036e657..dfbf16e789 100644
--- a/engines/tony/mpal/memory.cpp
+++ b/engines/tony/mpal/memory.cpp
@@ -33,8 +33,6 @@ namespace MPAL {
 *       MemoryManager methods
 \****************************************************************************/
 
-const uint32 BLOCK_ID = 0x12345678;
-
 /**
  * Allocates a new memory block
  * @return					Returns a MemoryItem instance for the new block
diff --git a/engines/tony/mpal/memory.h b/engines/tony/mpal/memory.h
index ba7865938f..9c21cc20e6 100644
--- a/engines/tony/mpal/memory.h
+++ b/engines/tony/mpal/memory.h
@@ -69,6 +69,8 @@ public:
 #define GMEM_MOVEABLE 2
 #define GMEM_ZEROINIT 4
 
+const uint32 BLOCK_ID = 0x12345678;
+
 } // end of namespace MPAL
 
 } // end of namespace Tony
diff --git a/engines/tony/mpal/mpal.cpp b/engines/tony/mpal/mpal.cpp
index 10f5753540..8d83363c24 100644
--- a/engines/tony/mpal/mpal.cpp
+++ b/engines/tony/mpal/mpal.cpp
@@ -39,19 +39,6 @@ namespace Tony {
 
 namespace MPAL {
 
-#define GETARG(type)   va_arg(v, type)
-
-/****************************************************************************\
-*       Copyright
-\****************************************************************************/
-
-const char *mpalCopyright =
-	"\n\nMPAL - MultiPurpose Adventure Language for Windows 95\n"
-	"Copyright 1997-98 Giovanni Bajo and Luca Giusti\n"
-	"ALL RIGHTS RESERVED\n"
-	"\n"
-	"\n";
-
 /****************************************************************************\
 *       Internal functions
 \****************************************************************************/
@@ -363,24 +350,22 @@ static char *duplicateDialogPeriod(uint32 nPeriod) {
 MpalHandle resLoad(uint32 dwId) {
 	MpalHandle h;
 	char head[4];
-	uint32 nBytesRead;
-	uint32 nSizeComp, nSizeDecomp;
 	byte *temp, *buf;
 
 	for (int i = 0; i < GLOBALS._nResources; i++)
 		if (GLOBALS._lpResources[i * 2] == dwId) {
 			GLOBALS._hMpr.seek(GLOBALS._lpResources[i * 2 + 1]);
-			nBytesRead = GLOBALS._hMpr.read(head, 4);
+			uint32 nBytesRead = GLOBALS._hMpr.read(head, 4);
 			if (nBytesRead != 4)
 				return NULL;
 			if (head[0] != 'R' || head[1] != 'E' || head[2] != 'S' || head[3] != 'D')
 				return NULL;
 
-			nSizeDecomp = GLOBALS._hMpr.readUint32LE();
+			uint32 nSizeDecomp = GLOBALS._hMpr.readUint32LE();
 			if (GLOBALS._hMpr.err())
 				return NULL;
 
-			nSizeComp = GLOBALS._hMpr.readUint32LE();
+			uint32 nSizeComp = GLOBALS._hMpr.readUint32LE();
 			if (GLOBALS._hMpr.err())
 				return NULL;
 
@@ -463,18 +448,16 @@ static uint32 *GetItemList(uint32 nLoc) {
 
 static LpItem getItemData(uint32 nOrdItem) {
 	LpMpalItem curitem = GLOBALS._lpmiItems + nOrdItem;
-	LpItem ret;
-	MpalHandle hDat;
 	char *dat;
 	char *patlength;
 
 	// Zeroing out the allocated memory is required!!!
-	ret = (LpItem)globalAlloc(GMEM_FIXED | GMEM_ZEROINIT, sizeof(Item));
+	LpItem ret = (LpItem)globalAlloc(GMEM_FIXED | GMEM_ZEROINIT, sizeof(Item));
 	if (ret == NULL)
 		return NULL;
 	ret->_speed = 150;
 
-	hDat = resLoad(curitem->_dwRes);
+	MpalHandle hDat = resLoad(curitem->_dwRes);
 	dat = (char *)globalLock(hDat);
 
 	if (dat[0] == 'D' && dat[1] == 'A' && dat[2] == 'T') {
@@ -659,6 +642,9 @@ void ScriptThread(CORO_PARAM, const void *param) {
 				CORO_KILL_SELF();
 				return;
 			}
+
+			// WORKAROUND: Wait for events to pulse.
+			CORO_SLEEP(1);
 		}
 	}
 
@@ -727,6 +713,9 @@ void ActionThread(CORO_PARAM, const void *param) {
 			GLOBALS._mpalError = 1;
 			break;
 		}
+
+		// WORKAROUND: Wait for events to pulse.
+		CORO_SLEEP(1);
 	}
 
 	globalDestroy(_ctx->item);
@@ -1138,6 +1127,9 @@ void GroupThread(CORO_PARAM, const void *param) {
 					CORO_KILL_SELF();
 					return;
 				}
+
+				// WORKAROUND: Wait for events to pulse.
+				CORO_SLEEP(1);
 			}
 
 			// The gruop is finished, so we can return to the calling function.
@@ -1403,11 +1395,7 @@ bool doSelection(uint32 i, uint32 dwData) {
  */
 bool mpalInit(const char *lpszMpcFileName, const char *lpszMprFileName,
 			  LPLPCUSTOMFUNCTION lplpcfArray, Common::String *lpcfStrings) {
-	Common::File hMpc;
 	byte buf[5];
-	uint32 nBytesRead;
-	bool bCompress;
-	uint32 dwSizeDecomp, dwSizeComp;
 	byte *cmpbuf;
 
 	// Save the array of custom functions
@@ -1415,21 +1403,22 @@ bool mpalInit(const char *lpszMpcFileName, const char *lpszMprFileName,
 	GLOBALS._lplpFunctionStrings = lpcfStrings;
 
 	// OPen the MPC file for reading
+	Common::File hMpc;
 	if (!hMpc.open(lpszMpcFileName))
 		return false;
 
 	// Read and check the header
-	nBytesRead = hMpc.read(buf, 5);
+	uint32 nBytesRead = hMpc.read(buf, 5);
 	if (nBytesRead != 5)
 		return false;
 
 	if (buf[0] != 'M' || buf[1] != 'P' || buf[2] != 'C' || buf[3] != 0x20)
 		return false;
 
-	bCompress = buf[4];
+	bool bCompress = buf[4];
 
 	// Reads the size of the uncompressed file, and allocate memory
-	dwSizeDecomp = hMpc.readUint32LE();
+	uint32 dwSizeDecomp = hMpc.readUint32LE();
 	if (hMpc.err())
 		return false;
 
@@ -1439,7 +1428,7 @@ bool mpalInit(const char *lpszMpcFileName, const char *lpszMprFileName,
 
 	if (bCompress) {
 		// Get the compressed size and read the data in
-		dwSizeComp = hMpc.readUint32LE();
+		uint32 dwSizeComp = hMpc.readUint32LE();
 		if (hMpc.err())
 			return false;
 
@@ -1480,7 +1469,7 @@ bool mpalInit(const char *lpszMpcFileName, const char *lpszMprFileName,
 	// Seek to the end of the file to read overall information
 	GLOBALS._hMpr.seek(-12, SEEK_END);
 
-	dwSizeComp = GLOBALS._hMpr.readUint32LE();
+	uint32 dwSizeComp = GLOBALS._hMpr.readUint32LE();
 	if (GLOBALS._hMpr.err())
 		return false;
 
@@ -1958,11 +1947,9 @@ uint32 mpalGetError() {
  * @returns		TRUE if the script 'was launched, FALSE on failure
  */
 bool mpalExecuteScript(int nScript) {
-	LpMpalScript s;
-
 	LockScripts();
 	int n = scriptGetOrderFromNum(nScript);
-	s = (LpMpalScript)globalAlloc(GMEM_FIXED | GMEM_ZEROINIT, sizeof(MpalScript));
+	LpMpalScript s = (LpMpalScript)globalAlloc(GMEM_FIXED | GMEM_ZEROINIT, sizeof(MpalScript));
 	if (s == NULL)
 		return false;
 
diff --git a/engines/tony/mpal/mpal.h b/engines/tony/mpal/mpal.h
index c5f505063f..5e1b02b3fc 100644
--- a/engines/tony/mpal/mpal.h
+++ b/engines/tony/mpal/mpal.h
@@ -102,6 +102,8 @@ namespace MPAL {
 #define MAXPATTERN 40         // pattern of animation of an object
 #define MAXPOLLINGLOCATIONS   64
 
+#define GETARG(type)   va_arg(v, type)
+
 /**
  * Macro for use with queries that may refer to X and Y co-ordinates
  */
diff --git a/engines/tony/sound.cpp b/engines/tony/sound.cpp
index 2c2c280eb2..2844e0d925 100644
--- a/engines/tony/sound.cpp
+++ b/engines/tony/sound.cpp
@@ -45,7 +45,7 @@ namespace Tony {
  *
  */
 FPSound::FPSound() {
-	_bSoundSupported = false;
+	_soundSupported = false;
 }
 
 /**
@@ -54,8 +54,8 @@ FPSound::FPSound() {
  * @returns     True is everything is OK, False otherwise
  */
 bool FPSound::init() {
-	_bSoundSupported = g_system->getMixer()->isReady();
-	return _bSoundSupported;
+	_soundSupported = g_system->getMixer()->isReady();
+	return _soundSupported;
 }
 
 /**
@@ -69,55 +69,55 @@ FPSound::~FPSound() {
 /**
  * Allocates an object of type FPStream, and return its pointer
  *
- * @param lplpStream   Will contain a pointer to the object you just created.
+ * @param streamPtr    Will contain a pointer to the object you just created.
  *
  * @returns     True is everything is OK, False otherwise
  */
 
-bool FPSound::createStream(FPStream **lplpStream) {
-	(*lplpStream) = new FPStream(_bSoundSupported);
+bool FPSound::createStream(FPStream **streamPtr) {
+	(*streamPtr) = new FPStream(_soundSupported);
 
-	return (*lplpStream != NULL);
+	return (*streamPtr != NULL);
 }
 
 /**
  * Allocates an object of type FpSfx, and return its pointer
  *
- * @param lplpSfx         Will contain a pointer to the object you just created.
+ * @param soundPtr        Will contain a pointer to the object you just created.
  *
  * @returns     True is everything is OK, False otherwise
  */
 
-bool FPSound::createSfx(FPSfx **lplpSfx) {
-	(*lplpSfx) = new FPSfx(_bSoundSupported);
+bool FPSound::createSfx(FPSfx **sfxPtr) {
+	(*sfxPtr) = new FPSfx(_soundSupported);
 
-	return (*lplpSfx != NULL);
+	return (*sfxPtr != NULL);
 }
 
 /**
  * Set the general volume
  *
- * @param dwVolume          Volume to set (0-63)
+ * @param volume            Volume to set (0-63)
  */
 
-void FPSound::setMasterVolume(int dwVolume) {
-	if (!_bSoundSupported)
+void FPSound::setMasterVolume(int volume) {
+	if (!_soundSupported)
 		return;
 
-	g_system->getMixer()->setVolumeForSoundType(Audio::Mixer::kPlainSoundType, CLIP<int>(dwVolume, 0, 63) * Audio::Mixer::kMaxChannelVolume / 63);
+	g_system->getMixer()->setVolumeForSoundType(Audio::Mixer::kPlainSoundType, CLIP<int>(volume, 0, 63) * Audio::Mixer::kMaxChannelVolume / 63);
 }
 
 /**
  * Get the general volume
  *
- * @param lpdwVolume          Variable that will contain the volume (0-63)
+ * @param volumePtr           Variable that will contain the volume (0-63)
  */
 
-void FPSound::getMasterVolume(int *lpdwVolume) {
-	if (!_bSoundSupported)
+void FPSound::getMasterVolume(int *volumePtr) {
+	if (!_soundSupported)
 		return;
 
-	*lpdwVolume = g_system->getMixer()->getVolumeForSoundType(Audio::Mixer::kPlainSoundType) * 63 / Audio::Mixer::kMaxChannelVolume;
+	*volumePtr = g_system->getMixer()->getVolumeForSoundType(Audio::Mixer::kPlainSoundType) * 63 / Audio::Mixer::kMaxChannelVolume;
 }
 
 /**
@@ -128,15 +128,15 @@ void FPSound::getMasterVolume(int *lpdwVolume) {
  *
  */
 
-FPSfx::FPSfx(bool bSoundOn) {
-	_bSoundSupported = bSoundOn;
-	_bFileLoaded = false;
+FPSfx::FPSfx(bool soundOn) {
+	_soundSupported = soundOn;
+	_fileLoaded = false;
 	_lastVolume = 63;
 	_hEndOfBuffer = CoroScheduler.createEvent(true, false);
-	_bIsVoice = false;
+	_isVoice = false;
 	_loopStream = 0;
 	_rewindableStream = 0;
-	_bPaused = false;
+	_paused = false;
 
 	g_vm->_activeSfx.push_back(this);
 }
@@ -150,7 +150,7 @@ FPSfx::FPSfx(bool bSoundOn) {
  */
 
 FPSfx::~FPSfx() {
-	if (!_bSoundSupported)
+	if (!_soundSupported)
 		return;
 
 	g_system->getMixer()->stopHandle(_handle);
@@ -187,22 +187,22 @@ bool FPSfx::loadWave(Common::SeekableReadStream *stream) {
 	if (!_rewindableStream)
 		return false;
 
-	_bFileLoaded = true;
+	_fileLoaded = true;
 	setVolume(_lastVolume);
 	return true;
 }
 
 bool FPSfx::loadVoiceFromVDB(Common::File &vdbFP) {
-	if (!_bSoundSupported)
+	if (!_soundSupported)
 		return true;
 
 	uint32 size = vdbFP.readUint32LE();
 	uint32 rate = vdbFP.readUint32LE();
-	_bIsVoice = true;
+	_isVoice = true;
 
 	_rewindableStream = Audio::makeADPCMStream(vdbFP.readStream(size), DisposeAfterUse::YES, 0, Audio::kADPCMDVI, rate, 1);
 
-	_bFileLoaded = true;
+	_fileLoaded = true;
 	setVolume(62);
 	return true;
 }
@@ -210,18 +210,18 @@ bool FPSfx::loadVoiceFromVDB(Common::File &vdbFP) {
 /**
  * Opens a file and loads a sound effect.
  *
- * @param lpszFileName     Sfx filename
- * @param dwCodec          CODEC used to uncompress the samples
+ * @param fileName         Sfx filename
+ * @param codec            CODEC used to uncompress the samples
  *
  * @returns                True is everything is OK, False otherwise
  */
 
-bool FPSfx::loadFile(const char *lpszFileName, uint32 dwCodec) {
-	if (!_bSoundSupported)
+bool FPSfx::loadFile(const char *fileName, uint32 codec) {
+	if (!_soundSupported)
 		return true;
 
 	Common::File file;
-	if (!file.open(lpszFileName)) {
+	if (!file.open(fileName)) {
 		warning("FPSfx::LoadFile(): Cannot open sfx file!");
 		return false;
 	}
@@ -236,7 +236,7 @@ bool FPSfx::loadFile(const char *lpszFileName, uint32 dwCodec) {
 
 	Common::SeekableReadStream *buffer = file.readStream(file.size() - file.pos());
 
-	if (dwCodec == FPCODEC_ADPCM) {
+	if (codec == FPCODEC_ADPCM) {
 		_rewindableStream = Audio::makeADPCMStream(buffer, DisposeAfterUse::YES, 0, Audio::kADPCMDVI, rate, channels);
 	} else {
 		byte flags = Audio::FLAG_16BITS | Audio::FLAG_LITTLE_ENDIAN;
@@ -247,7 +247,7 @@ bool FPSfx::loadFile(const char *lpszFileName, uint32 dwCodec) {
 		_rewindableStream = Audio::makeRawStream(buffer, rate, flags, DisposeAfterUse::YES);
 	}
 
-	_bFileLoaded = true;
+	_fileLoaded = true;
 	return true;
 }
 
@@ -260,14 +260,14 @@ bool FPSfx::loadFile(const char *lpszFileName, uint32 dwCodec) {
 bool FPSfx::play() {
 	stop(); // sanity check
 
-	if (_bFileLoaded) {
+	if (_fileLoaded) {
 		CoroScheduler.resetEvent(_hEndOfBuffer);
 
 		_rewindableStream->rewind();
 
 		Audio::AudioStream *stream = _rewindableStream;
 
-		if (_bLoop) {
+		if (_loop) {
 			if (!_loopStream)
 				_loopStream = Audio::makeLoopingAudioStream(_rewindableStream, 0);
 
@@ -279,7 +279,7 @@ bool FPSfx::play() {
 
 		setVolume(_lastVolume);
 
-		if (_bPaused)
+		if (_paused)
 			g_system->getMixer()->pauseHandle(_handle, true);
 	}
 
@@ -293,9 +293,9 @@ bool FPSfx::play() {
  */
 
 bool FPSfx::stop() {
-	if (_bFileLoaded) {
+	if (_fileLoaded) {
 		g_system->getMixer()->stopHandle(_handle);
-		_bPaused = false;
+		_paused = false;
 	}
 
 	return true;
@@ -304,15 +304,15 @@ bool FPSfx::stop() {
 /**
  * Enables or disables the Sfx loop.
  *
- * @param _bLoop         True to enable the loop, False to disable
+ * @param loop          True to enable the loop, False to disable
  *
  * @remarks             The loop must be activated BEFORE the sfx starts
  *                      playing. Any changes made during the play will have
  *                      no effect until the sfx is stopped then played again.
  */
 
-void FPSfx::setLoop(bool bLop) {
-	_bLoop = bLop;
+void FPSfx::setLoop(bool loop) {
+	_loop = loop;
 }
 
 /**
@@ -320,65 +320,65 @@ void FPSfx::setLoop(bool bLop) {
  *
  */
 
-void FPSfx::pause(bool bPause) {
-	if (_bFileLoaded) {
-		if (g_system->getMixer()->isSoundHandleActive(_handle) && (bPause ^ _bPaused))
-			g_system->getMixer()->pauseHandle(_handle, bPause);
+void FPSfx::setPause(bool pause) {
+	if (_fileLoaded) {
+		if (g_system->getMixer()->isSoundHandleActive(_handle) && (pause ^ _paused))
+			g_system->getMixer()->pauseHandle(_handle, pause);
 
-		_bPaused = bPause;
+		_paused = pause;
 	}
 }
 
 /**
  * Change the volume of Sfx
  *
- * @param dwVolume      Volume to be set (0-63)
+ * @param volume        Volume to be set (0-63)
  *
  */
 
-void FPSfx::setVolume(int dwVolume) {
-	if (dwVolume > 63)
-		dwVolume = 63;
+void FPSfx::setVolume(int volume) {
+	if (volume > 63)
+		volume = 63;
 
-	if (dwVolume < 0)
-		dwVolume = 0;
+	if (volume < 0)
+		volume = 0;
 
-	_lastVolume = dwVolume;
+	_lastVolume = volume;
 
-	if (_bIsVoice) {
+	if (_isVoice) {
 		if (!GLOBALS._bCfgDubbing)
-			dwVolume = 0;
+			volume = 0;
 		else {
-			dwVolume -= (10 - GLOBALS._nCfgDubbingVolume) * 2;
-			if (dwVolume < 0)
-				dwVolume = 0;
+			volume -= (10 - GLOBALS._nCfgDubbingVolume) * 2;
+			if (volume < 0)
+				volume = 0;
 		}
 	} else {
 		if (!GLOBALS._bCfgSFX)
-			dwVolume = 0;
+			volume = 0;
 		else {
-			dwVolume -= (10 - GLOBALS._nCfgSFXVolume) * 2;
-			if (dwVolume < 0)
-				dwVolume = 0;
+			volume -= (10 - GLOBALS._nCfgSFXVolume) * 2;
+			if (volume < 0)
+				volume = 0;
 		}
 	}
 
 	if (g_system->getMixer()->isSoundHandleActive(_handle))
-		g_system->getMixer()->setChannelVolume(_handle, dwVolume * Audio::Mixer::kMaxChannelVolume / 63);
+		g_system->getMixer()->setChannelVolume(_handle, volume * Audio::Mixer::kMaxChannelVolume / 63);
 }
 
 /**
  * Gets the Sfx volume
  *
- * @param lpdwVolume    Will contain the current Sfx volume
+ * @param volumePtr     Will contain the current Sfx volume
  *
  */
 
-void FPSfx::getVolume(int *lpdwVolume) {
+void FPSfx::getVolume(int *volumePtr) {
 	if (g_system->getMixer()->isSoundHandleActive(_handle))
-		*lpdwVolume = g_system->getMixer()->getChannelVolume(_handle) * 63 / Audio::Mixer::kMaxChannelVolume;
+		*volumePtr = g_system->getMixer()->getChannelVolume(_handle) * 63 / Audio::Mixer::kMaxChannelVolume;
 	else
-		*lpdwVolume = 0;
+		*volumePtr = 0;
 }
 
 /**
@@ -421,14 +421,14 @@ void FPSfx::soundCheckProcess(CORO_PARAM, const void *param) {
  * @remarks             Do *NOT* declare an object directly, but rather
  *                      create it using FPSound::CreateStream()
  */
-FPStream::FPStream(bool bSoundOn) {
-	_bSoundSupported = bSoundOn;
-	_bFileLoaded = false;
-	_bPaused = false;
-	_bLoop = false;
-	_bDoFadeOut = false;
-	_bSyncExit = false;
-	_dwBufferSize = _dwSize = 0;
+FPStream::FPStream(bool soundOn) {
+	_soundSupported = soundOn;
+	_fileLoaded = false;
+	_paused = false;
+	_loop = false;
+	_doFadeOut = false;
+	_syncExit = false;
+	_bufferSize = _size = 0;
 	_lastVolume = 0;
 	_syncToPlay = NULL;
 	_loopStream = NULL;
@@ -442,13 +442,13 @@ FPStream::FPStream(bool bSoundOn) {
  */
 
 FPStream::~FPStream() {
-	if (!_bSoundSupported)
+	if (!_soundSupported)
 		return;
 
 	if (g_system->getMixer()->isSoundHandleActive(_handle))
 		stop();
 
-	if (_bFileLoaded)
+	if (_fileLoaded)
 		unloadFile();
 
 	_syncToPlay = NULL;
@@ -470,19 +470,19 @@ void FPStream::release() {
  * Opens a file stream
  *
  * @param fileName      Filename to be opened
- * @param dwCodec       CODEC to be used to uncompress samples
+ * @param codec         CODEC to be used to uncompress samples
  *
  * @returns             True is everything is OK, False otherwise
  */
-bool FPStream::loadFile(const Common::String &fileName, uint32 dwCodType, int nBufSize) {
-	if (!_bSoundSupported)
+bool FPStream::loadFile(const Common::String &fileName, uint32 codec, int bufSize) {
+	if (!_soundSupported)
 		return true;
 
-	if (_bFileLoaded)
+	if (_fileLoaded)
 		unloadFile();
 
 	// Save the codec type
-	_dwCodec = dwCodType;
+	_codec = codec;
 
 	// Open the file stream for reading
 	if (!_file.open(fileName)) {
@@ -492,9 +492,9 @@ bool FPStream::loadFile(const Common::String &fileName, uint32 dwCodType, int nB
 	}
 
 	// Save the size of the stream
-	_dwSize = _file.size();
+	_size = _file.size();
 
-	switch (_dwCodec) {
+	switch (_codec) {
 	case FPCODEC_RAW:
 		_rewindableStream = Audio::makeRawStream(&_file, 44100, Audio::FLAG_16BITS | Audio::FLAG_LITTLE_ENDIAN | Audio::FLAG_STEREO, DisposeAfterUse::NO);
 		break;
@@ -509,8 +509,8 @@ bool FPStream::loadFile(const Common::String &fileName, uint32 dwCodType, int nB
 	}
 
 	// All done
-	_bFileLoaded = true;
-	_bPaused = false;
+	_fileLoaded = true;
+	_paused = false;
 
 	setVolume(63);
 
@@ -527,7 +527,7 @@ bool FPStream::loadFile(const Common::String &fileName, uint32 dwCodType, int nB
  *                      memory used by the stream.
  */
 bool FPStream::unloadFile() {
-	if (!_bSoundSupported || !_bFileLoaded)
+	if (!_soundSupported || !_fileLoaded)
 		return true;
 
 	assert(!g_system->getMixer()->isSoundHandleActive(_handle));
@@ -540,7 +540,7 @@ bool FPStream::unloadFile() {
 	_file.close();
 
 	// Flag that the file is no longer in memory
-	_bFileLoaded = false;
+	_fileLoaded = false;
 
 	return true;
 }
@@ -552,7 +552,7 @@ bool FPStream::unloadFile() {
  */
 
 bool FPStream::play() {
-	if (!_bSoundSupported || !_bFileLoaded)
+	if (!_soundSupported || !_fileLoaded)
 		return false;
 
 	stop();
@@ -561,7 +561,7 @@ bool FPStream::play() {
 
 	Audio::AudioStream *stream = _rewindableStream;
 
-	if (_bLoop) {
+	if (_loop) {
 		if (!_loopStream)
 			_loopStream = new Audio::LoopingAudioStream(_rewindableStream, 0, DisposeAfterUse::NO);
 
@@ -571,7 +571,7 @@ bool FPStream::play() {
 	// FIXME: Should this be kMusicSoundType or KPlainSoundType?
 	g_system->getMixer()->playStream(Audio::Mixer::kMusicSoundType, &_handle, stream, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO);
 	setVolume(_lastVolume);
-	_bPaused = false;
+	_paused = false;
 
 	return true;
 }
@@ -584,10 +584,10 @@ bool FPStream::play() {
  */
 
 bool FPStream::stop() {
-	if (!_bSoundSupported)
+	if (!_soundSupported)
 		return true;
 
-	if (!_bFileLoaded)
+	if (!_fileLoaded)
 		return false;
 
 	if (!g_system->getMixer()->isSoundHandleActive(_handle))
@@ -595,49 +595,49 @@ bool FPStream::stop() {
 
 	g_system->getMixer()->stopHandle(_handle);
 
-	_bPaused = false;
+	_paused = false;
 
 	return true;
 }
 
-void FPStream::waitForSync(FPStream *toplay) {
+void FPStream::waitForSync(FPStream *toPlay) {
 	// FIXME: The idea here is that you wait for this stream to reach
 	// a buffer which is a multiple of nBufSize/nSync, and then the
 	// thread stops it and immediately starts the 'toplay' stream.
 
 	stop();
-	toplay->play();
+	toPlay->play();
 }
 
 /**
  * Unables or disables stream loop.
  *
- * @param _bLoop         True enable loop, False disables it
+ * @param loop          True enable loop, False disables it
  *
  * @remarks             The loop must be activated BEFORE the stream starts
  *                      playing. Any changes made during the play will have no
  *                      effect until the stream is stopped then played again.
  */
 void FPStream::setLoop(bool loop) {
-	_bLoop = loop;
+	_loop = loop;
 }
 
 /**
  * Pause sound effect
  *
- * @param bPause        True enables pause, False disables it
+ * @param pause         True enables pause, False disables it
  */
-void FPStream::pause(bool bPause) {
-	if (!_bFileLoaded)
+void FPStream::setPause(bool pause) {
+	if (!_fileLoaded)
 		return;
 
-	if (bPause == _bPaused)
+	if (pause == _paused)
 		return;
 
 	if (g_system->getMixer()->isSoundHandleActive(_handle))
-		g_system->getMixer()->pauseHandle(_handle, bPause);
+		g_system->getMixer()->pauseHandle(_handle, pause);
 
-	_bPaused = bPause;
+	_paused = pause;
 
 	// Trick to reset the volume after a possible new sound configuration
 	setVolume(_lastVolume);
@@ -646,43 +646,43 @@ void FPStream::pause(bool bPause) {
 /**
  * Change the volume of the stream
  *
- * @param dwVolume      Volume to be set (0-63)
+ * @param volume        Volume to be set (0-63)
  *
  */
 
-void FPStream::setVolume(int dwVolume) {
-	if (dwVolume > 63)
-		dwVolume = 63;
+void FPStream::setVolume(int volume) {
+	if (volume > 63)
+		volume = 63;
 
-	if (dwVolume < 0)
-		dwVolume = 0;
+	if (volume < 0)
+		volume = 0;
 
-	_lastVolume = dwVolume;
+	_lastVolume = volume;
 
 	if (!GLOBALS._bCfgMusic)
-		dwVolume = 0;
+		volume = 0;
 	else {
-		dwVolume -= (10 - GLOBALS._nCfgMusicVolume) * 2;
-		if (dwVolume < 0)
-			dwVolume = 0;
+		volume -= (10 - GLOBALS._nCfgMusicVolume) * 2;
+		if (volume < 0)
+			volume = 0;
 	}
 
 	if (g_system->getMixer()->isSoundHandleActive(_handle))
-		g_system->getMixer()->setChannelVolume(_handle, dwVolume * Audio::Mixer::kMaxChannelVolume / 63);
+		g_system->getMixer()->setChannelVolume(_handle, volume * Audio::Mixer::kMaxChannelVolume / 63);
 }
 
 /**
  * Gets the volume of the stream
  *
- * @param lpdwVolume    Variable that will contain the current volume
+ * @param volumePtr     Variable that will contain the current volume
  *
  */
 
-void FPStream::getVolume(int *lpdwVolume) {
+void FPStream::getVolume(int *volumePtr) {
 	if (g_system->getMixer()->isSoundHandleActive(_handle))
-		*lpdwVolume = g_system->getMixer()->getChannelVolume(_handle) * 63 / Audio::Mixer::kMaxChannelVolume;
+		*volumePtr = g_system->getMixer()->getChannelVolume(_handle) * 63 / Audio::Mixer::kMaxChannelVolume;
 	else
-		*lpdwVolume = 0;
+		*volumePtr = 0;
 }
 
 } // End of namespace Tony
diff --git a/engines/tony/sound.h b/engines/tony/sound.h
index c859f781f4..7422de02b3 100644
--- a/engines/tony/sound.h
+++ b/engines/tony/sound.h
@@ -55,7 +55,7 @@ enum SoundCodecs {
 
 class FPSound {
 private:
-	bool _bSoundSupported;
+	bool _soundSupported;
 
 public:
 	/**
@@ -83,49 +83,49 @@ public:
 	/**
 	 * Allocates an object of type FPStream, and return its pointer
 	 *
-	 * @param lplpStream    Will contain a pointer to the object you just created.
+	 * @param streamPtr     Will contain a pointer to the object you just created.
 	 *
 	 * @returns             True is everything is OK, False otherwise
 	 */
 
-	bool createStream(FPStream **lplpStream);
+	bool createStream(FPStream **streamPtr);
 
 	/**
 	 * Allocates an object of type FpSfx, and return its pointer
 	 *
-	 * @param lplpSfx       Will contain a pointer to the object you just created.
+	 * @param sfxPtr        Will contain a pointer to the object you just created.
 	 *
 	 * @returns             True is everything is OK, False otherwise
 	 */
 
-	bool createSfx(FPSfx **lplpSfx);
+	bool createSfx(FPSfx **sfxPtr);
 
 	/**
 	 * Set the general volume
 	 *
-	 * @param dwVolume      Volume to set (0-63)
+	 * @param volume        Volume to set (0-63)
 	 */
 
-	void setMasterVolume(int dwVolume);
+	void setMasterVolume(int volume);
 
 	/**
 	 * Get the general volume
 	 *
-	 * @param lpdwVolume    Variable that will contain the volume (0-63)
+	 * @param volume        Variable that will contain the volume (0-63)
 	 */
 
-	void getMasterVolume(int *lpdwVolume);
+	void getMasterVolume(int *volume);
 };
 
 class FPSfx {
 private:
-	bool _bSoundSupported;                 // True if the sound is active
-	bool _bFileLoaded;                     // True is a file is opened
-	bool _bLoop;                           // True is sound effect should loop
+	bool _soundSupported;                  // True if the sound is active
+	bool _fileLoaded;                      // True is a file is opened
+	bool _loop;                            // True is sound effect should loop
 	int  _lastVolume;
 
-	bool _bIsVoice;
-	bool _bPaused;
+	bool _isVoice;
+	bool _paused;
 
 	Audio::AudioStream *_loopStream;
 	Audio::RewindableAudioStream *_rewindableStream;
@@ -147,7 +147,7 @@ public:
 	 *
 	 */
 
-	FPSfx(bool bSoundOn);
+	FPSfx(bool soundOn);
 
 	/**
 	 * Default Destructor.
@@ -173,13 +173,13 @@ public:
 	/**
 	 * Opens a file and loads a sound effect.
 	 *
-	 * @param lpszFileName  Sfx filename
-	 * @param dwCodec       CODEC used to uncompress the samples
+	 * @param fileName      Sfx filename
+	 * @param codec         CODEC used to uncompress the samples
 	 *
 	 * @returns             True is everything is OK, False otherwise
 	 */
 
-	bool loadFile(const char *lpszFileName, uint32 dwCodec = FPCODEC_RAW);
+	bool loadFile(const char *fileName, uint32 codec = FPCODEC_RAW);
 	bool loadWave(Common::SeekableReadStream *stream);
 	bool loadVoiceFromVDB(Common::File &vdbFP);
 
@@ -204,37 +204,37 @@ public:
 	 *
 	 */
 
-	void pause(bool bPause);
+	void setPause(bool pause);
 
 	/**
 	 * Enables or disables the Sfx loop.
 	 *
-	 * @param bLoop         True to enable the loop, False to disable
+	 * @param loop         True to enable the loop, False to disable
 	 *
 	 * @remarks             The loop must be activated BEFORE the sfx starts
 	 *                      playing. Any changes made during the play will have
 	 *                      no effect until the sfx is stopped then played again.
 	 */
 
-	void setLoop(bool bLoop);
+	void setLoop(bool loop);
 
 	/**
 	 * Change the volume of Sfx
 	 *
-	 * @param dwVolume      Volume to be set (0-63)
+	 * @param volume        Volume to be set (0-63)
 	 *
 	 */
 
-	void setVolume(int dwVolume);
+	void setVolume(int volume);
 
 	/**
 	 * Gets the Sfx volume
 	 *
-	 * @param lpdwVolume    Will contain the current Sfx volume
+	 * @param volumePtr     Will contain the current Sfx volume
 	 *
 	 */
 
-	void getVolume(int *lpdwVolume);
+	void getVolume(int *volumePtr);
 
 	/**
 	 * Returns true if the underlying sound has ended
@@ -244,18 +244,18 @@ public:
 
 class FPStream {
 private:
-	uint32 _dwBufferSize;                  // Buffer size (bytes)
-	uint32 _dwSize;                        // Stream size (bytes)
-	uint32 _dwCodec;                       // CODEC used
-
-	Common::File _file;                    // File handle used for the stream
-
-	bool _bSoundSupported;                 // True if the sound is active
-	bool _bFileLoaded;                     // True if the file is open
-	bool _bLoop;                           // True if the stream should loop
-	bool _bDoFadeOut;                      // True if fade out is required
-	bool _bSyncExit;
-	bool _bPaused;
+	uint32 _bufferSize;                  // Buffer size (bytes)
+	uint32 _size;                        // Stream size (bytes)
+	uint32 _codec;                       // CODEC used
+
+	Common::File _file;                  // File handle used for the stream
+
+	bool _soundSupported;                // True if the sound is active
+	bool _fileLoaded;                    // True if the file is open
+	bool _loop;                          // True if the stream should loop
+	bool _doFadeOut;                     // True if fade out is required
+	bool _syncExit;
+	bool _paused;
 	int  _lastVolume;
 	FPStream *_syncToPlay;
 
@@ -272,7 +272,7 @@ public:
 	 *                      create it using FPSound::CreateStream()
 	 */
 
-	FPStream(bool bSoundOn);
+	FPStream(bool soundOn);
 
 	/**
 	 * Default destructor.
@@ -297,12 +297,12 @@ public:
 	 * Opens a file stream
 	 *
 	 * @param fileName      Filename to be opened
-	 * @param dwCodec       CODEC to be used to uncompress samples
+	 * @param codec         CODEC to be used to uncompress samples
 	 *
 	 * @returns             True is everything is OK, False otherwise
 	 */
 
-	bool loadFile(const Common::String &fileName, uint32 dwCodec = FPCODEC_RAW, int nSync = 2000);
+	bool loadFile(const Common::String &fileName, uint32 codec = FPCODEC_RAW, int sync = 2000);
 
 	/**
 	 * Closes a file stream (opened or not).
@@ -332,44 +332,44 @@ public:
 	 */
 
 	bool stop();
-	void waitForSync(FPStream *toplay);
+	void waitForSync(FPStream *toPlay);
 
 	/**
 	 * Pause sound effect
 	 *
-	 * @param bPause        True enables pause, False disables it
+	 * @param pause         True enables pause, False disables it
 	 */
 
-	void pause(bool bPause);
+	void setPause(bool pause);
 
 	/**
 	 * Unables or disables stream loop.
 	 *
-	 * @param bLoop         True enable loop, False disables it
+	 * @param loop          True enable loop, False disables it
 	 *
 	 * @remarks             The loop must be activated BEFORE the stream starts
 	 *                      playing. Any changes made during the play will have no
 	 *                      effect until the stream is stopped then played again.
 	 */
 
-	void setLoop(bool bLoop);
+	void setLoop(bool loop);
 
 	/**
 	 * Change the volume of the stream
 	 *
-	 * @param dwVolume      Volume to be set (0-63)
+	 * @param volume        Volume to be set (0-63)
 	 */
 
-	void setVolume(int dwVolume);
+	void setVolume(int volume);
 
 	/**
 	 * Gets the volume of the stream
 	 *
-	 * @param lpdwVolume    Variable that will contain the current volume
+	 * @param volumePtr     Variable that will contain the current volume
 	 *
 	 */
 
-	void getVolume(int *lpdwVolume);
+	void getVolume(int *volumePtr);
 };
 
 } // End of namespace Tony
diff --git a/engines/tony/tony.cpp b/engines/tony/tony.cpp
index 4ffb84ced8..6503c09aa8 100644
--- a/engines/tony/tony.cpp
+++ b/engines/tony/tony.cpp
@@ -513,13 +513,13 @@ void TonyEngine::pauseSound(bool bPause) {
 
 	for (uint i = 0; i < 6; i++)
 		if (_stream[i])
-			_stream[i]->pause(bPause);
+			_stream[i]->setPause(bPause);
 
 	for (uint i = 0; i < MAX_SFX_CHANNELS; i++) {
 		if (_sfx[i])
-			_sfx[i]->pause(bPause);
+			_sfx[i]->setPause(bPause);
 		if (_utilSfx[i])
-			_utilSfx[i]->pause(bPause);
+			_utilSfx[i]->setPause(bPause);
 	}
 }
 
diff --git a/engines/tony/utils.cpp b/engines/tony/utils.cpp
index 3cc09a1454..81060146b7 100644
--- a/engines/tony/utils.cpp
+++ b/engines/tony/utils.cpp
@@ -383,7 +383,7 @@ void RMResUpdate::init(const Common::String &fileName) {
 		// It doesn't exist, so exit immediately
 		return;
 
-	uint8 version = _hFile.readByte();
+	_hFile.readByte(); // Version, unused
 
 	_numUpd = _hFile.readUint32LE();
 
diff --git a/engines/wintermute/ad/ad_entity.cpp b/engines/wintermute/ad/ad_entity.cpp
index 234af1fffa..00dbc0f3c2 100644
--- a/engines/wintermute/ad/ad_entity.cpp
+++ b/engines/wintermute/ad/ad_entity.cpp
@@ -28,28 +28,29 @@
 
 
 #include "engines/wintermute/ad/ad_entity.h"
-#include "engines/wintermute/base/base_parser.h"
-#include "engines/wintermute/base/base_dynamic_buffer.h"
-#include "engines/wintermute/base/base_active_rect.h"
-#include "engines/wintermute/base/base_surface_storage.h"
-#include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/ad/ad_game.h"
 #include "engines/wintermute/ad/ad_scene.h"
-#include "engines/wintermute/base/sound/base_sound.h"
 #include "engines/wintermute/ad/ad_waypoint_group.h"
-#include "engines/wintermute/base/font/base_font_storage.h"
-#include "engines/wintermute/base/font/base_font.h"
 #include "engines/wintermute/ad/ad_sentence.h"
+#include "engines/wintermute/base/base_active_rect.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_parser.h"
 #include "engines/wintermute/base/base_region.h"
 #include "engines/wintermute/base/base_sprite.h"
-#include "engines/wintermute/base/base_file_manager.h"
-#include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/utils/utils.h"
+#include "engines/wintermute/base/base_surface_storage.h"
+#include "engines/wintermute/base/font/base_font_storage.h"
+#include "engines/wintermute/base/font/base_font.h"
+#include "engines/wintermute/base/gfx/base_renderer.h"
+#include "engines/wintermute/base/particles/part_emitter.h"
 #include "engines/wintermute/base/scriptables/script_value.h"
 #include "engines/wintermute/base/scriptables/script.h"
 #include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/sound/base_sound.h"
 #include "engines/wintermute/video/video_theora_player.h"
-#include "engines/wintermute/base/particles/part_emitter.h"
+#include "engines/wintermute/utils/utils.h"
+#include "engines/wintermute/platform_osystem.h"
 #include "common/str.h"
 
 namespace Wintermute {
diff --git a/engines/wintermute/ad/ad_game.cpp b/engines/wintermute/ad/ad_game.cpp
index fe8a5991e2..ec6c5dca31 100644
--- a/engines/wintermute/ad/ad_game.cpp
+++ b/engines/wintermute/ad/ad_game.cpp
@@ -50,6 +50,7 @@
 #include "engines/wintermute/base/base_viewport.h"
 #include "engines/wintermute/base/particles/part_emitter.h"
 #include "engines/wintermute/base/saveload.h"
+#include "engines/wintermute/base/gfx/base_renderer.h"
 #include "engines/wintermute/base/scriptables/script_engine.h"
 #include "engines/wintermute/base/scriptables/script.h"
 #include "engines/wintermute/base/scriptables/script_stack.h"
diff --git a/engines/wintermute/ad/ad_inventory_box.cpp b/engines/wintermute/ad/ad_inventory_box.cpp
index 16b8e01ff3..7ae8ff8d69 100644
--- a/engines/wintermute/ad/ad_inventory_box.cpp
+++ b/engines/wintermute/ad/ad_inventory_box.cpp
@@ -35,6 +35,7 @@
 #include "engines/wintermute/base/base_file_manager.h"
 #include "engines/wintermute/base/base_viewport.h"
 #include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/gfx/base_renderer.h"
 #include "engines/wintermute/ui/ui_button.h"
 #include "engines/wintermute/ui/ui_window.h"
 #include "engines/wintermute/platform_osystem.h"
diff --git a/engines/wintermute/ad/ad_item.cpp b/engines/wintermute/ad/ad_item.cpp
index afd813933b..bad7223788 100644
--- a/engines/wintermute/ad/ad_item.cpp
+++ b/engines/wintermute/ad/ad_item.cpp
@@ -36,11 +36,11 @@
 #include "engines/wintermute/base/base_parser.h"
 #include "engines/wintermute/base/sound/base_sound.h"
 #include "engines/wintermute/base/base_sprite.h"
-#include "engines/wintermute/utils/utils.h"
-#include "engines/wintermute/platform_osystem.h"
 #include "engines/wintermute/base/scriptables/script.h"
 #include "engines/wintermute/base/scriptables/script_stack.h"
 #include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/utils/utils.h"
+#include "engines/wintermute/platform_osystem.h"
 #include "common/str.h"
 
 namespace Wintermute {
diff --git a/engines/wintermute/ad/ad_layer.cpp b/engines/wintermute/ad/ad_layer.cpp
index 46b75b8b21..bc64b21208 100644
--- a/engines/wintermute/ad/ad_layer.cpp
+++ b/engines/wintermute/ad/ad_layer.cpp
@@ -29,12 +29,12 @@
 #include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/ad/ad_layer.h"
 #include "engines/wintermute/ad/ad_scene_node.h"
-#include "engines/wintermute/base/base_parser.h"
 #include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/base_parser.h"
 #include "engines/wintermute/base/scriptables/script_value.h"
 #include "engines/wintermute/base/scriptables/script.h"
 #include "engines/wintermute/base/scriptables/script_stack.h"
-#include "engines/wintermute/base/base_file_manager.h"
 #include "engines/wintermute/platform_osystem.h"
 #include "common/str.h"
 
diff --git a/engines/wintermute/ad/ad_object.cpp b/engines/wintermute/ad/ad_object.cpp
index 6c77917979..013ce498e0 100644
--- a/engines/wintermute/ad/ad_object.cpp
+++ b/engines/wintermute/ad/ad_object.cpp
@@ -37,18 +37,19 @@
 #include "engines/wintermute/ad/ad_waypoint_group.h"
 #include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/base/base_frame.h"
-#include "engines/wintermute/base/sound/base_sound.h"
-#include "engines/wintermute/base/base_surface_storage.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/base/base_string_table.h"
 #include "engines/wintermute/base/base_sub_frame.h"
+#include "engines/wintermute/base/base_surface_storage.h"
 #include "engines/wintermute/base/font/base_font.h"
 #include "engines/wintermute/base/font/base_font_storage.h"
-#include "engines/wintermute/base/base_sprite.h"
-#include "engines/wintermute/base/base_string_table.h"
+#include "engines/wintermute/base/gfx/base_renderer.h"
+#include "engines/wintermute/base/particles/part_emitter.h"
 #include "engines/wintermute/base/scriptables/script_engine.h"
 #include "engines/wintermute/base/scriptables/script.h"
 #include "engines/wintermute/base/scriptables/script_stack.h"
 #include "engines/wintermute/base/scriptables/script_value.h"
-#include "engines/wintermute/base/particles/part_emitter.h"
+#include "engines/wintermute/base/sound/base_sound.h"
 #include "common/str.h"
 #include "common/util.h"
 
diff --git a/engines/wintermute/ad/ad_region.cpp b/engines/wintermute/ad/ad_region.cpp
index 88bd8201a2..2b90b479bf 100644
--- a/engines/wintermute/ad/ad_region.cpp
+++ b/engines/wintermute/ad/ad_region.cpp
@@ -27,12 +27,12 @@
  */
 
 #include "engines/wintermute/ad/ad_region.h"
-#include "engines/wintermute/base/base_parser.h"
 #include "engines/wintermute/base/base_dynamic_buffer.h"
-#include "engines/wintermute/base/scriptables/script_value.h"
-#include "engines/wintermute/base/scriptables/script.h"
 #include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script.h"
 
 namespace Wintermute {
 
diff --git a/engines/wintermute/ad/ad_response.cpp b/engines/wintermute/ad/ad_response.cpp
index 37f46118bf..a2225f2632 100644
--- a/engines/wintermute/ad/ad_response.cpp
+++ b/engines/wintermute/ad/ad_response.cpp
@@ -28,8 +28,8 @@
 
 #include "engines/wintermute/ad/ad_response.h"
 #include "engines/wintermute/base/base_game.h"
-#include "engines/wintermute/base/font/base_font_storage.h"
 #include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/base/font/base_font_storage.h"
 #include "engines/wintermute/utils/utils.h"
 
 namespace Wintermute {
diff --git a/engines/wintermute/ad/ad_response_box.cpp b/engines/wintermute/ad/ad_response_box.cpp
index a27f1ca54b..fb31aa0bb8 100644
--- a/engines/wintermute/ad/ad_response_box.cpp
+++ b/engines/wintermute/ad/ad_response_box.cpp
@@ -27,19 +27,20 @@
  */
 
 #include "engines/wintermute/ad/ad_game.h"
+#include "engines/wintermute/ad/ad_response.h"
 #include "engines/wintermute/ad/ad_response_box.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/base_file_manager.h"
 #include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_sprite.h"
 #include "engines/wintermute/base/base_surface_storage.h"
-#include "engines/wintermute/ui/ui_button.h"
-#include "engines/wintermute/ui/ui_window.h"
-#include "engines/wintermute/base/base_dynamic_buffer.h"
 #include "engines/wintermute/base/font/base_font_storage.h"
 #include "engines/wintermute/base/font/base_font.h"
-#include "engines/wintermute/ad/ad_response.h"
+#include "engines/wintermute/base/gfx/base_renderer.h"
 #include "engines/wintermute/base/scriptables/script.h"
 #include "engines/wintermute/base/scriptables/script_stack.h"
-#include "engines/wintermute/base/base_sprite.h"
-#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/ui/ui_button.h"
+#include "engines/wintermute/ui/ui_window.h"
 #include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/platform_osystem.h"
 #include "engines/wintermute/wintermute.h"
diff --git a/engines/wintermute/ad/ad_rot_level.cpp b/engines/wintermute/ad/ad_rot_level.cpp
index ca7ed693ad..fb9a4a47b9 100644
--- a/engines/wintermute/ad/ad_rot_level.cpp
+++ b/engines/wintermute/ad/ad_rot_level.cpp
@@ -27,11 +27,11 @@
  */
 
 #include "engines/wintermute/ad/ad_rot_level.h"
-#include "engines/wintermute/base/base_parser.h"
 #include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/base_file_manager.h"
 #include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_parser.h"
 #include "engines/wintermute/base/base_sprite.h"
-#include "engines/wintermute/base/base_file_manager.h"
 
 namespace Wintermute {
 
diff --git a/engines/wintermute/ad/ad_scale_level.cpp b/engines/wintermute/ad/ad_scale_level.cpp
index 8b68cc5d32..4e9293d875 100644
--- a/engines/wintermute/ad/ad_scale_level.cpp
+++ b/engines/wintermute/ad/ad_scale_level.cpp
@@ -28,9 +28,9 @@
 
 #include "engines/wintermute/ad/ad_scale_level.h"
 #include "engines/wintermute/base/base_parser.h"
-#include "engines/wintermute/base/base_dynamic_buffer.h"
-#include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
 
 namespace Wintermute {
 
diff --git a/engines/wintermute/ad/ad_scene.cpp b/engines/wintermute/ad/ad_scene.cpp
index e47acc63c9..8c4bff02ac 100644
--- a/engines/wintermute/ad/ad_scene.cpp
+++ b/engines/wintermute/ad/ad_scene.cpp
@@ -52,6 +52,7 @@
 #include "engines/wintermute/base/base_scriptable.h"
 #include "engines/wintermute/base/base_sprite.h"
 #include "engines/wintermute/base/base_viewport.h"
+#include "engines/wintermute/base/gfx/base_renderer.h"
 #include "engines/wintermute/base/scriptables/script_stack.h"
 #include "engines/wintermute/base/scriptables/script_value.h"
 #include "engines/wintermute/base/scriptables/script.h"
diff --git a/engines/wintermute/ad/ad_scene_state.cpp b/engines/wintermute/ad/ad_scene_state.cpp
index c09e6a259c..6b34f1af53 100644
--- a/engines/wintermute/ad/ad_scene_state.cpp
+++ b/engines/wintermute/ad/ad_scene_state.cpp
@@ -26,9 +26,9 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/persistent.h"
 #include "engines/wintermute/ad/ad_scene_state.h"
 #include "engines/wintermute/ad/ad_node_state.h"
+#include "engines/wintermute/persistent.h"
 #include "engines/wintermute/platform_osystem.h"
 #include "common/str.h"
 
diff --git a/engines/wintermute/ad/ad_sentence.cpp b/engines/wintermute/ad/ad_sentence.cpp
index 1f09d3ae0f..cfe4191b07 100644
--- a/engines/wintermute/ad/ad_sentence.cpp
+++ b/engines/wintermute/ad/ad_sentence.cpp
@@ -26,17 +26,18 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
+#include "engines/wintermute/ad/ad_game.h"
+#include "engines/wintermute/ad/ad_scene.h"
 #include "engines/wintermute/ad/ad_sentence.h"
 #include "engines/wintermute/ad/ad_talk_def.h"
 #include "engines/wintermute/ad/ad_talk_node.h"
-#include "engines/wintermute/ad/ad_game.h"
 #include "engines/wintermute/utils/path_util.h"
 #include "engines/wintermute/base/base_game.h"
-#include "engines/wintermute/base/sound/base_sound.h"
-#include "engines/wintermute/ad/ad_scene.h"
-#include "engines/wintermute/base/font/base_font.h"
 #include "engines/wintermute/base/base_sprite.h"
 #include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/font/base_font.h"
+#include "engines/wintermute/base/gfx/base_renderer.h"
+#include "engines/wintermute/base/sound/base_sound.h"
 
 namespace Wintermute {
 
diff --git a/engines/wintermute/ad/ad_sprite_set.cpp b/engines/wintermute/ad/ad_sprite_set.cpp
index c8cdec03c3..345b483a8f 100644
--- a/engines/wintermute/ad/ad_sprite_set.cpp
+++ b/engines/wintermute/ad/ad_sprite_set.cpp
@@ -27,10 +27,10 @@
  */
 
 #include "engines/wintermute/ad/ad_sprite_set.h"
-#include "engines/wintermute/base/base_parser.h"
 #include "engines/wintermute/base/base_dynamic_buffer.h"
 #include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/base_parser.h"
 #include "engines/wintermute/base/base_sprite.h"
 
 namespace Wintermute {
diff --git a/engines/wintermute/ad/ad_talk_def.cpp b/engines/wintermute/ad/ad_talk_def.cpp
index 8cb489509b..a85cd7f986 100644
--- a/engines/wintermute/ad/ad_talk_def.cpp
+++ b/engines/wintermute/ad/ad_talk_def.cpp
@@ -26,13 +26,13 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
+#include "engines/wintermute/ad/ad_sprite_set.h"
 #include "engines/wintermute/ad/ad_talk_def.h"
 #include "engines/wintermute/ad/ad_talk_node.h"
 #include "engines/wintermute/base/base_parser.h"
 #include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/base/base_dynamic_buffer.h"
 #include "engines/wintermute/base/base_sprite.h"
-#include "engines/wintermute/ad/ad_sprite_set.h"
 #include "engines/wintermute/base/base_file_manager.h"
 #include "engines/wintermute/utils/utils.h"
 
diff --git a/engines/wintermute/ad/ad_talk_holder.cpp b/engines/wintermute/ad/ad_talk_holder.cpp
index 1e4ec26459..1422d8683c 100644
--- a/engines/wintermute/ad/ad_talk_holder.cpp
+++ b/engines/wintermute/ad/ad_talk_holder.cpp
@@ -28,13 +28,13 @@
 
 #include "engines/wintermute/ad/ad_talk_holder.h"
 #include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/base_engine.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_sprite.h"
 #include "engines/wintermute/base/scriptables/script_value.h"
 #include "engines/wintermute/base/scriptables/script.h"
 #include "engines/wintermute/base/scriptables/script_stack.h"
-#include "engines/wintermute/base/base_game.h"
-#include "engines/wintermute/base/base_sprite.h"
 #include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/base_engine.h"
 #include "common/str.h"
 
 namespace Wintermute {
diff --git a/engines/wintermute/ad/ad_talk_node.cpp b/engines/wintermute/ad/ad_talk_node.cpp
index b43a2b288e..b1bcf685f2 100644
--- a/engines/wintermute/ad/ad_talk_node.cpp
+++ b/engines/wintermute/ad/ad_talk_node.cpp
@@ -26,12 +26,12 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
+#include "engines/wintermute/ad/ad_sprite_set.h"
 #include "engines/wintermute/ad/ad_talk_node.h"
 #include "engines/wintermute/base/base_parser.h"
 #include "engines/wintermute/base/base_dynamic_buffer.h"
 #include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/base/base_sprite.h"
-#include "engines/wintermute/ad/ad_sprite_set.h"
 #include "engines/wintermute/utils/utils.h"
 namespace Wintermute {
 
diff --git a/engines/wintermute/ad/ad_waypoint_group.cpp b/engines/wintermute/ad/ad_waypoint_group.cpp
index 984ed75aeb..f80fa7e45d 100644
--- a/engines/wintermute/ad/ad_waypoint_group.cpp
+++ b/engines/wintermute/ad/ad_waypoint_group.cpp
@@ -27,12 +27,12 @@
  */
 
 #include "engines/wintermute/ad/ad_waypoint_group.h"
-#include "engines/wintermute/base/base_parser.h"
 #include "engines/wintermute/base/base_dynamic_buffer.h"
-#include "engines/wintermute/base/scriptables/script_value.h"
 #include "engines/wintermute/base/base_game.h"
-#include "engines/wintermute/base/base_region.h"
 #include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_region.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
 #include <limits.h>
 
 namespace Wintermute {
diff --git a/engines/wintermute/base/base_active_rect.cpp b/engines/wintermute/base/base_active_rect.cpp
index d754cf0114..4addf15be8 100644
--- a/engines/wintermute/base/base_active_rect.cpp
+++ b/engines/wintermute/base/base_active_rect.cpp
@@ -29,6 +29,7 @@
 #include "engines/wintermute/base/base_active_rect.h"
 #include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/base/base_region.h"
+#include "engines/wintermute/base/gfx/base_renderer.h"
 #include "engines/wintermute/platform_osystem.h"
 
 namespace Wintermute {
diff --git a/engines/wintermute/base/base_fader.cpp b/engines/wintermute/base/base_fader.cpp
index 08e6f689ba..985718fcab 100644
--- a/engines/wintermute/base/base_fader.cpp
+++ b/engines/wintermute/base/base_fader.cpp
@@ -28,6 +28,7 @@
 
 #include "engines/wintermute/base/base_fader.h"
 #include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/gfx/base_renderer.h"
 #include "common/util.h"
 
 namespace Wintermute {
diff --git a/engines/wintermute/base/base_game.h b/engines/wintermute/base/base_game.h
index 93cbc4536b..8c337e82e9 100644
--- a/engines/wintermute/base/base_game.h
+++ b/engines/wintermute/base/base_game.h
@@ -29,7 +29,6 @@
 #ifndef WINTERMUTE_BASE_GAME_H
 #define WINTERMUTE_BASE_GAME_H
 
-#include "engines/wintermute/base/gfx/base_renderer.h"
 #include "engines/wintermute/base/base_object.h"
 #include "engines/wintermute/persistent.h"
 #include "engines/wintermute/coll_templ.h"
diff --git a/engines/wintermute/base/base_save_thumb_helper.cpp b/engines/wintermute/base/base_save_thumb_helper.cpp
index 186e1234a8..b4205c21c4 100644
--- a/engines/wintermute/base/base_save_thumb_helper.cpp
+++ b/engines/wintermute/base/base_save_thumb_helper.cpp
@@ -28,6 +28,7 @@
 
 #include "engines/wintermute/base/base_save_thumb_helper.h"
 #include "engines/wintermute/base/gfx/base_image.h"
+#include "engines/wintermute/base/gfx/base_renderer.h"
 #include "engines/wintermute/base/base_game.h"
 
 namespace Wintermute {
diff --git a/engines/wintermute/base/base_sub_frame.cpp b/engines/wintermute/base/base_sub_frame.cpp
index 6a9246efd4..2ff12e8deb 100644
--- a/engines/wintermute/base/base_sub_frame.cpp
+++ b/engines/wintermute/base/base_sub_frame.cpp
@@ -34,6 +34,7 @@
 #include "engines/wintermute/base/base_surface_storage.h"
 #include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/platform_osystem.h"
+#include "engines/wintermute/base/gfx/base_renderer.h"
 #include "engines/wintermute/base/scriptables/script_value.h"
 #include "engines/wintermute/base/scriptables/script_stack.h"
 
diff --git a/engines/wintermute/base/base_surface_storage.cpp b/engines/wintermute/base/base_surface_storage.cpp
index 1dcebb0595..4e795ca813 100644
--- a/engines/wintermute/base/base_surface_storage.cpp
+++ b/engines/wintermute/base/base_surface_storage.cpp
@@ -28,6 +28,7 @@
 
 #include "engines/wintermute/base/base_surface_storage.h"
 #include "engines/wintermute/base/gfx/base_surface.h"
+#include "engines/wintermute/base/gfx/base_renderer.h"
 #include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/base/base_file_manager.h"
 #include "engines/wintermute/platform_osystem.h"
diff --git a/engines/wintermute/base/base_transition_manager.cpp b/engines/wintermute/base/base_transition_manager.cpp
index 5c28f36d30..7785f3d5af 100644
--- a/engines/wintermute/base/base_transition_manager.cpp
+++ b/engines/wintermute/base/base_transition_manager.cpp
@@ -28,6 +28,7 @@
 
 #include "engines/wintermute/base/base_transition_manager.h"
 #include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/gfx/base_renderer.h"
 
 namespace Wintermute {
 
diff --git a/engines/wintermute/base/base_viewport.cpp b/engines/wintermute/base/base_viewport.cpp
index 3b003e1c49..7ec995449f 100644
--- a/engines/wintermute/base/base_viewport.cpp
+++ b/engines/wintermute/base/base_viewport.cpp
@@ -29,6 +29,7 @@
 #include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/platform_osystem.h"
 #include "engines/wintermute/base/base_viewport.h"
+#include "engines/wintermute/base/gfx/base_renderer.h"
 
 namespace Wintermute {
 
diff --git a/engines/wintermute/base/file/base_save_thumb_file.cpp b/engines/wintermute/base/file/base_save_thumb_file.cpp
index 5bdab0853e..94d3e5a94e 100644
--- a/engines/wintermute/base/file/base_save_thumb_file.cpp
+++ b/engines/wintermute/base/file/base_save_thumb_file.cpp
@@ -28,7 +28,6 @@
 
 #include "engines/wintermute/base/base_persistence_manager.h"
 #include "engines/wintermute/base/file/base_save_thumb_file.h"
-#include "engines/wintermute/platform_osystem.h"
 
 namespace Wintermute {
 
diff --git a/engines/wintermute/base/font/base_font_bitmap.cpp b/engines/wintermute/base/font/base_font_bitmap.cpp
index fced08c7e2..55f46c476b 100644
--- a/engines/wintermute/base/font/base_font_bitmap.cpp
+++ b/engines/wintermute/base/font/base_font_bitmap.cpp
@@ -31,6 +31,7 @@
 #include "engines/wintermute/base/base_parser.h"
 #include "engines/wintermute/base/base_frame.h"
 #include "engines/wintermute/base/gfx/base_surface.h"
+#include "engines/wintermute/base/gfx/base_renderer.h"
 #include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/base/base_sub_frame.h"
 #include "engines/wintermute/base/base_frame.h"
diff --git a/engines/wintermute/base/font/base_font_storage.cpp b/engines/wintermute/base/font/base_font_storage.cpp
index d26fa1d593..8128ffe897 100644
--- a/engines/wintermute/base/font/base_font_storage.cpp
+++ b/engines/wintermute/base/font/base_font_storage.cpp
@@ -29,7 +29,6 @@
 #include "engines/wintermute/base/font/base_font_storage.h"
 #include "engines/wintermute/base/font/base_font.h"
 #include "engines/wintermute/base/base_game.h"
-#include "engines/wintermute/platform_osystem.h"
 #include "common/str.h"
 
 namespace Wintermute {
diff --git a/engines/wintermute/base/font/base_font_truetype.cpp b/engines/wintermute/base/font/base_font_truetype.cpp
index 599010bbd5..3219918e6d 100644
--- a/engines/wintermute/base/font/base_font_truetype.cpp
+++ b/engines/wintermute/base/font/base_font_truetype.cpp
@@ -26,11 +26,8 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/base/file/base_file.h"
 #include "engines/wintermute/base/font/base_font_truetype.h"
-#include "engines/wintermute/utils/path_util.h"
 #include "engines/wintermute/utils/string_util.h"
-#include "engines/wintermute/math/math_util.h"
 #include "engines/wintermute/base/gfx/base_renderer.h"
 #include "engines/wintermute/base/gfx/base_surface.h"
 #include "engines/wintermute/base/base_parser.h"
diff --git a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
index d5464782a3..bee876bb65 100644
--- a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
+++ b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/base/file/base_file.h"
 #include "engines/wintermute/base/base_file_manager.h"
 #include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/base/gfx/osystem/base_surface_osystem.h"
diff --git a/engines/wintermute/base/particles/part_emitter.cpp b/engines/wintermute/base/particles/part_emitter.cpp
index 3655b89131..4e3fc2239e 100644
--- a/engines/wintermute/base/particles/part_emitter.cpp
+++ b/engines/wintermute/base/particles/part_emitter.cpp
@@ -35,6 +35,7 @@
 #include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/base/base_region.h"
 #include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/gfx/base_renderer.h"
 #include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/platform_osystem.h"
 #include "common/str.h"
diff --git a/engines/wintermute/base/saveload.cpp b/engines/wintermute/base/saveload.cpp
index 06e9fd2565..0ca68c743f 100644
--- a/engines/wintermute/base/saveload.cpp
+++ b/engines/wintermute/base/saveload.cpp
@@ -35,6 +35,7 @@
 #include "engines/wintermute/base/base_region.h"
 #include "engines/wintermute/base/base_sub_frame.h"
 #include "engines/wintermute/base/font/base_font.h"
+#include "engines/wintermute/base/gfx/base_renderer.h"
 #include "engines/wintermute/base/sound/base_sound.h"
 #include "engines/wintermute/base/scriptables/script.h"
 #include "common/savefile.h"
diff --git a/engines/wintermute/base/scriptables/script_engine.cpp b/engines/wintermute/base/scriptables/script_engine.cpp
index 20e2ccadd1..3d1863946e 100644
--- a/engines/wintermute/base/scriptables/script_engine.cpp
+++ b/engines/wintermute/base/scriptables/script_engine.cpp
@@ -33,7 +33,6 @@
 #include "engines/wintermute/base/scriptables/script_ext_math.h"
 #include "engines/wintermute/base/base_engine.h"
 #include "engines/wintermute/base/base_game.h"
-#include "engines/wintermute/base/sound/base_sound.h"
 #include "engines/wintermute/base/base_file_manager.h"
 #include "engines/wintermute/utils/utils.h"
 
diff --git a/engines/wintermute/base/scriptables/script_ext_file.cpp b/engines/wintermute/base/scriptables/script_ext_file.cpp
index ab574d464b..2dc385b015 100644
--- a/engines/wintermute/base/scriptables/script_ext_file.cpp
+++ b/engines/wintermute/base/scriptables/script_ext_file.cpp
@@ -33,7 +33,6 @@
 #include "engines/wintermute/base/scriptables/script.h"
 #include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/base/base_game.h"
-#include "engines/wintermute/base/file/base_file.h"
 #include "engines/wintermute/base/base_file_manager.h"
 #include "engines/wintermute/platform_osystem.h"
 #include "engines/wintermute/base/scriptables/script_ext_file.h"
diff --git a/engines/wintermute/base/sound/base_sound_buffer.cpp b/engines/wintermute/base/sound/base_sound_buffer.cpp
index 3fd6c4d5f2..250570f2b8 100644
--- a/engines/wintermute/base/sound/base_sound_buffer.cpp
+++ b/engines/wintermute/base/sound/base_sound_buffer.cpp
@@ -26,12 +26,10 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/base/file/base_file.h"
 #include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/base/sound/base_sound_manager.h"
 #include "engines/wintermute/base/sound/base_sound_buffer.h"
 #include "engines/wintermute/base/base_file_manager.h"
-#include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/wintermute.h"
 #include "audio/audiostream.h"
 #include "audio/mixer.h"
diff --git a/engines/wintermute/base/sound/base_sound_manager.cpp b/engines/wintermute/base/sound/base_sound_manager.cpp
index f7788cd255..441793144d 100644
--- a/engines/wintermute/base/sound/base_sound_manager.cpp
+++ b/engines/wintermute/base/sound/base_sound_manager.cpp
@@ -32,6 +32,7 @@
 #include "engines/wintermute/utils/string_util.h"
 #include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/gfx/base_renderer.h"
 #include "engines/wintermute/base/sound/base_sound_buffer.h"
 #include "engines/wintermute/wintermute.h"
 #include "common/config-manager.h"
diff --git a/engines/wintermute/readme.txt b/engines/wintermute/readme.txt
deleted file mode 100644
index 57592dac2a..0000000000
--- a/engines/wintermute/readme.txt
+++ /dev/null
@@ -1,155 +0,0 @@
-Wintermute Engine - Copyright (c) 2011 Jan Nedoma
-ScummVM port by Einar Johan Trøan Sømåen (somaen)
-
-***************************
-*** General information ***
-***************************
-The Wintermute Engine is a game engine mainly aimed at creating adventure
-games, it supports both 3D, 2.5D, 2D and First-Person games, and has numerous
-games both free, open-source and commercial created with it. This port was
-created by somaen as part of Google Summer of Code 2012.
-
-****************
-*** Features ***
-****************
-This port of the Wintermute Engine (WME) is based on WME Lite, which lacks the following functionality
-originally found in WME: (from http://res.dead-code.org/doku.php/wmelite:start)
-
-The following features of WME 1.x are NOT supported by WME Lite:
-* 3D characters. WME Lite only supports 2D games.
-* Sprite frame mirroring.
-* Sprite rotations.
-* Sprite blending modes.
-* Video playback.
-* Plugins.
-* Calling external functions from DLL libraries from scripts.
-* Game Explorer support.
-* 'Directory' script object.
-
-This port does reimplement a few of these features, currently:
-* Sprite frame mirroring - WORKS.
-* Video playback - Theora PARTIALLY WORKING. (Slow, and doesn't support seeking)
-
-In addition, this port removes a few additional features that were never/rarely used:
-* 'File' script object - ScummVM doesn't have any easy way to write/read arbitrary files.
-* Debugger/Compiler - weren't properly accessible in WME Lite anyhow.
-* CD-numbering support in .dcp-files - was never used.
-* 'SaveDirectory'-property of 'Game' will not return anything usefull to the game-scripts (saving is handled through SaveFileMan)
-
-*******************************
-*** Additional limitations: ***
-*******************************
-* Only .OGG and RAW-.WAV sounds are supported at this point
-* TTF-fonts might behave a bit differently, owing to both the change to FreeType in WME Lite
-    and the change in dpi in this port of WME.
-* The window-caption-setting in-game will be ignored, for the sake of concistency with ScummVM.
-* Most VKey-combinations might still be missing (as they already were in WME Lite)
-* Since we don't use FreeImage, some games might use odd files that weren't expected when the 
-    image-decoders in ScummVM were written. One example here is interlaced-PNGs.
-* UTF8-support is not ported, which means only games with western charsets will work for now.
-* Games that select language by moving .dcp-files around still need a bit more handling on detection/load
-    adding support for those languages on a language-by-language basis.
-* Most games assume the availability of the Windows-fonts (particularly arial.ttf)
-    at this point no fallback has been put in place for using FreeFonts as replacements,
-	simply for lack of having them easily accessible to the engines at this point. So, at least
-	arial.ttf should be put in either the game-folder or made available through the extras-folder
-	for now, otherwise kGUIBigFont will be used as a replacement.
-	
-
-*********************************
-*** Advanced engine-features: ***
-*********************************
-At this point the engine implements the following "advanced engine features":
-* RTL ("Return to Launcher") support
-* Global options dialog support
-* Listing savestates via command line or Launcher
-* Loading savestates via command line or Launcher
-* Deleting savestates via the Launcher and GMM
-* Savestate metadata support
-* Loading/Saving during run time
-
-and NOT the following:
-* Enhanced debug/error messages
-
-*****************
-*** Detection ***
-*****************
-Since Wintermute has authoring tools available, there will at any point in
-time be atleast a few games that are works-in-progress, and as the authors
-of these games might want to test their games in ScummVM, the engine has
-to be able to detect arbitrary Wintermute-games, to this end the detector
-code in this engine will check any folder containing "data.dcp", and try to
-read "startup.settings" and "default.game" (or optionally any other .game-file
-defined in startup.settings), the Name/Caption fields in the .game-file will
-be used as gameid/title (prefixing the gameid with "wmefan-" to avoid confusion
-with any other WME game that might happen to have taken that id.
-
-All COMPLETED games should have their md5s and gameid's properly added, IFF
-they don't require 3D. 
-
-3D games may also be added, for the purpose of giving the user feedback
-as to why their game won't run, but at this point, any such MD5 should
-be added as a comment only, to avoid confusion, as no mechanism for giving
-the user feedback about 3D-games not being supported is currently added.
-
-*************************************
-*** Games targeted by the engine: ***
-*************************************
-This engine potentially targets a very large amount of games:
-http://res.dead-code.org/doku.php/games:start
-
-Since the feature-set of WME Lite differs from that of the full Wintermute Engine,
-games will need to be targeted on a case-by-case, feature-by-feature basis, this is
-a list of the games that are currently known to work (although perhaps with minor
-issues) through to completion:
-
-* Dirty Split (dirtysplit)
-* the white chamber (twc)
-* Chivalry is NOT dead (chivalry)
-* Rosemary (rosemary)
-* The Box (thebox)
-* J.U.L.I.A. (Demo) (julia)
-* Pigeons in the park (pigeons)
-
-Untested, but starts:
-* East Side Story (Demo) (eastside)
-* Actual Destination (actualdest)
-* Ghost in the sheet (ghostsheet)
-
-********************************
-*** Games with known issues: ***
-********************************
-Certain games will work mostly fine with this engine, but can still
-be impossible to complete for various reasons, this is a list of games
-that technically qualify (as in they do not require the 3D-parts of the engine)
-but have issues that make them problematic or not completable:
-
-Won't start:
-* Five Lethal Demons (5ld) - Requires support for interlaced PNGs
-* Five Magical Amulets (5ma) - Requires support for interlaced PNGs
-* Kulivoeko - Requires support for interlaced PNGs
-* Reversion (reversion) - Requires support for Non-V1.1 JPEGs and interlaced PNGs
-* Mirage (mirage) - Tries to seek in a vorbis-stream inside a ZipStream
-* Hamlet or the last game without MMORPS features, shaders and product placement (hamlet)
-    - Requires support for interlaced PNGs
-
-Gameplay broken:
-* J.U.L.I.A. (Full game) (julia) - Requires sprite-rotation for a puzzle.
-
-Non-critical:
-* Ghost in the sheet (ghostsheet) - uses Non-V1.1-JPEGs
-* East Side Story (eastside) - wants "framd.ttf"
-
-*****************************
-*** General known issues: ***
-*****************************
-
-Mostly a TODO-section, to not forget fixing outstanding general issues:
-* Save/Load-screens are not shown during save/load
-    this is probably a result of reducing the amount of redrawing done
-	during save/load, and I'm not sure it should be put back, if that means
-	making saves slower again.
-* Font-sizes are wrong enough to allow Dirty Split to draw text that is hidden in
-    the original game (most visible on the coin-interface)
-* Alpha-masks for Theora-videos are broken on big-endian platforms
-
diff --git a/engines/wintermute/system/sys_class_registry.cpp b/engines/wintermute/system/sys_class_registry.cpp
index 5e3b968c5c..7c1911c2bf 100644
--- a/engines/wintermute/system/sys_class_registry.cpp
+++ b/engines/wintermute/system/sys_class_registry.cpp
@@ -29,6 +29,7 @@
 #include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/platform_osystem.h"
 #include "engines/wintermute/base/base_engine.h"
+#include "engines/wintermute/base/gfx/base_renderer.h"
 #include "engines/wintermute/system/sys_instance.h"
 #include "engines/wintermute/system/sys_class_registry.h"
 #include "engines/wintermute/system/sys_class.h"
diff --git a/engines/wintermute/ui/ui_button.cpp b/engines/wintermute/ui/ui_button.cpp
index f2ac5b2fdd..d4acd3019f 100644
--- a/engines/wintermute/ui/ui_button.cpp
+++ b/engines/wintermute/ui/ui_button.cpp
@@ -37,6 +37,7 @@
 #include "engines/wintermute/base/base_string_table.h"
 #include "engines/wintermute/base/base_sprite.h"
 #include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/gfx/base_renderer.h"
 #include "engines/wintermute/base/scriptables/script_value.h"
 #include "engines/wintermute/base/scriptables/script.h"
 #include "engines/wintermute/base/scriptables/script_stack.h"
diff --git a/engines/wintermute/ui/ui_edit.cpp b/engines/wintermute/ui/ui_edit.cpp
index 94d11255ce..1352a0d942 100644
--- a/engines/wintermute/ui/ui_edit.cpp
+++ b/engines/wintermute/ui/ui_edit.cpp
@@ -40,6 +40,7 @@
 #include "engines/wintermute/base/base_sprite.h"
 #include "engines/wintermute/base/base_string_table.h"
 #include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/gfx/base_renderer.h"
 #include "engines/wintermute/base/scriptables/script_value.h"
 #include "engines/wintermute/base/scriptables/script_stack.h"
 #include "engines/wintermute/base/scriptables/script.h"
diff --git a/engines/wintermute/ui/ui_object.cpp b/engines/wintermute/ui/ui_object.cpp
index 85e381c55b..772561247d 100644
--- a/engines/wintermute/ui/ui_object.cpp
+++ b/engines/wintermute/ui/ui_object.cpp
@@ -32,6 +32,7 @@
 #include "engines/wintermute/ui/ui_tiled_image.h"
 #include "engines/wintermute/ui/ui_window.h"
 #include "engines/wintermute/platform_osystem.h"
+#include "engines/wintermute/base/gfx/base_renderer.h"
 #include "engines/wintermute/base/scriptables/script_value.h"
 #include "engines/wintermute/base/scriptables/script_stack.h"
 #include "engines/wintermute/base/font/base_font_storage.h"
diff --git a/engines/wintermute/ui/ui_tiled_image.cpp b/engines/wintermute/ui/ui_tiled_image.cpp
index cec23cf67e..472f4a884e 100644
--- a/engines/wintermute/ui/ui_tiled_image.cpp
+++ b/engines/wintermute/ui/ui_tiled_image.cpp
@@ -33,6 +33,7 @@
 #include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/base/base_sub_frame.h"
 #include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/gfx/base_renderer.h"
 #include "engines/wintermute/platform_osystem.h"
 
 namespace Wintermute {
diff --git a/engines/wintermute/ui/ui_window.cpp b/engines/wintermute/ui/ui_window.cpp
index 65af62141d..1f652bf64d 100644
--- a/engines/wintermute/ui/ui_window.cpp
+++ b/engines/wintermute/ui/ui_window.cpp
@@ -41,6 +41,7 @@
 #include "engines/wintermute/base/font/base_font_storage.h"
 #include "engines/wintermute/base/font/base_font.h"
 #include "engines/wintermute/base/base_string_table.h"
+#include "engines/wintermute/base/gfx/base_renderer.h"
 #include "engines/wintermute/base/scriptables/script.h"
 #include "engines/wintermute/base/scriptables/script_stack.h"
 #include "engines/wintermute/base/base_sprite.h"
diff --git a/engines/wintermute/video/video_theora_player.cpp b/engines/wintermute/video/video_theora_player.cpp
index 0d23a04af4..0f8bc018ea 100644
--- a/engines/wintermute/video/video_theora_player.cpp
+++ b/engines/wintermute/video/video_theora_player.cpp
@@ -32,8 +32,8 @@
 #include "engines/wintermute/base/base_file_manager.h"
 #include "engines/wintermute/base/gfx/osystem/base_surface_osystem.h"
 #include "engines/wintermute/base/gfx/base_image.h"
+#include "engines/wintermute/base/gfx/base_renderer.h"
 #include "engines/wintermute/base/sound/base_sound_manager.h"
-#include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/platform_osystem.h"
 #include "video/theora_decoder.h"
 #include "engines/wintermute/wintermute.h"
diff --git a/engines/wintermute/wintermute.cpp b/engines/wintermute/wintermute.cpp
index 9ada07293f..c9726e150a 100644
--- a/engines/wintermute/wintermute.cpp
+++ b/engines/wintermute/wintermute.cpp
@@ -39,6 +39,7 @@
 
 #include "engines/wintermute/base/sound/base_sound_manager.h"
 #include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/gfx/base_renderer.h"
 #include "engines/wintermute/base/scriptables/script_engine.h"
 
 namespace Wintermute {
diff --git a/graphics/decoders/image_decoder.h b/graphics/decoders/image_decoder.h
index 830645d361..49e31c6e3a 100644
--- a/graphics/decoders/image_decoder.h
+++ b/graphics/decoders/image_decoder.h
@@ -78,10 +78,15 @@ public:
 	 * The palette's format is the same as PaletteManager's palette
 	 * (interleaved RGB values).
 	 *
-	 * @return the decoded palette, or 0 if no palette is present
+	 * @return the decoded palette, or undefined if no palette is present
 	 */
 	virtual const byte *getPalette() const { return 0; }
 
+	/**
+	 * Query if the decoded image has a palette.
+	 */
+	virtual bool hasPalette() const { return getPaletteColorCount() != 0; }
+
 	/** Return the starting index of the palette. */
 	virtual byte getPaletteStartIndex() const { return 0; }
 	/** Return the number of colors in the palette. */
diff --git a/graphics/decoders/pict.cpp b/graphics/decoders/pict.cpp
index 7eddd3b893..9e619df208 100644
--- a/graphics/decoders/pict.cpp
+++ b/graphics/decoders/pict.cpp
@@ -292,12 +292,12 @@ struct PackBitsRectData {
 	uint16 mode;
 };
 
-void PICTDecoder::unpackBitsRect(Common::SeekableReadStream &stream, bool hasPalette) {
+void PICTDecoder::unpackBitsRect(Common::SeekableReadStream &stream, bool withPalette) {
 	PackBitsRectData packBitsData;
-	packBitsData.pixMap = readPixMap(stream, !hasPalette);
+	packBitsData.pixMap = readPixMap(stream, !withPalette);
 
 	// Read in the palette if there is one present
-	if (hasPalette) {
+	if (withPalette) {
 		// See http://developer.apple.com/legacy/mac/library/documentation/mac/QuickDraw/QuickDraw-267.html
 		stream.readUint32BE(); // seed
 		stream.readUint16BE(); // flags
@@ -469,10 +469,10 @@ void PICTDecoder::outputPixelBuffer(byte *&out, byte value, byte bitsPerPixel) {
 	}
 }
 
-void PICTDecoder::skipBitsRect(Common::SeekableReadStream &stream, bool hasPalette) {
+void PICTDecoder::skipBitsRect(Common::SeekableReadStream &stream, bool withPalette) {
 	// Step through a PackBitsRect/DirectBitsRect function
 
-	if (!hasPalette)
+	if (!withPalette)
 		stream.readUint32BE();
 
 	uint16 rowBytes = stream.readUint16BE();
@@ -492,7 +492,7 @@ void PICTDecoder::skipBitsRect(Common::SeekableReadStream &stream, bool hasPalet
 		stream.readUint16BE(); // pixelSize
 		stream.skip(16);
 
-		if (hasPalette) {
+		if (withPalette) {
 			stream.readUint32BE();
 			stream.readUint16BE();
 			stream.skip((stream.readUint16BE() + 1) * 8);
diff --git a/graphics/decoders/pict.h b/graphics/decoders/pict.h
index 7497e3963f..6f0d86c7a1 100644
--- a/graphics/decoders/pict.h
+++ b/graphics/decoders/pict.h
@@ -88,9 +88,9 @@ private:
 	bool _continueParsing;
 
 	// Utility Functions
-	void unpackBitsRect(Common::SeekableReadStream &stream, bool hasPalette);
+	void unpackBitsRect(Common::SeekableReadStream &stream, bool withPalette);
 	void unpackBitsLine(byte *out, uint32 length, Common::SeekableReadStream *stream, byte bitsPerPixel, byte bytesPerPixel);
-	void skipBitsRect(Common::SeekableReadStream &stream, bool hasPalette);
+	void skipBitsRect(Common::SeekableReadStream &stream, bool withPalette);
 	void decodeCompressedQuickTime(Common::SeekableReadStream &stream);
 	void outputPixelBuffer(byte *&out, byte value, byte bitsPerPixel);
 
diff --git a/graphics/decoders/png.cpp b/graphics/decoders/png.cpp
index bfaab6dc35..4f917b44b1 100644
--- a/graphics/decoders/png.cpp
+++ b/graphics/decoders/png.cpp
@@ -191,6 +191,7 @@ bool PNGDecoder::loadStream(Common::SeekableReadStream &stream) {
 	}
 
 	// After the transformations have been registered, the image data is read again.
+	png_set_interlace_handling(pngPtr);
 	png_read_update_info(pngPtr, infoPtr);
 	png_get_IHDR(pngPtr, infoPtr, &w, &h, &bitDepth, &colorType, NULL, NULL, NULL);
 	width = w;
diff --git a/gui/credits.h b/gui/credits.h
index 88d492098b..43b9292ac5 100644
--- a/gui/credits.h
+++ b/gui/credits.h
@@ -252,6 +252,9 @@ static const char *credits[] = {
 "C0""Gregory Montoir",
 "C2""(retired)",
 "",
+"C1""Wintermute",
+"C0""Einar Johan T. S\370m\345en",
+"",
 "",
 "C1""Backend Teams",
 "C1""Android",
@@ -682,6 +685,8 @@ static const char *credits[] = {
 "C2""For generously providing hosting for our buildbot, SVN repository, planet and doxygen sites as well as tons of HD space",
 "C0""DOSBox Team",
 "C2""For their awesome OPL2 and OPL3 emulator",
+"C0""Yusuke Kamiyamane",
+"C2""For contributing some GUI icons ",
 "C0""Till Kresslein",
 "C2""For design of modern ScummVM GUI",
 "C0""Jezar",
@@ -698,8 +703,6 @@ static const char *credits[] = {
 "C2""For additional work on the original MT-32 emulator",
 "C0""James Woodcock",
 "C2""Soundtrack enhancements",
-"C0""Some icons by Yusuke Kamiyamane",
-"C0""",
 "C0""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 and beyond the call of duty.",
 "C0""",
 "C0""John Passfield and Steve Stamatiadis for sharing the source of their classic title, Flight of the Amazon Queen and also being incredibly supportive.",
@@ -720,7 +723,9 @@ static const char *credits[] = {
 "C0""",
 "C0""Neil Dodwell and David Dew from Creative Reality for providing the source of Dreamweb and for their tremendous support.",
 "C0""",
-"C0""Janusz Wisniewski and Miroslaw Liminowicz from Laboratorium Komputerowe Avalon for providing full source code for Soltys and letting us to redistribute the game.",
+"C0""Janusz Wisniewski and Miroslaw Liminowicz from Laboratorium Komputerowe Avalon for providing full source code for Soltys and letting us redistribute the game.",
+"C0""",
+"C0""Jan Nedoma for providing the sources to the Wintermute-engine, and for his support while porting the engine to ScummVM.",
 "C0""",
 "C0""Bob Bell, Michel Kripalani, Tommy Yune, from Presto Studios for providing the source code of The Journeyman Project: Pegasus Prime.",
 "C0""",
diff --git a/video/bink_decoder.cpp b/video/bink_decoder.cpp
index 620316806f..30632cdd6c 100644
--- a/video/bink_decoder.cpp
+++ b/video/bink_decoder.cpp
@@ -260,7 +260,23 @@ BinkDecoder::BinkVideoTrack::BinkVideoTrack(uint32 width, uint32 height, const G
 			_colHighHuffman[i].symbols[j] = j;
 	}
 
-	_surface.create(width, height, format);
+	// Make the surface even-sized:
+	_surfaceHeight = height;
+	_surfaceWidth = width;
+
+	if (height & 1) {
+		_surfaceHeight++;
+	}
+	if (width & 1) {
+		_surfaceWidth++;
+	}
+
+	_surface.create(_surfaceWidth, _surfaceHeight, format);
+	// Since we over-allocate to make surfaces even-sized
+	// we need to set the actual VIDEO size back into the
+	// surface.
+	_surface.h = height;
+	_surface.w = width;
 
 	// Give the planes a bit extra space
 	width  = _surface.w + 32;
@@ -329,9 +345,11 @@ void BinkDecoder::BinkVideoTrack::decodePacket(VideoFrame &frame) {
 
 	// Convert the YUV data we have to our format
 	// We're ignoring alpha for now
+	// The width used here is the surface-width, and not the video-width
+	// to allow for odd-sized videos.
 	assert(_curPlanes[0] && _curPlanes[1] && _curPlanes[2]);
 	Graphics::convertYUV420ToRGB(&_surface, _curPlanes[0], _curPlanes[1], _curPlanes[2],
-			_surface.w, _surface.h, _surface.w, _surface.w >> 1);
+			_surfaceWidth, _surfaceHeight, _surfaceWidth, _surfaceWidth >> 1);
 
 	// And swap the planes with the reference planes
 	for (int i = 0; i < 4; i++)
diff --git a/video/bink_decoder.h b/video/bink_decoder.h
index 150e91aab7..27d3aa3691 100644
--- a/video/bink_decoder.h
+++ b/video/bink_decoder.h
@@ -231,6 +231,8 @@ private:
 		int _frameCount;
 
 		Graphics::Surface _surface;
+		int _surfaceWidth; ///< The actual surface width
+		int _surfaceHeight; ///< The actual surface height
 
 		uint32 _id; ///< The BIK FourCC.
 
diff --git a/video/video_decoder.cpp b/video/video_decoder.cpp
index c9d3d22070..24287c4d33 100644
--- a/video/video_decoder.cpp
+++ b/video/video_decoder.cpp
@@ -35,7 +35,6 @@ namespace Video {
 
 VideoDecoder::VideoDecoder() {
 	_startTime = 0;
-	_needsRewind = false;
 	_dirtyPalette = false;
 	_palette = 0;
 	_isPlaying = false;
@@ -62,7 +61,6 @@ void VideoDecoder::close() {
 		delete *it;
 
 	_tracks.clear();
-	_needsRewind = false;
 	_dirtyPalette = false;
 	_palette = 0;
 	_startTime = 0;
@@ -271,8 +269,6 @@ bool VideoDecoder::rewind() {
 	if (!isRewindable())
 		return false;
 
-	_needsRewind = false;
-
 	// Stop all tracks so they can be rewound
 	if (isPlaying())
 		stopAudio();
@@ -306,8 +302,6 @@ bool VideoDecoder::seek(const Audio::Timestamp &time) {
 	if (!isSeekable())
 		return false;
 
-	_needsRewind = false;
-
 	// Stop all tracks so they can be seeked
 	if (isPlaying())
 		stopAudio();
@@ -337,10 +331,6 @@ void VideoDecoder::start() {
 	_isPlaying = true;
 	_startTime = g_system->getMillis();
 
-	// If someone previously called stop(), we'll rewind it.
-	if (_needsRewind)
-		rewind();
-
 	// Adjust start time if we've seeked to something besides zero time
 	if (_lastTimeChange.totalNumberOfFrames() != 0)
 		_startTime -= _lastTimeChange.msecs();
@@ -363,15 +353,8 @@ void VideoDecoder::stop() {
 	// Also reset the pause state.
 	_pauseLevel = 0;
 
-	// If this is a rewindable video, don't close it too. We'll just rewind() the video
-	// the next time someone calls start(). Otherwise, since it can't be rewound, we
-	// just close it.
-	if (isRewindable()) {
-		_lastTimeChange = getTime();
-		_needsRewind = true;
-	} else {
-		close();
-	}
+	// Keep the time marked down in case we start up again
+	_lastTimeChange = getTime();
 }
 
 Audio::Timestamp VideoDecoder::getDuration() const {
diff --git a/video/video_decoder.h b/video/video_decoder.h
index daf78c227a..66980ab09b 100644
--- a/video/video_decoder.h
+++ b/video/video_decoder.h
@@ -102,16 +102,14 @@ public:
 	/**
 	 * Begin playback of the video.
 	 *
-	 * @note This has no effect is the video is already playing.
+	 * @note This has no effect if the video is already playing.
 	 */
 	void start();
 
 	/**
 	 * Stop playback of the video.
 	 *
-	 * @note This will close() the video if it is not rewindable.
-	 * @note If the video is rewindable, the video will be rewound on the
-	 * next start() call unless rewind() or seek() is called before then.
+	 * @note This has no effect if the video is not playing.
 	 */
 	void stop();
 
@@ -765,7 +763,7 @@ private:
 	TrackList _tracks;
 
 	// Current playback status
-	bool _isPlaying, _needsRewind, _needsUpdate;
+	bool _isPlaying, _needsUpdate;
 	Audio::Timestamp _lastTimeChange, _endTime;
 	bool _endTimeSet;