diff -Nru scummvm-1.4.0/audio/decoders/quicktime.cpp scummvm-1.4.1/audio/decoders/quicktime.cpp --- scummvm-1.4.0/audio/decoders/quicktime.cpp 2011-09-30 11:04:23.000000000 +0000 +++ scummvm-1.4.1/audio/decoders/quicktime.cpp 2012-01-14 09:28:43.000000000 +0000 @@ -227,16 +227,23 @@ uint32 seekSample = sample; if (!isOldDemuxing()) { - // We shouldn't have audio samples that are a different duration - // That would be quite bad! - if (_tracks[_audioTrackIndex]->timeToSampleCount != 1) { - warning("Failed seeking"); - return; - } + // For MPEG-4 style demuxing, we need to track down the sample based on the time + // The old style demuxing doesn't require this because each "sample"'s duration + // is just 1 + uint32 curSample = 0; + seekSample = 0; + + for (int32 i = 0; i < _tracks[_audioTrackIndex]->timeToSampleCount; i++) { + uint32 sampleCount = _tracks[_audioTrackIndex]->timeToSample[i].count * _tracks[_audioTrackIndex]->timeToSample[i].duration; + + if (sample < curSample + sampleCount) { + seekSample += (sample - curSample) / _tracks[_audioTrackIndex]->timeToSample[i].duration; + break; + } - // Note that duration is in terms of *one* channel - // This eases calculation a bit - seekSample /= _tracks[_audioTrackIndex]->timeToSample[0].duration; + seekSample += _tracks[_audioTrackIndex]->timeToSample[i].count; + curSample += sampleCount; + } } // Now to track down what chunk it's in diff -Nru scummvm-1.4.0/backends/events/maemosdl/maemosdl-events.cpp scummvm-1.4.1/backends/events/maemosdl/maemosdl-events.cpp --- scummvm-1.4.0/backends/events/maemosdl/maemosdl-events.cpp 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/events/maemosdl/maemosdl-events.cpp 2012-01-14 09:28:25.000000000 +0000 @@ -47,7 +47,11 @@ switch (ev.type) { case SDL_KEYDOWN:{ - if (ev.key.keysym.sym == SDLK_F4) { + if (ev.key.keysym.sym == SDLK_F4 + || (model.modelType == kModelTypeN900 + && ev.key.keysym.sym == SDLK_m + && (ev.key.keysym.mod & KMOD_CTRL) + && (ev.key.keysym.mod & KMOD_SHIFT))) { event.type = Common::EVENT_MAINMENU; debug(9, "remapping to main menu"); return true; @@ -83,7 +87,11 @@ break; } case SDL_KEYUP: { - if (ev.key.keysym.sym == SDLK_F4) { + if (ev.key.keysym.sym == SDLK_F4 + || (model.modelType == kModelTypeN900 + && ev.key.keysym.sym == SDLK_m + && (ev.key.keysym.mod & KMOD_CTRL) + && (ev.key.keysym.mod & KMOD_SHIFT))) { event.type = Common::EVENT_MAINMENU; return true; } else if (ev.key.keysym.sym == SDLK_F6) { diff -Nru scummvm-1.4.0/backends/graphics/maemosdl/maemosdl-graphics.cpp scummvm-1.4.1/backends/graphics/maemosdl/maemosdl-graphics.cpp --- scummvm-1.4.0/backends/graphics/maemosdl/maemosdl-graphics.cpp 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/backends/graphics/maemosdl/maemosdl-graphics.cpp 2012-01-14 09:28:25.000000000 +0000 @@ -0,0 +1,60 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ +#if defined(MAEMO) + +#include "SDL_syswm.h" + +#include "common/scummsys.h" + +#include "backends/platform/maemo/maemo.h" +#include "backends/events/maemosdl/maemosdl-events.h" +#include "backends/graphics/maemosdl/maemosdl-graphics.h" + +MaemoSdlGraphicsManager::MaemoSdlGraphicsManager(SdlEventSource *sdlEventSource) + : SurfaceSdlGraphicsManager(sdlEventSource) { +} + +bool MaemoSdlGraphicsManager::loadGFXMode() { + bool success = SurfaceSdlGraphicsManager::loadGFXMode(); + + // fix the problematic zoom key capture in Maemo5/N900 + SDL_SysWMinfo info; + SDL_VERSION(&info.version); + if (SDL_GetWMInfo(&info)) { + Display *dpy = info.info.x11.display; + Window win; + unsigned long val = 1; + Atom atom_zoom = XInternAtom(dpy, "_HILDON_ZOOM_KEY_ATOM", 0); + info.info.x11.lock_func(); + win = info.info.x11.fswindow; + if (win) + XChangeProperty(dpy, win, atom_zoom, XA_INTEGER, 32, PropModeReplace, (unsigned char *) &val, 1); // grab zoom keys + win = info.info.x11.wmwindow; + if (win) + XChangeProperty(dpy, win, atom_zoom, XA_INTEGER, 32, PropModeReplace, (unsigned char *) &val, 1); // grab zoom keys + info.info.x11.unlock_func(); + } + + return success; +} + +#endif diff -Nru scummvm-1.4.0/backends/graphics/maemosdl/maemosdl-graphics.h scummvm-1.4.1/backends/graphics/maemosdl/maemosdl-graphics.h --- scummvm-1.4.0/backends/graphics/maemosdl/maemosdl-graphics.h 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/backends/graphics/maemosdl/maemosdl-graphics.h 2012-01-14 09:28:25.000000000 +0000 @@ -0,0 +1,40 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#if defined(MAEMO) + +#ifndef BACKENDS_GRAPHICS_MAEMOSDL_GRAPHICS_H +#define BACKENDS_GRAPHICS_MAEMOSDL_GRAPHICS_H + +#include "backends/graphics/surfacesdl/surfacesdl-graphics.h" + +class MaemoSdlGraphicsManager : public SurfaceSdlGraphicsManager { +public: + MaemoSdlGraphicsManager(SdlEventSource *sdlEventSource); + +protected: + virtual bool loadGFXMode(); +}; + +#endif + +#endif diff -Nru scummvm-1.4.0/backends/module.mk scummvm-1.4.1/backends/module.mk --- scummvm-1.4.0/backends/module.mk 2011-09-30 11:04:23.000000000 +0000 +++ scummvm-1.4.1/backends/module.mk 2012-01-14 09:28:25.000000000 +0000 @@ -149,7 +149,8 @@ ifeq ($(BACKEND),maemo) MODULE_OBJS += \ - events/maemosdl/maemosdl-events.o + events/maemosdl/maemosdl-events.o \ + graphics/maemosdl/maemosdl-graphics.o endif ifeq ($(BACKEND),n64) diff -Nru scummvm-1.4.0/backends/platform/maemo/debian/changelog scummvm-1.4.1/backends/platform/maemo/debian/changelog --- scummvm-1.4.0/backends/platform/maemo/debian/changelog 2011-11-03 18:06:06.000000000 +0000 +++ scummvm-1.4.1/backends/platform/maemo/debian/changelog 2012-01-14 09:28:43.000000000 +0000 @@ -1,8 +1,14 @@ +scummvm (1.4.1) unstable; urgency=low + + * 1.4.1 release + + -- Tarek Soliman Wed, 11 Jan 2012 17:17:26 -0600 + scummvm (1.4.0) unstable; urgency=low * 1.4.0 release - -- Tarek Soliman Thu, 27 Oct 2011 19:01:25 -0500 + -- Tarek Soliman Thu, 03 Nov 2011 13:54:04 -0500 scummvm (1.2.1~pre) unstable; urgency=low diff -Nru scummvm-1.4.0/backends/platform/maemo/debian/control scummvm-1.4.1/backends/platform/maemo/debian/control --- scummvm-1.4.0/backends/platform/maemo/debian/control 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/platform/maemo/debian/control 2012-01-14 09:28:25.000000000 +0000 @@ -7,7 +7,7 @@ Standards-Version: 3.6.1.1 Package: scummvm Depends: ${shlibs:Depends} -Architecture: i386 armel +Architecture: armel Section: user/games Description: interpreter that will play graphic adventure games written for LucasArts' SCUMM virtual machine, Sierra's AGI adventures, @@ -17,6 +17,8 @@ Coktel Vision's Gobliiins, Wyrmkeep's Inherit the Earth, Westwood's Legend of Kyrandia, and various others. This package does not contain any actual games. +XSBC-Bugtracker: https://sourceforge.net/tracker/?atid=418820&group_id=37116&func=browse +XB-Maemo-Display-Name: ScummVM XBS-Maemo-Icon-26: iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAMAAACelLz8AAAC/VBMVEUICwcH CQUKDAgLDQoMDwsOEAwREAUPEQ0QEg8PFQoRExAUEwoVFAwPGAcTFBIRFg0W diff -Nru scummvm-1.4.0/backends/platform/maemo/maemo.cpp scummvm-1.4.1/backends/platform/maemo/maemo.cpp --- scummvm-1.4.0/backends/platform/maemo/maemo.cpp 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/platform/maemo/maemo.cpp 2012-01-14 09:28:25.000000000 +0000 @@ -29,6 +29,7 @@ #include "backends/platform/maemo/maemo.h" #include "backends/events/maemosdl/maemosdl-events.h" +#include "backends/graphics/maemosdl/maemosdl-graphics.h" #include "common/textconsole.h" @@ -47,6 +48,9 @@ if (_eventSource == 0) _eventSource = new MaemoSdlEventSource(); + if (_graphicsManager == 0) + _graphicsManager = new MaemoSdlGraphicsManager(_eventSource); + ConfMan.set("vkeybdpath", DATA_PATH); _model = Model(detectModel()); @@ -108,6 +112,12 @@ return *model; } +void OSystem_SDL_Maemo::setupIcon() { + // no Maemo version needs setupIcon + // also N900 is hit by SDL_WM_SetIcon bug (window cannot receive input) + // http://bugzilla.libsdl.org/show_bug.cgi?id=586 +} + } //namespace Maemo #endif diff -Nru scummvm-1.4.0/backends/platform/maemo/maemo.h scummvm-1.4.1/backends/platform/maemo/maemo.h --- scummvm-1.4.0/backends/platform/maemo/maemo.h 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/platform/maemo/maemo.h 2012-01-14 09:28:25.000000000 +0000 @@ -38,6 +38,7 @@ virtual void quit(); virtual void fatalError(); virtual void setWindowCaption(const char *caption); + virtual void setupIcon(); Model getModel() { return _model; } diff -Nru scummvm-1.4.0/backends/platform/psp/README.PSP scummvm-1.4.1/backends/platform/psp/README.PSP --- scummvm-1.4.0/backends/platform/psp/README.PSP 2011-11-03 18:06:46.000000000 +0000 +++ scummvm-1.4.1/backends/platform/psp/README.PSP 2012-01-14 09:28:43.000000000 +0000 @@ -1,4 +1,4 @@ -ScummVM-PSP 1.4.0 README +ScummVM-PSP 1.4.1 README ============================================================================== Installation diff -Nru scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_agi.mmp.in scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_agi.mmp.in --- scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_agi.mmp.in 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_agi.mmp.in 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_agos.mmp.in scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_agos.mmp.in --- scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_agos.mmp.in 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_agos.mmp.in 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_base.mmp.in scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_base.mmp.in --- scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_base.mmp.in 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_base.mmp.in 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_cine.mmp.in scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_cine.mmp.in --- scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_cine.mmp.in 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_cine.mmp.in 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_cruise.mmp.in scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_cruise.mmp.in --- scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_cruise.mmp.in 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_cruise.mmp.in 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_draci.mmp.in scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_draci.mmp.in --- scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_draci.mmp.in 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_draci.mmp.in 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_drascula.mmp.in scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_drascula.mmp.in --- scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_drascula.mmp.in 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_drascula.mmp.in 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_gob.mmp.in scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_gob.mmp.in --- scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_gob.mmp.in 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_gob.mmp.in 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_groovie.mmp.in scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_groovie.mmp.in --- scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_groovie.mmp.in 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_groovie.mmp.in 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_hugo.mmp.in scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_hugo.mmp.in --- scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_hugo.mmp.in 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_hugo.mmp.in 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_kyra.mmp.in scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_kyra.mmp.in --- scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_kyra.mmp.in 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_kyra.mmp.in 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_lastexpress.mmp.in scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_lastexpress.mmp.in --- scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_lastexpress.mmp.in 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_lastexpress.mmp.in 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_lure.mmp.in scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_lure.mmp.in --- scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_lure.mmp.in 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_lure.mmp.in 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_m4.mmp.in scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_m4.mmp.in --- scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_m4.mmp.in 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_m4.mmp.in 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_made.mmp.in scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_made.mmp.in --- scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_made.mmp.in 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_made.mmp.in 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_mohawk.mmp.in scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_mohawk.mmp.in --- scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_mohawk.mmp.in 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_mohawk.mmp.in 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_parallaction.mmp.in scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_parallaction.mmp.in --- scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_parallaction.mmp.in 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_parallaction.mmp.in 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_queen.mmp.in scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_queen.mmp.in --- scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_queen.mmp.in 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_queen.mmp.in 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_saga.mmp.in scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_saga.mmp.in --- scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_saga.mmp.in 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_saga.mmp.in 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_sci.mmp.in scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_sci.mmp.in --- scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_sci.mmp.in 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_sci.mmp.in 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_scumm.mmp.in scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_scumm.mmp.in --- scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_scumm.mmp.in 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_scumm.mmp.in 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_sky.mmp.in scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_sky.mmp.in --- scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_sky.mmp.in 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_sky.mmp.in 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_sword1.mmp.in scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_sword1.mmp.in --- scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_sword1.mmp.in 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_sword1.mmp.in 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_sword2.mmp.in scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_sword2.mmp.in --- scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_sword2.mmp.in 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_sword2.mmp.in 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_teenagent.mmp.in scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_teenagent.mmp.in --- scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_teenagent.mmp.in 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_teenagent.mmp.in 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_tinsel.mmp.in scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_tinsel.mmp.in --- scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_tinsel.mmp.in 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_tinsel.mmp.in 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_toon.mmp.in scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_toon.mmp.in --- scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_toon.mmp.in 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_toon.mmp.in 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_touche.mmp.in scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_touche.mmp.in --- scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_touche.mmp.in 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_touche.mmp.in 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_tsage.mmp.in scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_tsage.mmp.in --- scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_tsage.mmp.in 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_tsage.mmp.in 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_tucker.mmp.in scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_tucker.mmp.in --- scummvm-1.4.0/backends/platform/symbian/mmp/scummvm_tucker.mmp.in 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/mmp/scummvm_tucker.mmp.in 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/README scummvm-1.4.1/backends/platform/symbian/README --- scummvm-1.4.0/backends/platform/symbian/README 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/README 2012-01-14 09:28:25.000000000 +0000 @@ -1,7 +1,7 @@ ScummVM - ScummVM ported to EPOC/SymbianOS - Copyright (C) 2008-2011 ScummVM Team + Copyright (C) 2008-2012 ScummVM Team Copyright (C) 2003-2008 Lars 'AnotherGuest' Persson Copyright (C) 2002-2008 Jurgen 'SumthinWicked' Braam diff -Nru scummvm-1.4.0/backends/platform/symbian/res/scummvm_A0000658.rss scummvm-1.4.1/backends/platform/symbian/res/scummvm_A0000658.rss --- scummvm-1.4.0/backends/platform/symbian/res/scummvm_A0000658.rss 2011-07-27 13:40:23.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/res/scummvm_A0000658.rss 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/res/ScummVmAif.rss scummvm-1.4.1/backends/platform/symbian/res/ScummVmAif.rss --- scummvm-1.4.0/backends/platform/symbian/res/ScummVmAif.rss 2011-09-30 11:04:23.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/res/ScummVmAif.rss 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/res/scummvm.rss scummvm-1.4.1/backends/platform/symbian/res/scummvm.rss --- scummvm-1.4.0/backends/platform/symbian/res/scummvm.rss 2011-07-27 13:40:23.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/res/scummvm.rss 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/S60/ScummVM_S60_App.mmp scummvm-1.4.1/backends/platform/symbian/S60/ScummVM_S60_App.mmp --- scummvm-1.4.0/backends/platform/symbian/S60/ScummVM_S60_App.mmp 2011-07-27 13:40:23.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/S60/ScummVM_S60_App.mmp 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/S60/ScummVM_S60.mmp.in scummvm-1.4.1/backends/platform/symbian/S60/ScummVM_S60.mmp.in --- scummvm-1.4.0/backends/platform/symbian/S60/ScummVM_S60.mmp.in 2011-07-27 13:40:23.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/S60/ScummVM_S60.mmp.in 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in scummvm-1.4.1/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in --- scummvm-1.4.0/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in scummvm-1.4.1/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in --- scummvm-1.4.0/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/S80/ScummVM_S80_App.mmp scummvm-1.4.1/backends/platform/symbian/S80/ScummVM_S80_App.mmp --- scummvm-1.4.0/backends/platform/symbian/S80/ScummVM_S80_App.mmp 2011-07-27 13:40:23.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/S80/ScummVM_S80_App.mmp 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/S80/ScummVM_S80.mmp.in scummvm-1.4.1/backends/platform/symbian/S80/ScummVM_S80.mmp.in --- scummvm-1.4.0/backends/platform/symbian/S80/ScummVM_S80.mmp.in 2011-09-30 11:04:23.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/S80/ScummVM_S80.mmp.in 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/S90/Scummvm_S90_App.mmp scummvm-1.4.1/backends/platform/symbian/S90/Scummvm_S90_App.mmp --- scummvm-1.4.0/backends/platform/symbian/S90/Scummvm_S90_App.mmp 2011-07-27 13:40:23.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/S90/Scummvm_S90_App.mmp 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/S90/Scummvm_S90.mmp.in scummvm-1.4.1/backends/platform/symbian/S90/Scummvm_S90.mmp.in --- scummvm-1.4.0/backends/platform/symbian/S90/Scummvm_S90.mmp.in 2011-09-30 11:04:23.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/S90/Scummvm_S90.mmp.in 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/src/ScummVm.hrh scummvm-1.4.1/backends/platform/symbian/src/ScummVm.hrh --- scummvm-1.4.0/backends/platform/symbian/src/ScummVm.hrh 2011-07-27 13:40:23.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/src/ScummVm.hrh 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/UIQ2/ScummVM.rss scummvm-1.4.1/backends/platform/symbian/UIQ2/ScummVM.rss --- scummvm-1.4.0/backends/platform/symbian/UIQ2/ScummVM.rss 2011-09-30 11:04:23.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/UIQ2/ScummVM.rss 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru scummvm-1.4.0/backends/platform/symbian/UIQ3/scummvm_A0000658_loc.rss scummvm-1.4.1/backends/platform/symbian/UIQ3/scummvm_A0000658_loc.rss --- scummvm-1.4.0/backends/platform/symbian/UIQ3/scummvm_A0000658_loc.rss 2011-09-30 11:04:23.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/UIQ3/scummvm_A0000658_loc.rss 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/UIQ3/ScummVM_A0000658.rss scummvm-1.4.1/backends/platform/symbian/UIQ3/ScummVM_A0000658.rss --- scummvm-1.4.0/backends/platform/symbian/UIQ3/ScummVM_A0000658.rss 2011-09-30 11:04:23.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/UIQ3/ScummVM_A0000658.rss 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/UIQ3/ScummVM_A0000658_UIQ3.mmp.in scummvm-1.4.1/backends/platform/symbian/UIQ3/ScummVM_A0000658_UIQ3.mmp.in --- scummvm-1.4.0/backends/platform/symbian/UIQ3/ScummVM_A0000658_UIQ3.mmp.in 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/UIQ3/ScummVM_A0000658_UIQ3.mmp.in 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2009 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2009 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/UIQ3/ScummVM.rss scummvm-1.4.1/backends/platform/symbian/UIQ3/ScummVM.rss --- scummvm-1.4.0/backends/platform/symbian/UIQ3/ScummVM.rss 2011-09-30 11:04:23.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/UIQ3/ScummVM.rss 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in scummvm-1.4.1/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in --- scummvm-1.4.0/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in 2012-01-14 09:28:25.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2011 The ScummVM project + * Copyright (C) 2005-2012 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT diff -Nru scummvm-1.4.0/backends/platform/wince/README-WinCE.txt scummvm-1.4.1/backends/platform/wince/README-WinCE.txt --- scummvm-1.4.0/backends/platform/wince/README-WinCE.txt 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/backends/platform/wince/README-WinCE.txt 2012-01-14 09:28:25.000000000 +0000 @@ -1,10 +1,17 @@ ScummVM Windows CE FAQ -Last updated: 2011-10-15 -Release version: 1.4.0 +Last updated: 2011-12-05 +Release version: x.x.x ------------------------------------------------------------------------ New in this version ------------------- +x.x.x: +- Removed FLAC support for audio datafiles (now for real, this was originally + announced for 1.0.0, but the library was still included until now). This is + done because of size constrains of the executable and also FLAC on a mobile + device isn't really recommended - so please use MP3 or Ogg for your audio + datafiles. + 1.4.0: - Changed the memory management so that it is finally possible to break the 32MB per process barrier on Windows CE. It should be possible now (finally) @@ -18,6 +25,8 @@ - Discworld 2 is now playable (works now because of the new memory management) - Replaced the game mass-adding functionality with the functionality used on all other platforms. It now shows progress while searching for games. +- Mapped "Skip" button to F10 for AGI games +- Mapped "Multi Function" to F10 in Simon 1 & 2 (enables hotspot highlighting) 1.3.1: - Fix for Normal2xAspect scaler which was causing screen update issues in some @@ -60,7 +69,7 @@ - agos, cine, drascula, gob, groovie, kyra, made, parallaction, saga, teenagent, tucker scummvm3.exe: - - hugo, mohawk, sci, sword2, toon + - hugo, mohawk, sci, sword2, toon, tsage There are no other port specific changes. @@ -264,6 +273,7 @@ * Quit : quit ScummVM (without saving, be careful when using it) * Skip : skip a non interactive sequence, the current dialog or behaves like the ESC key on a regular keyboard + All AGI games -> F10 to quit full-screen dialogs * Hide : hide or display the toolbar * Keyboard : hide or display the virtual keyboard * Sound : turns all sound effects and music off and on @@ -282,6 +292,7 @@ Fate of Atlantis -> sucker punch (cheat) Bargon -> F1 (start the game) All AGI games -> bring up the predictive input dialog + Simon 1 & 2 -> highlight all hotspots in screen * Bind keys map a key action to a device button * Up,Down,Left : Right, : emulate mouse/stylus behavior diff -Nru scummvm-1.4.0/base/internal_version.h scummvm-1.4.1/base/internal_version.h --- scummvm-1.4.0/base/internal_version.h 2011-11-03 18:06:46.000000000 +0000 +++ scummvm-1.4.1/base/internal_version.h 2012-01-14 09:28:43.000000000 +0000 @@ -16,4 +16,4 @@ #define SCUMMVM_REVISION #endif -#define SCUMMVM_VERSION "1.4.0" SCUMMVM_REVISION +#define SCUMMVM_VERSION "1.4.1" SCUMMVM_REVISION diff -Nru scummvm-1.4.0/configure scummvm-1.4.1/configure --- scummvm-1.4.0/configure 2011-11-03 18:06:06.000000000 +0000 +++ scummvm-1.4.1/configure 2012-01-14 09:28:43.000000000 +0000 @@ -411,8 +411,13 @@ # Show the configure help line for an option option_help() { + if test "${3}" != "" ; then + tmpopt_prefix="${3}" + else + tmpopt_prefix="--" + fi tmpopt=`echo $1 | sed 's/_/-/g'` - option=`echo "--${tmpopt} " | sed "s/\(.\{23\}\).*/\1/"` + option=`echo "${tmpopt_prefix}${tmpopt} " | sed "s/\(.\{23\}\).*/\1/"` echo " ${option} ${2}" } @@ -423,6 +428,21 @@ exit 1 } +# Show an error about an unknown engine +engine_option_error() { + echo "error: unrecognised engine: $1 +Try \`$0 --help' for more information." >&2 + exit 1 +} + +# Show an error about an invalid subengine option +subengine_option_error() { + echo "error: this option is invalid for the subengine $1: $ac_option +Try \`$0 --help' for more information." >&2 + exit 1 +} + + # # Engine handling functions @@ -474,9 +494,9 @@ # Enable the given engine engine_enable() { # Get the parameter - if ( echo $1 | grep '=' ) 2> /dev/null > /dev/null ; then - eng=`echo $1 | cut -d '=' -f 1` - opt=`echo $1 | cut -d '=' -f 2` + if ( echo $1 | grep ':' ) 2> /dev/null > /dev/null ; then + eng=`echo $1 | cut -d ':' -f 1` + opt=`echo $1 | cut -d ':' -f 2` else eng=$1 opt=yes @@ -485,7 +505,7 @@ # Filter the parameter for the subengines if test "`get_engine_sub ${engine}`" != "no" -a "$opt" != "yes" ; then - option_error + subengine_option_error ${engine} return fi @@ -493,7 +513,7 @@ if test "`get_engine_name ${engine}`" != "" ; then set_var _engine_${engine}_build "$opt" else - option_error + engine_option_error ${engine} fi else option_error @@ -512,21 +532,14 @@ if test "`get_engine_name ${engine}`" != "" ; then set_var _engine_${engine}_build "no" else - option_error + engine_option_error ${engine} fi } # Show the configure help line for a given engine show_engine_help() { - if test `get_engine_build $1` = yes ; then - option="disable" - do="don't " - else - option="enable" - do="" - fi name=`get_engine_name $1` - option_help ${option}-${1} "${do}build the ${name} engine" + option_help "${1}" "${name} engine" " " for sub in `get_engine_subengines $1`; do show_subengine_help $sub $1 done @@ -534,16 +547,9 @@ # Show the configure help line for a given subengine show_subengine_help() { - if test `get_engine_build $1` = yes ; then - option="disable" - do="exclude" - else - option="enable" - do="include" - fi name=`get_engine_name $1` parent=`get_engine_name $2` - option_help ${option}-${1} "${do} the ${name} in ${parent} engine" + option_help "${1}" "${name} in ${parent} engine" " " } # Prepare the strings about the engines to build @@ -766,6 +772,13 @@ --enable-all-engines enable all engines, including those which are broken or unsupported --disable-all-engines disable all engines + --enable-engine=[,...] enable engine(s) listed + --disable-engine=[,...] disable engine(s) listed + --enable-engine-static=[,...] + enable engine(s) listed as static builtin (when plugins are enabled) + --enable-engine-dynamic=[,...] + enable engine(s) listed as dynamic plugin (when plugins are enabled) + The values of for these options are as follows: $engines_help Optional Features: --disable-debug disable building with debugging symbols @@ -1068,11 +1081,25 @@ --disable-all-engines) engine_disable_all ;; - --enable-*) - engine_enable `echo $ac_option | cut -d '-' -f 4-` + --enable-engine=* | --enable-engines=*) + for engine_name in `echo $ac_option | cut -d '=' -f 2- | tr ',' '\n'`; do + engine_enable "${engine_name}" + done + ;; + --enable-engine-static=* | --enable-engines-static=*) + for engine_name in `echo $ac_option | cut -d '=' -f 2- | tr ',' '\n'`; do + engine_enable "${engine_name}:static" + done ;; - --disable-*) - engine_disable `echo $ac_option | cut -d '-' -f 4-` + --enable-engine-dynamic=* | --enable-engines-dynamic=*) + for engine_name in `echo $ac_option | cut -d '=' -f 2- | tr ',' '\n'`; do + engine_enable "${engine_name}:dynamic" + done + ;; + --disable-engine=* | --disable-engines=*) + for engine_name in `echo $ac_option | cut -d '=' -f 2 | tr ',' '\n'`; do + engine_disable ${engine_name} + done ;; *) option_error @@ -2266,6 +2293,7 @@ CXXFLAGS="$CXXFLAGS -fomit-frame-pointer" INCLUDES="$INCLUDES -I/usr/X11R6/include" LIBS="$LIBS -lpthread" + LIBS="$LIBS -lX11" LIBS="$LIBS -L/usr/lib" _backend="maemo" diff -Nru scummvm-1.4.0/COPYRIGHT scummvm-1.4.1/COPYRIGHT --- scummvm-1.4.0/COPYRIGHT 2011-07-27 13:40:23.000000000 +0000 +++ scummvm-1.4.1/COPYRIGHT 2012-01-14 09:28:25.000000000 +0000 @@ -1,5 +1,5 @@ ScummVM -Copyright (C) 2001-2011 by the following: +Copyright (C) 2001-2012 by the following: If you have contributed to this project then you deserve to be on this list. Contact us (see: AUTHORS) and we'll add you. diff -Nru scummvm-1.4.0/debian/changelog scummvm-1.4.1/debian/changelog --- scummvm-1.4.0/debian/changelog 2011-11-06 09:41:30.000000000 +0000 +++ scummvm-1.4.1/debian/changelog 2012-01-14 11:35:32.000000000 +0000 @@ -1,3 +1,10 @@ +scummvm (1.4.1-1) unstable; urgency=low + + * New upstream release + * Install translations.dat into scummvm-data + + -- Moritz Muehlenhoff Sat, 14 Jan 2012 11:39:15 +0100 + scummvm (1.4.0-1) unstable; urgency=low * New upstream release diff -Nru scummvm-1.4.0/debian/control scummvm-1.4.1/debian/control --- scummvm-1.4.0/debian/control 2011-11-06 09:40:59.000000000 +0000 +++ scummvm-1.4.1/debian/control 2012-01-14 10:40:17.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian Games Team Uploaders: David Weinehall , Moritz Muehlenhoff -Build-Depends: debhelper (>= 7.0.50~), nasm [i386], libsdl1.2-dev, libmad0-dev, libasound2-dev [linux-any], libvorbis-dev, libmpeg2-4-dev, libflac-dev, libz-dev, libfluidsynth-dev, python +Build-Depends: debhelper (>= 8.9.4), nasm [i386], libsdl1.2-dev, libmad0-dev, libasound2-dev [linux-any], libvorbis-dev, libmpeg2-4-dev, libflac-dev, libz-dev, libfluidsynth-dev, python Standards-Version: 3.9.2 Homepage: http://www.scummvm.org diff -Nru scummvm-1.4.0/debian/scummvm-data.install scummvm-1.4.1/debian/scummvm-data.install --- scummvm-1.4.0/debian/scummvm-data.install 2010-01-26 19:58:43.000000000 +0000 +++ scummvm-1.4.1/debian/scummvm-data.install 2012-01-14 11:35:17.000000000 +0000 @@ -3,3 +3,4 @@ dists/scummvm.desktop usr/share/applications gui/themes/scummmodern.zip usr/share/scummvm dists/pred.dic usr/share/scummvm +gui/themes/translations.dat usr/share/scummvm diff -Nru scummvm-1.4.0/devtools/create_project/create_project.cpp scummvm-1.4.1/devtools/create_project/create_project.cpp --- scummvm-1.4.0/devtools/create_project/create_project.cpp 2011-09-30 11:04:23.000000000 +0000 +++ scummvm-1.4.1/devtools/create_project/create_project.cpp 2012-01-14 09:28:43.000000000 +0000 @@ -807,7 +807,7 @@ { "16bit", "USE_RGB_COLOR", "", true, "16bit color support" }, { "mt32emu", "USE_MT32EMU", "", true, "integrated MT-32 emulator" }, { "nasm", "USE_NASM", "", true, "IA-32 assembly support" }, // This feature is special in the regard, that it needs additional handling. - { "opengl", "USE_OPENGL", "opengl32", true, "OpenGL support" }, + { "opengl", "USE_OPENGL", "opengl32", false, "OpenGL support" }, { "taskbar", "USE_TASKBAR", "", true, "Taskbar integration support" }, { "translation", "USE_TRANSLATION", "", true, "Translation support" }, { "vkeybd", "ENABLE_VKEYBD", "", false, "Virtual keyboard support"}, diff -Nru scummvm-1.4.0/devtools/tasmrecover/dreamweb/backdrop.asm scummvm-1.4.1/devtools/tasmrecover/dreamweb/backdrop.asm --- scummvm-1.4.0/devtools/tasmrecover/dreamweb/backdrop.asm 2011-09-30 11:04:23.000000000 +0000 +++ scummvm-1.4.1/devtools/tasmrecover/dreamweb/backdrop.asm 2012-01-14 09:28:25.000000000 +0000 @@ -1,4 +1,4 @@ -;Copyright (c) 1990-2011 by Neil Dodwell +;Copyright (c) 1990-2012 by Neil Dodwell ;Released with permission from Neil Dodwell under GPLv2 ;See LICENSE file for full license text ;----------------------------------------------Code to draw floor and panel---- diff -Nru scummvm-1.4.0/devtools/tasmrecover/dreamweb/debug.asm scummvm-1.4.1/devtools/tasmrecover/dreamweb/debug.asm --- scummvm-1.4.0/devtools/tasmrecover/dreamweb/debug.asm 2011-07-27 13:40:23.000000000 +0000 +++ scummvm-1.4.1/devtools/tasmrecover/dreamweb/debug.asm 2012-01-14 09:28:25.000000000 +0000 @@ -1,4 +1,4 @@ -;Copyright (c) 1990-2011 by Neil Dodwell +;Copyright (c) 1990-2012 by Neil Dodwell ;Released with permission from Neil Dodwell under GPLv2 ;See LICENSE file for full license text diff -Nru scummvm-1.4.0/devtools/tasmrecover/dreamweb/dreamweb.asm scummvm-1.4.1/devtools/tasmrecover/dreamweb/dreamweb.asm --- scummvm-1.4.0/devtools/tasmrecover/dreamweb/dreamweb.asm 2011-09-30 11:04:23.000000000 +0000 +++ scummvm-1.4.1/devtools/tasmrecover/dreamweb/dreamweb.asm 2012-01-14 09:28:43.000000000 +0000 @@ -1,4 +1,4 @@ -;Copyright (c) 1990-2011 by Neil Dodwell +;Copyright (c) 1990-2012 by Neil Dodwell ;Released with permission from Neil Dodwell under GPLv2 ;See LICENSE file for full license text diff -Nru scummvm-1.4.0/devtools/tasmrecover/dreamweb/keypad.asm scummvm-1.4.1/devtools/tasmrecover/dreamweb/keypad.asm --- scummvm-1.4.0/devtools/tasmrecover/dreamweb/keypad.asm 2011-09-30 11:04:23.000000000 +0000 +++ scummvm-1.4.1/devtools/tasmrecover/dreamweb/keypad.asm 2012-01-14 09:28:25.000000000 +0000 @@ -1,4 +1,4 @@ -;Copyright (c) 1990-2011 by Neil Dodwell +;Copyright (c) 1990-2012 by Neil Dodwell ;Released with permission from Neil Dodwell under GPLv2 ;See LICENSE file for full license text Entercode proc near diff -Nru scummvm-1.4.0/devtools/tasmrecover/dreamweb/look.asm scummvm-1.4.1/devtools/tasmrecover/dreamweb/look.asm --- scummvm-1.4.0/devtools/tasmrecover/dreamweb/look.asm 2011-09-30 11:04:23.000000000 +0000 +++ scummvm-1.4.1/devtools/tasmrecover/dreamweb/look.asm 2012-01-14 09:28:25.000000000 +0000 @@ -1,4 +1,4 @@ -;Copyright (c) 1990-2011 by Neil Dodwell +;Copyright (c) 1990-2012 by Neil Dodwell ;Released with permission from Neil Dodwell under GPLv2 ;See LICENSE file for full license text ;---------------------------------------------------------------Look-routine---- diff -Nru scummvm-1.4.0/devtools/tasmrecover/dreamweb/monitor.asm scummvm-1.4.1/devtools/tasmrecover/dreamweb/monitor.asm --- scummvm-1.4.0/devtools/tasmrecover/dreamweb/monitor.asm 2011-09-30 11:04:23.000000000 +0000 +++ scummvm-1.4.1/devtools/tasmrecover/dreamweb/monitor.asm 2012-01-14 09:28:25.000000000 +0000 @@ -1,4 +1,4 @@ -;Copyright (c) 1990-2011 by Neil Dodwell +;Copyright (c) 1990-2012 by Neil Dodwell ;Released with permission from Neil Dodwell under GPLv2 ;See LICENSE file for full license text Usemon proc near diff -Nru scummvm-1.4.0/devtools/tasmrecover/dreamweb/newplace.asm scummvm-1.4.1/devtools/tasmrecover/dreamweb/newplace.asm --- scummvm-1.4.0/devtools/tasmrecover/dreamweb/newplace.asm 2011-09-30 11:04:23.000000000 +0000 +++ scummvm-1.4.1/devtools/tasmrecover/dreamweb/newplace.asm 2012-01-14 09:28:25.000000000 +0000 @@ -1,4 +1,4 @@ -;Copyright (c) 1990-2011 by Neil Dodwell +;Copyright (c) 1990-2012 by Neil Dodwell ;Released with permission from Neil Dodwell under GPLv2 ;See LICENSE file for full license text ;----------------------------------------------------Choosing a new location---- diff -Nru scummvm-1.4.0/devtools/tasmrecover/dreamweb/object.asm scummvm-1.4.1/devtools/tasmrecover/dreamweb/object.asm --- scummvm-1.4.0/devtools/tasmrecover/dreamweb/object.asm 2011-09-30 11:04:23.000000000 +0000 +++ scummvm-1.4.1/devtools/tasmrecover/dreamweb/object.asm 2012-01-14 09:28:43.000000000 +0000 @@ -1,4 +1,4 @@ -;Copyright (c) 1990-2011 by Neil Dodwell +;Copyright (c) 1990-2012 by Neil Dodwell ;Released with permission from Neil Dodwell under GPLv2 ;See LICENSE file for full license text ;---------------------------------------------------------Inventory printer---- diff -Nru scummvm-1.4.0/devtools/tasmrecover/dreamweb/print.asm scummvm-1.4.1/devtools/tasmrecover/dreamweb/print.asm --- scummvm-1.4.0/devtools/tasmrecover/dreamweb/print.asm 2011-07-27 13:40:23.000000000 +0000 +++ scummvm-1.4.1/devtools/tasmrecover/dreamweb/print.asm 2012-01-14 09:28:25.000000000 +0000 @@ -1,4 +1,4 @@ -;Copyright (c) 1990-2011 by Neil Dodwell +;Copyright (c) 1990-2012 by Neil Dodwell ;Released with permission from Neil Dodwell under GPLv2 ;See LICENSE file for full license text Printchar proc near diff -Nru scummvm-1.4.0/devtools/tasmrecover/dreamweb/saveload.asm scummvm-1.4.1/devtools/tasmrecover/dreamweb/saveload.asm --- scummvm-1.4.0/devtools/tasmrecover/dreamweb/saveload.asm 2011-09-30 11:04:23.000000000 +0000 +++ scummvm-1.4.1/devtools/tasmrecover/dreamweb/saveload.asm 2012-01-14 09:28:43.000000000 +0000 @@ -1,4 +1,4 @@ -;Copyright (c) 1990-2011 by Neil Dodwell +;Copyright (c) 1990-2012 by Neil Dodwell ;Released with permission from Neil Dodwell under GPLv2 ;See LICENSE file for full license text diff -Nru scummvm-1.4.0/devtools/tasmrecover/dreamweb/sblaster.asm scummvm-1.4.1/devtools/tasmrecover/dreamweb/sblaster.asm --- scummvm-1.4.0/devtools/tasmrecover/dreamweb/sblaster.asm 2011-09-30 11:04:23.000000000 +0000 +++ scummvm-1.4.1/devtools/tasmrecover/dreamweb/sblaster.asm 2012-01-14 09:28:25.000000000 +0000 @@ -1,4 +1,4 @@ -;Copyright (c) 1990-2011 by Neil Dodwell +;Copyright (c) 1990-2012 by Neil Dodwell ;Released with permission from Neil Dodwell under GPLv2 ;See LICENSE file for full license text ; Creative Reality Sound Blaster Drivers . (C) 1994 Creative Reality diff -Nru scummvm-1.4.0/devtools/tasmrecover/dreamweb/sprite.asm scummvm-1.4.1/devtools/tasmrecover/dreamweb/sprite.asm --- scummvm-1.4.0/devtools/tasmrecover/dreamweb/sprite.asm 2011-09-30 11:04:23.000000000 +0000 +++ scummvm-1.4.1/devtools/tasmrecover/dreamweb/sprite.asm 2012-01-14 09:28:43.000000000 +0000 @@ -1,4 +1,4 @@ -;Copyright (c) 1990-2011 by Neil Dodwell +;Copyright (c) 1990-2012 by Neil Dodwell ;Released with permission from Neil Dodwell under GPLv2 ;See LICENSE file for full license text ;------------------------------------------------------------People Routines---- diff -Nru scummvm-1.4.0/devtools/tasmrecover/dreamweb/talk.asm scummvm-1.4.1/devtools/tasmrecover/dreamweb/talk.asm --- scummvm-1.4.0/devtools/tasmrecover/dreamweb/talk.asm 2011-09-30 11:04:23.000000000 +0000 +++ scummvm-1.4.1/devtools/tasmrecover/dreamweb/talk.asm 2012-01-14 09:28:25.000000000 +0000 @@ -1,4 +1,4 @@ -;Copyright (c) 1990-2011 by Neil Dodwell +;Copyright (c) 1990-2012 by Neil Dodwell ;Released with permission from Neil Dodwell under GPLv2 ;See LICENSE file for full license text Talk proc near diff -Nru scummvm-1.4.0/devtools/tasmrecover/dreamweb/titles.asm scummvm-1.4.1/devtools/tasmrecover/dreamweb/titles.asm --- scummvm-1.4.0/devtools/tasmrecover/dreamweb/titles.asm 2011-09-30 11:04:23.000000000 +0000 +++ scummvm-1.4.1/devtools/tasmrecover/dreamweb/titles.asm 2012-01-14 09:28:25.000000000 +0000 @@ -1,4 +1,4 @@ -;Copyright (c) 1990-2011 by Neil Dodwell +;Copyright (c) 1990-2012 by Neil Dodwell ;Released with permission from Neil Dodwell under GPLv2 ;See LICENSE file for full license text diff -Nru scummvm-1.4.0/devtools/tasmrecover/dreamweb/use.asm scummvm-1.4.1/devtools/tasmrecover/dreamweb/use.asm --- scummvm-1.4.0/devtools/tasmrecover/dreamweb/use.asm 2011-09-30 11:04:23.000000000 +0000 +++ scummvm-1.4.1/devtools/tasmrecover/dreamweb/use.asm 2012-01-14 09:28:25.000000000 +0000 @@ -1,4 +1,4 @@ -;Copyright (c) 1990-2011 by Neil Dodwell +;Copyright (c) 1990-2012 by Neil Dodwell ;Released with permission from Neil Dodwell under GPLv2 ;See LICENSE file for full license text diff -Nru scummvm-1.4.0/devtools/tasmrecover/dreamweb/vars.asm scummvm-1.4.1/devtools/tasmrecover/dreamweb/vars.asm --- scummvm-1.4.0/devtools/tasmrecover/dreamweb/vars.asm 2011-09-30 11:04:23.000000000 +0000 +++ scummvm-1.4.1/devtools/tasmrecover/dreamweb/vars.asm 2012-01-14 09:28:25.000000000 +0000 @@ -1,4 +1,4 @@ -;Copyright (c) 1990-2011 by Neil Dodwell +;Copyright (c) 1990-2012 by Neil Dodwell ;Released with permission from Neil Dodwell under GPLv2 ;See LICENSE file for full license text ;---------------------------------------------------Equates and definitions---- diff -Nru scummvm-1.4.0/devtools/tasmrecover/dreamweb/vgafades.asm scummvm-1.4.1/devtools/tasmrecover/dreamweb/vgafades.asm --- scummvm-1.4.0/devtools/tasmrecover/dreamweb/vgafades.asm 2011-09-30 11:04:23.000000000 +0000 +++ scummvm-1.4.1/devtools/tasmrecover/dreamweb/vgafades.asm 2012-01-14 09:28:25.000000000 +0000 @@ -1,4 +1,4 @@ -;Copyright (c) 1990-2011 by Neil Dodwell +;Copyright (c) 1990-2012 by Neil Dodwell ;Released with permission from Neil Dodwell under GPLv2 ;See LICENSE file for full license text Fadedos proc near diff -Nru scummvm-1.4.0/devtools/tasmrecover/dreamweb/vgagrafx.asm scummvm-1.4.1/devtools/tasmrecover/dreamweb/vgagrafx.asm --- scummvm-1.4.0/devtools/tasmrecover/dreamweb/vgagrafx.asm 2011-09-30 11:04:23.000000000 +0000 +++ scummvm-1.4.1/devtools/tasmrecover/dreamweb/vgagrafx.asm 2012-01-14 09:28:25.000000000 +0000 @@ -1,4 +1,4 @@ -;Copyright (c) 1990-2011 by Neil Dodwell +;Copyright (c) 1990-2012 by Neil Dodwell ;Released with permission from Neil Dodwell under GPLv2 ;See LICENSE file for full license text Screenwidth equ 320 ;physical width of screen diff -Nru scummvm-1.4.0/dists/android/AndroidManifest.xml scummvm-1.4.1/dists/android/AndroidManifest.xml --- scummvm-1.4.0/dists/android/AndroidManifest.xml 2011-11-03 18:06:46.000000000 +0000 +++ scummvm-1.4.1/dists/android/AndroidManifest.xml 2012-01-14 09:28:43.000000000 +0000 @@ -4,7 +4,7 @@ diff -Nru scummvm-1.4.0/dists/android/plugin-manifest.xml scummvm-1.4.1/dists/android/plugin-manifest.xml --- scummvm-1.4.0/dists/android/plugin-manifest.xml 2011-11-03 18:06:46.000000000 +0000 +++ scummvm-1.4.1/dists/android/plugin-manifest.xml 2012-01-14 09:28:43.000000000 +0000 @@ -3,7 +3,7 @@ diff -Nru scummvm-1.4.0/dists/codeblocks/agi.cbp scummvm-1.4.1/dists/codeblocks/agi.cbp --- scummvm-1.4.0/dists/codeblocks/agi.cbp 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/codeblocks/agi.cbp 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,157 @@ + + + + + + \ No newline at end of file diff -Nru scummvm-1.4.0/dists/codeblocks/agos.cbp scummvm-1.4.1/dists/codeblocks/agos.cbp --- scummvm-1.4.0/dists/codeblocks/agos.cbp 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/codeblocks/agos.cbp 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,156 @@ + + + + + + \ No newline at end of file diff -Nru scummvm-1.4.0/dists/codeblocks/cine.cbp scummvm-1.4.1/dists/codeblocks/cine.cbp --- scummvm-1.4.0/dists/codeblocks/cine.cbp 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/codeblocks/cine.cbp 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,134 @@ + + + + + + \ No newline at end of file diff -Nru scummvm-1.4.0/dists/codeblocks/cruise.cbp scummvm-1.4.1/dists/codeblocks/cruise.cbp --- scummvm-1.4.0/dists/codeblocks/cruise.cbp 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/codeblocks/cruise.cbp 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,152 @@ + + + + + + \ No newline at end of file diff -Nru scummvm-1.4.0/dists/codeblocks/draci.cbp scummvm-1.4.1/dists/codeblocks/draci.cbp --- scummvm-1.4.0/dists/codeblocks/draci.cbp 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/codeblocks/draci.cbp 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,124 @@ + + + + + + \ No newline at end of file diff -Nru scummvm-1.4.0/dists/codeblocks/drascula.cbp scummvm-1.4.1/dists/codeblocks/drascula.cbp --- scummvm-1.4.0/dists/codeblocks/drascula.cbp 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/codeblocks/drascula.cbp 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,110 @@ + + + + + + \ No newline at end of file diff -Nru scummvm-1.4.0/dists/codeblocks/gob.cbp scummvm-1.4.1/dists/codeblocks/gob.cbp --- scummvm-1.4.0/dists/codeblocks/gob.cbp 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/codeblocks/gob.cbp 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,245 @@ + + + + + + \ No newline at end of file diff -Nru scummvm-1.4.0/dists/codeblocks/groovie.cbp scummvm-1.4.1/dists/codeblocks/groovie.cbp --- scummvm-1.4.0/dists/codeblocks/groovie.cbp 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/codeblocks/groovie.cbp 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,123 @@ + + + + + + \ No newline at end of file diff -Nru scummvm-1.4.0/dists/codeblocks/hugo.cbp scummvm-1.4.1/dists/codeblocks/hugo.cbp --- scummvm-1.4.0/dists/codeblocks/hugo.cbp 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/codeblocks/hugo.cbp 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,138 @@ + + + + + + \ No newline at end of file diff -Nru scummvm-1.4.0/dists/codeblocks/kyra.cbp scummvm-1.4.1/dists/codeblocks/kyra.cbp --- scummvm-1.4.0/dists/codeblocks/kyra.cbp 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/codeblocks/kyra.cbp 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,215 @@ + + + + + + \ No newline at end of file diff -Nru scummvm-1.4.0/dists/codeblocks/lure.cbp scummvm-1.4.1/dists/codeblocks/lure.cbp --- scummvm-1.4.0/dists/codeblocks/lure.cbp 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/codeblocks/lure.cbp 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,137 @@ + + + + + + \ No newline at end of file diff -Nru scummvm-1.4.0/dists/codeblocks/made.cbp scummvm-1.4.1/dists/codeblocks/made.cbp --- scummvm-1.4.0/dists/codeblocks/made.cbp 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/codeblocks/made.cbp 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,120 @@ + + + + + + \ No newline at end of file diff -Nru scummvm-1.4.0/dists/codeblocks/mohawk.cbp scummvm-1.4.1/dists/codeblocks/mohawk.cbp --- scummvm-1.4.0/dists/codeblocks/mohawk.cbp 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/codeblocks/mohawk.cbp 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,121 @@ + + + + + + \ No newline at end of file diff -Nru scummvm-1.4.0/dists/codeblocks/parallaction.cbp scummvm-1.4.1/dists/codeblocks/parallaction.cbp --- scummvm-1.4.0/dists/codeblocks/parallaction.cbp 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/codeblocks/parallaction.cbp 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,138 @@ + + + + + + \ No newline at end of file diff -Nru scummvm-1.4.0/dists/codeblocks/queen.cbp scummvm-1.4.1/dists/codeblocks/queen.cbp --- scummvm-1.4.0/dists/codeblocks/queen.cbp 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/codeblocks/queen.cbp 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,134 @@ + + + + + + \ No newline at end of file diff -Nru scummvm-1.4.0/dists/codeblocks/saga.cbp scummvm-1.4.1/dists/codeblocks/saga.cbp --- scummvm-1.4.0/dists/codeblocks/saga.cbp 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/codeblocks/saga.cbp 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,153 @@ + + + + + + \ No newline at end of file diff -Nru scummvm-1.4.0/dists/codeblocks/sci.cbp scummvm-1.4.1/dists/codeblocks/sci.cbp --- scummvm-1.4.0/dists/codeblocks/sci.cbp 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/codeblocks/sci.cbp 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,220 @@ + + + + + + \ No newline at end of file diff -Nru scummvm-1.4.0/dists/codeblocks/scumm.cbp scummvm-1.4.1/dists/codeblocks/scumm.cbp --- scummvm-1.4.0/dists/codeblocks/scumm.cbp 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/codeblocks/scumm.cbp 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,276 @@ + + + + + + \ No newline at end of file diff -Nru scummvm-1.4.0/dists/codeblocks/scummvm.cbp scummvm-1.4.1/dists/codeblocks/scummvm.cbp --- scummvm-1.4.0/dists/codeblocks/scummvm.cbp 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/codeblocks/scummvm.cbp 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,652 @@ + + + + + + \ No newline at end of file diff -Nru scummvm-1.4.0/dists/codeblocks/scummvm.workspace scummvm-1.4.1/dists/codeblocks/scummvm.workspace --- scummvm-1.4.0/dists/codeblocks/scummvm.workspace 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/codeblocks/scummvm.workspace 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -Nru scummvm-1.4.0/dists/codeblocks/sky.cbp scummvm-1.4.1/dists/codeblocks/sky.cbp --- scummvm-1.4.0/dists/codeblocks/sky.cbp 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/codeblocks/sky.cbp 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,137 @@ + + + + + + \ No newline at end of file diff -Nru scummvm-1.4.0/dists/codeblocks/sword1.cbp scummvm-1.4.1/dists/codeblocks/sword1.cbp --- scummvm-1.4.0/dists/codeblocks/sword1.cbp 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/codeblocks/sword1.cbp 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,133 @@ + + + + + + \ No newline at end of file diff -Nru scummvm-1.4.0/dists/codeblocks/sword2.cbp scummvm-1.4.1/dists/codeblocks/sword2.cbp --- scummvm-1.4.0/dists/codeblocks/sword2.cbp 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/codeblocks/sword2.cbp 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,143 @@ + + + + + + \ No newline at end of file diff -Nru scummvm-1.4.0/dists/codeblocks/teenagent.cbp scummvm-1.4.1/dists/codeblocks/teenagent.cbp --- scummvm-1.4.0/dists/codeblocks/teenagent.cbp 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/codeblocks/teenagent.cbp 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,125 @@ + + + + + + \ No newline at end of file diff -Nru scummvm-1.4.0/dists/codeblocks/tinsel.cbp scummvm-1.4.1/dists/codeblocks/tinsel.cbp --- scummvm-1.4.0/dists/codeblocks/tinsel.cbp 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/codeblocks/tinsel.cbp 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,185 @@ + + + + + + \ No newline at end of file diff -Nru scummvm-1.4.0/dists/codeblocks/toon.cbp scummvm-1.4.1/dists/codeblocks/toon.cbp --- scummvm-1.4.0/dists/codeblocks/toon.cbp 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/codeblocks/toon.cbp 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,132 @@ + + + + + + \ No newline at end of file diff -Nru scummvm-1.4.0/dists/codeblocks/touche.cbp scummvm-1.4.1/dists/codeblocks/touche.cbp --- scummvm-1.4.0/dists/codeblocks/touche.cbp 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/codeblocks/touche.cbp 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,107 @@ + + + + + + \ No newline at end of file diff -Nru scummvm-1.4.0/dists/codeblocks/tsage.cbp scummvm-1.4.1/dists/codeblocks/tsage.cbp --- scummvm-1.4.0/dists/codeblocks/tsage.cbp 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/codeblocks/tsage.cbp 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,173 @@ + + + + + + \ No newline at end of file diff -Nru scummvm-1.4.0/dists/codeblocks/tucker.cbp scummvm-1.4.1/dists/codeblocks/tucker.cbp --- scummvm-1.4.0/dists/codeblocks/tucker.cbp 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/codeblocks/tucker.cbp 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,105 @@ + + + + + + \ No newline at end of file diff -Nru scummvm-1.4.0/dists/iphone/Info.plist scummvm-1.4.1/dists/iphone/Info.plist --- scummvm-1.4.0/dists/iphone/Info.plist 2011-11-03 18:06:46.000000000 +0000 +++ scummvm-1.4.1/dists/iphone/Info.plist 2012-01-14 09:28:43.000000000 +0000 @@ -15,11 +15,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.4.0 + 1.4.1 CFBundleSignature ???? CFBundleVersion - 1.4.0 + 1.4.1 CFBundleIconFile icon.png CFBundleIconFiles diff -Nru scummvm-1.4.0/dists/irix/scummvm.spec scummvm-1.4.1/dists/irix/scummvm.spec --- scummvm-1.4.0/dists/irix/scummvm.spec 2011-11-03 18:06:46.000000000 +0000 +++ scummvm-1.4.1/dists/irix/scummvm.spec 2012-01-14 09:28:43.000000000 +0000 @@ -1,5 +1,5 @@ product scummvm - id "ScummVM 1.4.0" + id "ScummVM 1.4.1" image sw id "software" version 18 diff -Nru scummvm-1.4.0/dists/macosx/Info.plist scummvm-1.4.1/dists/macosx/Info.plist --- scummvm-1.4.0/dists/macosx/Info.plist 2011-11-03 18:06:46.000000000 +0000 +++ scummvm-1.4.1/dists/macosx/Info.plist 2012-01-14 09:28:43.000000000 +0000 @@ -28,7 +28,7 @@ CFBundleExecutable scummvm CFBundleGetInfoString - 1.4.0, Copyright 2001-2011 The ScummVM team + 1.4.1, Copyright 2001-2012 The ScummVM team CFBundleIconFile scummvm.icns CFBundleIdentifier @@ -40,13 +40,13 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.4.0 + 1.4.1 CFBundleVersion - 1.4.0 + 1.4.1 NSPrincipalClass NSApplication NSHumanReadableCopyright - Copyright 2001-2011 The ScummVM team + Copyright 2001-2012 The ScummVM team SUFeedURL http://www.scummvm.org/appcasts/macosx/release.xml SUPublicDSAKeyFile diff -Nru scummvm-1.4.0/dists/macosx/Info.plist.in scummvm-1.4.1/dists/macosx/Info.plist.in --- scummvm-1.4.0/dists/macosx/Info.plist.in 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/dists/macosx/Info.plist.in 2012-01-14 09:28:25.000000000 +0000 @@ -28,7 +28,7 @@ CFBundleExecutable scummvm CFBundleGetInfoString - @VERSION@, Copyright 2001-2011 The ScummVM team + @VERSION@, Copyright 2001-2012 The ScummVM team CFBundleIconFile scummvm.icns CFBundleIdentifier @@ -46,7 +46,7 @@ NSPrincipalClass NSApplication NSHumanReadableCopyright - Copyright 2001-2011 The ScummVM team + Copyright 2001-2012 The ScummVM team SUFeedURL http://www.scummvm.org/appcasts/macosx/release.xml SUPublicDSAKeyFile diff -Nru scummvm-1.4.0/dists/msvc10/agi.vcxproj scummvm-1.4.1/dists/msvc10/agi.vcxproj --- scummvm-1.4.0/dists/msvc10/agi.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/agi.vcxproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,185 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Analysis + Win32 + + + Analysis + x64 + + + Release + Win32 + + + Release + x64 + + + + {E4478496-985F-4E36-8FF6-2C91B6783506} + agi + Win32Proj + + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 4510;4610;;%(DisableSpecificWarnings) + + + + + 4510;4610;;%(DisableSpecificWarnings) + + + + + 4510;4610;;%(DisableSpecificWarnings) + + + + + 4510;4610;;%(DisableSpecificWarnings) + + + + + 4510;4610;;%(DisableSpecificWarnings) + + + + + 4510;4610;;%(DisableSpecificWarnings) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc10/agos.vcxproj scummvm-1.4.1/dists/msvc10/agos.vcxproj --- scummvm-1.4.0/dists/msvc10/agos.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/agos.vcxproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,184 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Analysis + Win32 + + + Analysis + x64 + + + Release + Win32 + + + Release + x64 + + + + {4D36B920-3E5D-43B0-9C18-851AD09AB17C} + agos + Win32Proj + + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 4511;;%(DisableSpecificWarnings) + + + + + 4511;;%(DisableSpecificWarnings) + + + + + 4511;;%(DisableSpecificWarnings) + + + + + 4511;;%(DisableSpecificWarnings) + + + + + 4511;;%(DisableSpecificWarnings) + + + + + 4511;;%(DisableSpecificWarnings) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc10/cine.vcxproj scummvm-1.4.1/dists/msvc10/cine.vcxproj --- scummvm-1.4.0/dists/msvc10/cine.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/cine.vcxproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,132 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Analysis + Win32 + + + Analysis + x64 + + + Release + Win32 + + + Release + x64 + + + + {ECEE1CD1-0C1A-4BC9-81F9-3E5498B1CD35} + cine + Win32Proj + + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc10/cruise.vcxproj scummvm-1.4.1/dists/msvc10/cruise.vcxproj --- scummvm-1.4.0/dists/msvc10/cruise.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/cruise.vcxproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,150 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Analysis + Win32 + + + Analysis + x64 + + + Release + Win32 + + + Release + x64 + + + + {9BC256D4-59C5-4070-86AB-BD914E922F62} + cruise + Win32Proj + + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc10/draci.vcxproj scummvm-1.4.1/dists/msvc10/draci.vcxproj --- scummvm-1.4.0/dists/msvc10/draci.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/draci.vcxproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,122 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Analysis + Win32 + + + Analysis + x64 + + + Release + Win32 + + + Release + x64 + + + + {2771BF19-83C7-4E48-9777-7593DF6BAE59} + draci + Win32Proj + + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc10/drascula.vcxproj scummvm-1.4.1/dists/msvc10/drascula.vcxproj --- scummvm-1.4.0/dists/msvc10/drascula.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/drascula.vcxproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,108 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Analysis + Win32 + + + Analysis + x64 + + + Release + Win32 + + + Release + x64 + + + + {B7DF84D9-85A1-477F-91CC-4EAA9C420507} + drascula + Win32Proj + + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc10/gob.vcxproj scummvm-1.4.1/dists/msvc10/gob.vcxproj --- scummvm-1.4.0/dists/msvc10/gob.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/gob.vcxproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,243 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Analysis + Win32 + + + Analysis + x64 + + + Release + Win32 + + + Release + x64 + + + + {FB8AD6E0-3F35-4AF2-BFAD-BA41A3B794E0} + gob + Win32Proj + + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc10/gob.vcxproj.filters scummvm-1.4.1/dists/msvc10/gob.vcxproj.filters --- scummvm-1.4.0/dists/msvc10/gob.vcxproj.filters 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/gob.vcxproj.filters 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,283 @@ + + + + + AE9FA1E9-B2B1-448C-9AA3-13115643D262 + + + 65566F1C-63F0-482D-9E34-79219A4ECCBE + + + DAD2253A-EEBC-43EC-B8AD-4E5570AE3FE0 + + + F2EB8F60-4080-43E3-BFFE-A1F110616C8C + + + FE43A3B9-695E-4CE9-8357-9DEFED3C47E4 + + + + + demos + + + demos + + + demos + + + minigames\geisha + + + minigames\geisha + + + minigames\geisha + + + save + + + save + + + save + + + save + + + save + + + save + + + save + + + save + + + save + + + save + + + save + + + save + + + save + + + save + + + save + + + save + + + sound + + + sound + + + sound + + + sound + + + sound + + + sound + + + sound + + + sound + + + sound + + + sound + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + demos + + + demos + + + demos + + + minigames\geisha + + + minigames\geisha + + + minigames\geisha + + + save + + + save + + + save + + + save + + + sound + + + sound + + + sound + + + sound + + + sound + + + sound + + + sound + + + sound + + + sound + + + sound + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -Nru scummvm-1.4.0/dists/msvc10/groovie.vcxproj scummvm-1.4.1/dists/msvc10/groovie.vcxproj --- scummvm-1.4.0/dists/msvc10/groovie.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/groovie.vcxproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,121 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Analysis + Win32 + + + Analysis + x64 + + + Release + Win32 + + + Release + x64 + + + + {1B25D9EA-9A6E-46C1-A4F8-91AFD1B01943} + groovie + Win32Proj + + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc10/hugo.vcxproj scummvm-1.4.1/dists/msvc10/hugo.vcxproj --- scummvm-1.4.0/dists/msvc10/hugo.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/hugo.vcxproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,136 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Analysis + Win32 + + + Analysis + x64 + + + Release + Win32 + + + Release + x64 + + + + {E0F58DCE-862B-4927-9AE5-D488C16D85F2} + hugo + Win32Proj + + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc10/kyra.vcxproj scummvm-1.4.1/dists/msvc10/kyra.vcxproj --- scummvm-1.4.0/dists/msvc10/kyra.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/kyra.vcxproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,243 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Analysis + Win32 + + + Analysis + x64 + + + Release + Win32 + + + Release + x64 + + + + {2569F220-FD8F-4503-8EFB-6DA01E6E37B6} + kyra + Win32Proj + + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 4355;;%(DisableSpecificWarnings) + + + + + 4355;;%(DisableSpecificWarnings) + + + + + 4355;;%(DisableSpecificWarnings) + + + + + 4355;;%(DisableSpecificWarnings) + + + + + 4355;;%(DisableSpecificWarnings) + + + + + 4355;;%(DisableSpecificWarnings) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc10/lure.vcxproj scummvm-1.4.1/dists/msvc10/lure.vcxproj --- scummvm-1.4.0/dists/msvc10/lure.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/lure.vcxproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,165 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Analysis + Win32 + + + Analysis + x64 + + + Release + Win32 + + + Release + x64 + + + + {99D5E3AB-8D81-45F6-AFF8-A36D69DBCB30} + lure + Win32Proj + + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 4189;4355;;%(DisableSpecificWarnings) + + + + + 4189;4355;;%(DisableSpecificWarnings) + + + + + 4189;4355;;%(DisableSpecificWarnings) + + + + + 4189;4355;;%(DisableSpecificWarnings) + + + + + 4189;4355;;%(DisableSpecificWarnings) + + + + + 4189;4355;;%(DisableSpecificWarnings) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc10/made.vcxproj scummvm-1.4.1/dists/msvc10/made.vcxproj --- scummvm-1.4.0/dists/msvc10/made.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/made.vcxproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,118 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Analysis + Win32 + + + Analysis + x64 + + + Release + Win32 + + + Release + x64 + + + + {49B1C14A-4F84-4047-B1AF-EE54401F8DAB} + made + Win32Proj + + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc10/mohawk.vcxproj scummvm-1.4.1/dists/msvc10/mohawk.vcxproj --- scummvm-1.4.0/dists/msvc10/mohawk.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/mohawk.vcxproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,119 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Analysis + Win32 + + + Analysis + x64 + + + Release + Win32 + + + Release + x64 + + + + {214953C2-4A67-488D-B097-06A814303A5E} + mohawk + Win32Proj + + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc10/parallaction.vcxproj scummvm-1.4.1/dists/msvc10/parallaction.vcxproj --- scummvm-1.4.0/dists/msvc10/parallaction.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/parallaction.vcxproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,136 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Analysis + Win32 + + + Analysis + x64 + + + Release + Win32 + + + Release + x64 + + + + {B2826ABA-B6C8-49F5-8949-5C5362DAD773} + parallaction + Win32Proj + + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc10/queen.vcxproj scummvm-1.4.1/dists/msvc10/queen.vcxproj --- scummvm-1.4.0/dists/msvc10/queen.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/queen.vcxproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,132 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Analysis + Win32 + + + Analysis + x64 + + + Release + Win32 + + + Release + x64 + + + + {C7EF81D6-60E5-4996-9106-1D661BA6D901} + queen + Win32Proj + + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc10/saga.vcxproj scummvm-1.4.1/dists/msvc10/saga.vcxproj --- scummvm-1.4.0/dists/msvc10/saga.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/saga.vcxproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,151 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Analysis + Win32 + + + Analysis + x64 + + + Release + Win32 + + + Release + x64 + + + + {3C54ED04-97FE-42D8-ADA0-F7D6C5DBAD85} + saga + Win32Proj + + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc10/sci.vcxproj scummvm-1.4.1/dists/msvc10/sci.vcxproj --- scummvm-1.4.0/dists/msvc10/sci.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/sci.vcxproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,218 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Analysis + Win32 + + + Analysis + x64 + + + Release + Win32 + + + Release + x64 + + + + {CE04161A-0A9D-4C08-BB2A-D04DE62D6393} + sci + Win32Proj + + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc10/sci.vcxproj.filters scummvm-1.4.1/dists/msvc10/sci.vcxproj.filters --- scummvm-1.4.0/dists/msvc10/sci.vcxproj.filters 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/sci.vcxproj.filters 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,377 @@ + + + + + 4150A31A-585C-457E-A74E-C227D50E3B73 + + + 610EC2B1-E1F2-4FC8-8FD3-A07497A58FC6 + + + AD3E7DD8-D69E-4B30-AF7A-C769B0402920 + + + 06C0286F-137E-4C9C-A45B-D812315B8191 + + + 86248B92-2D26-4BE3-9575-740A88CAD25A + + + 13602366-6F47-410E-9443-EE82493A5380 + + + + + engine + + + engine + + + engine + + + engine + + + engine + + + engine + + + engine + + + engine + + + engine + + + engine + + + engine + + + engine + + + engine + + + engine + + + engine + + + engine + + + engine + + + engine + + + engine + + + engine + + + engine + + + engine + + + engine + + + engine + + + engine + + + engine + + + engine + + + engine + + + engine + + + engine + + + engine + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + parser + + + parser + + + parser + + + sound\drivers + + + sound\drivers + + + sound\drivers + + + sound\drivers + + + sound\drivers + + + sound\drivers + + + sound + + + sound + + + sound + + + sound + + + + video + + + + + + + + + + + + engine + + + engine + + + engine + + + engine + + + engine + + + engine + + + engine + + + engine + + + engine + + + engine + + + engine + + + engine + + + engine + + + engine + + + engine + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + parser + + + sound\drivers + + + sound\drivers + + + sound\drivers + + + sound + + + sound + + + sound + + + sound + + + video + + + + + + + + + + + + + + + \ No newline at end of file diff -Nru scummvm-1.4.0/dists/msvc10/scumm.vcxproj scummvm-1.4.1/dists/msvc10/scumm.vcxproj --- scummvm-1.4.0/dists/msvc10/scumm.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/scumm.vcxproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,274 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Analysis + Win32 + + + Analysis + x64 + + + Release + Win32 + + + Release + x64 + + + + {EA21EDE2-1EF4-4CA3-8E0F-3C799AB2BA04} + scumm + Win32Proj + + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc10/scumm.vcxproj.filters scummvm-1.4.1/dists/msvc10/scumm.vcxproj.filters --- scummvm-1.4.0/dists/msvc10/scumm.vcxproj.filters 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/scumm.vcxproj.filters 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,371 @@ + + + + + 9975C736-3C05-4514-A363-F2467027E494 + + + 465A2B34-8AD6-4782-A502-3023FCBA9496 + + + 22EC0DC6-C4E5-4DCD-9258-350184D1B193 + + + 7F3894E2-97AB-4B42-A87B-9685BB665C29 + + + 2D751652-06AA-4E64-8EB9-D2E70BC9E289 + + + FEEC4DD2-5100-47C9-A1E5-D3B60A288E6A + + + + + he\logic + + + he\logic + + + he\logic + + + he\logic + + + he\logic + + + he\logic + + + he\logic + + + he + + + he + + + he + + + he + + + he + + + he + + + he + + + he + + + he + + + he + + + he + + + he + + + he + + + he + + + he + + + he + + + imuse + + + imuse + + + imuse + + + imuse + + + imuse + + + imuse + + + imuse + + + imuse_digi + + + imuse_digi + + + imuse_digi + + + imuse_digi + + + imuse_digi + + + imuse_digi + + + imuse_digi + + + imuse_digi + + + insane + + + insane + + + insane + + + insane + + + insane + + + smush + + + smush + + + smush + + + smush + + + smush + + + smush + + + smush + + + smush + + + smush + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + he + + + he + + + he + + + he + + + he + + + he + + + he + + + he + + + he + + + imuse + + + imuse + + + imuse + + + imuse + + + imuse + + + imuse_digi + + + imuse_digi + + + imuse_digi + + + imuse_digi + + + imuse_digi + + + imuse_digi + + + insane + + + smush + + + smush + + + smush + + + smush + + + smush + + + smush + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -Nru scummvm-1.4.0/dists/msvc10/ScummVM_Analysis64.props scummvm-1.4.1/dists/msvc10/ScummVM_Analysis64.props --- scummvm-1.4.0/dists/msvc10/ScummVM_Analysis64.props 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/ScummVM_Analysis64.props 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,28 @@ + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>ScummVM_Analysis64 + true + + + + Disabled + WIN32;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + false + ProgramDatabase + true + + + true + libcmt.lib;%(IgnoreSpecificDefaultLibraries) + + + diff -Nru scummvm-1.4.0/dists/msvc10/ScummVM_Analysis.props scummvm-1.4.1/dists/msvc10/ScummVM_Analysis.props --- scummvm-1.4.0/dists/msvc10/ScummVM_Analysis.props 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/ScummVM_Analysis.props 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,28 @@ + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>ScummVM_Analysis32 + true + + + + Disabled + WIN32;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + false + EditAndContinue + true + + + true + libcmt.lib;%(IgnoreSpecificDefaultLibraries) + + + diff -Nru scummvm-1.4.0/dists/msvc10/ScummVM_Debug64.props scummvm-1.4.1/dists/msvc10/ScummVM_Debug64.props --- scummvm-1.4.0/dists/msvc10/ScummVM_Debug64.props 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/ScummVM_Debug64.props 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,28 @@ + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>ScummVM_Debug64 + true + + + + Disabled + WIN32;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + false + ProgramDatabase + false + + + true + libcmt.lib;%(IgnoreSpecificDefaultLibraries) + + + diff -Nru scummvm-1.4.0/dists/msvc10/ScummVM_Debug.props scummvm-1.4.1/dists/msvc10/ScummVM_Debug.props --- scummvm-1.4.0/dists/msvc10/ScummVM_Debug.props 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/ScummVM_Debug.props 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,28 @@ + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>ScummVM_Debug32 + true + + + + Disabled + WIN32;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + false + EditAndContinue + false + + + true + libcmt.lib;%(IgnoreSpecificDefaultLibraries) + + + diff -Nru scummvm-1.4.0/dists/msvc10/ScummVM_Global64.props scummvm-1.4.1/dists/msvc10/ScummVM_Global64.props --- scummvm-1.4.0/dists/msvc10/ScummVM_Global64.props 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/ScummVM_Global64.props 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,33 @@ + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>ScummVM_Global + $(SCUMMVM_LIBS)\bin;$(ExecutablePath) + $(SCUMMVM_LIBS)\lib\x64;$(LibraryPath) + $(SCUMMVM_LIBS)\include;$(IncludePath) + $(Configuration)64\ + $(Configuration)64/$(ProjectName)\ + + + + true + 4068;4100;4103;4127;4244;4250;4310;4351;4512;4702;4706;4800;4996;6204;6211;6385;6386;;%(DisableSpecificWarnings) + $(SCUMMVM_LIBS)\include;..\..;..\..\engines;$(TargetDir);%(AdditionalIncludeDirectories) + USE_ZLIB;USE_MAD;USE_VORBIS;USE_FLAC;USE_PNG;USE_THEORADEC;USE_BINK;USE_SCALERS;USE_HQ_SCALERS;USE_RGB_COLOR;USE_MT32EMU;USE_TASKBAR;USE_TRANSLATION;USE_DETECTLANG;ENABLE_SCUMM;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_AGI;ENABLE_AGOS;ENABLE_AGOS2;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRACI;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_GROOVIE;ENABLE_HUGO;ENABLE_KYRA;ENABLE_LOL;ENABLE_LURE;ENABLE_MADE;ENABLE_MOHAWK;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_IHNM;ENABLE_SCI;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TEENAGENT;ENABLE_TINSEL;ENABLE_TOON;ENABLE_TOUCHE;ENABLE_TSAGE;ENABLE_TUCKER;WIN32;SDL_BACKEND;%(PreprocessorDefinitions) + + false + Level4 + false + Default + + + %(IgnoreSpecificDefaultLibraries) + Console + WinMainCRTStartup + + + ..\..;%(AdditionalIncludeDirectories) + + + diff -Nru scummvm-1.4.0/dists/msvc10/ScummVM_Global.props scummvm-1.4.1/dists/msvc10/ScummVM_Global.props --- scummvm-1.4.0/dists/msvc10/ScummVM_Global.props 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/ScummVM_Global.props 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,33 @@ + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>ScummVM_Global + $(SCUMMVM_LIBS)\bin;$(ExecutablePath) + $(SCUMMVM_LIBS)\lib\x86;$(LibraryPath) + $(SCUMMVM_LIBS)\include;$(IncludePath) + $(Configuration)32\ + $(Configuration)32/$(ProjectName)\ + + + + true + 4068;4100;4103;4127;4244;4250;4310;4351;4512;4702;4706;4800;4996;6204;6211;6385;6386;;%(DisableSpecificWarnings) + $(SCUMMVM_LIBS)\include;..\..;..\..\engines;$(TargetDir);%(AdditionalIncludeDirectories) + USE_ZLIB;USE_MAD;USE_VORBIS;USE_FLAC;USE_PNG;USE_THEORADEC;USE_BINK;USE_SCALERS;USE_HQ_SCALERS;USE_RGB_COLOR;USE_MT32EMU;USE_NASM;USE_TASKBAR;USE_TRANSLATION;USE_DETECTLANG;ENABLE_SCUMM;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_AGI;ENABLE_AGOS;ENABLE_AGOS2;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRACI;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_GROOVIE;ENABLE_HUGO;ENABLE_KYRA;ENABLE_LOL;ENABLE_LURE;ENABLE_MADE;ENABLE_MOHAWK;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_IHNM;ENABLE_SCI;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TEENAGENT;ENABLE_TINSEL;ENABLE_TOON;ENABLE_TOUCHE;ENABLE_TSAGE;ENABLE_TUCKER;WIN32;SDL_BACKEND;%(PreprocessorDefinitions) + + false + Level4 + false + Default + + + %(IgnoreSpecificDefaultLibraries) + Console + WinMainCRTStartup + + + ..\..;%(AdditionalIncludeDirectories) + + + diff -Nru scummvm-1.4.0/dists/msvc10/ScummVM_Release64.props scummvm-1.4.1/dists/msvc10/ScummVM_Release64.props --- scummvm-1.4.0/dists/msvc10/ScummVM_Release64.props 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/ScummVM_Release64.props 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,27 @@ + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>ScummVM_Release64 + false + + + + true + true + WIN32;RELEASE_BUILD;%(PreprocessorDefinitions) + true + false + + MultiThreaded + false + + + %(IgnoreSpecificDefaultLibraries) + true + + + diff -Nru scummvm-1.4.0/dists/msvc10/ScummVM_Release.props scummvm-1.4.1/dists/msvc10/ScummVM_Release.props --- scummvm-1.4.0/dists/msvc10/ScummVM_Release.props 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/ScummVM_Release.props 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,27 @@ + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>ScummVM_Release32 + false + + + + true + true + WIN32;RELEASE_BUILD;%(PreprocessorDefinitions) + true + false + + MultiThreaded + false + + + %(IgnoreSpecificDefaultLibraries) + true + + + diff -Nru scummvm-1.4.0/dists/msvc10/scummvm.sln scummvm-1.4.1/dists/msvc10/scummvm.sln --- scummvm-1.4.0/dists/msvc10/scummvm.sln 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/scummvm.sln 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,409 @@ +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{34C4556A-6E68-4597-B18F-56A7228D120D}") = "scummvm", "scummvm.vcxproj", "{45167257-FD0B-4A77-AA14-E343E8EF652A}" +EndProject +Project("{34C4556A-6E68-4597-B18F-56A7228D120D}") = "agi", "agi.vcxproj", "{E4478496-985F-4E36-8FF6-2C91B6783506}" +EndProject +Project("{34C4556A-6E68-4597-B18F-56A7228D120D}") = "agos", "agos.vcxproj", "{4D36B920-3E5D-43B0-9C18-851AD09AB17C}" +EndProject +Project("{34C4556A-6E68-4597-B18F-56A7228D120D}") = "cine", "cine.vcxproj", "{ECEE1CD1-0C1A-4BC9-81F9-3E5498B1CD35}" +EndProject +Project("{34C4556A-6E68-4597-B18F-56A7228D120D}") = "cruise", "cruise.vcxproj", "{9BC256D4-59C5-4070-86AB-BD914E922F62}" +EndProject +Project("{34C4556A-6E68-4597-B18F-56A7228D120D}") = "draci", "draci.vcxproj", "{2771BF19-83C7-4E48-9777-7593DF6BAE59}" +EndProject +Project("{34C4556A-6E68-4597-B18F-56A7228D120D}") = "drascula", "drascula.vcxproj", "{B7DF84D9-85A1-477F-91CC-4EAA9C420507}" +EndProject +Project("{34C4556A-6E68-4597-B18F-56A7228D120D}") = "gob", "gob.vcxproj", "{FB8AD6E0-3F35-4AF2-BFAD-BA41A3B794E0}" +EndProject +Project("{34C4556A-6E68-4597-B18F-56A7228D120D}") = "groovie", "groovie.vcxproj", "{1B25D9EA-9A6E-46C1-A4F8-91AFD1B01943}" +EndProject +Project("{34C4556A-6E68-4597-B18F-56A7228D120D}") = "hugo", "hugo.vcxproj", "{E0F58DCE-862B-4927-9AE5-D488C16D85F2}" +EndProject +Project("{34C4556A-6E68-4597-B18F-56A7228D120D}") = "kyra", "kyra.vcxproj", "{2569F220-FD8F-4503-8EFB-6DA01E6E37B6}" +EndProject +Project("{34C4556A-6E68-4597-B18F-56A7228D120D}") = "lure", "lure.vcxproj", "{99D5E3AB-8D81-45F6-AFF8-A36D69DBCB30}" +EndProject +Project("{34C4556A-6E68-4597-B18F-56A7228D120D}") = "made", "made.vcxproj", "{49B1C14A-4F84-4047-B1AF-EE54401F8DAB}" +EndProject +Project("{34C4556A-6E68-4597-B18F-56A7228D120D}") = "mohawk", "mohawk.vcxproj", "{214953C2-4A67-488D-B097-06A814303A5E}" +EndProject +Project("{34C4556A-6E68-4597-B18F-56A7228D120D}") = "parallaction", "parallaction.vcxproj", "{B2826ABA-B6C8-49F5-8949-5C5362DAD773}" +EndProject +Project("{34C4556A-6E68-4597-B18F-56A7228D120D}") = "queen", "queen.vcxproj", "{C7EF81D6-60E5-4996-9106-1D661BA6D901}" +EndProject +Project("{34C4556A-6E68-4597-B18F-56A7228D120D}") = "saga", "saga.vcxproj", "{3C54ED04-97FE-42D8-ADA0-F7D6C5DBAD85}" +EndProject +Project("{34C4556A-6E68-4597-B18F-56A7228D120D}") = "sci", "sci.vcxproj", "{CE04161A-0A9D-4C08-BB2A-D04DE62D6393}" +EndProject +Project("{34C4556A-6E68-4597-B18F-56A7228D120D}") = "scumm", "scumm.vcxproj", "{EA21EDE2-1EF4-4CA3-8E0F-3C799AB2BA04}" +EndProject +Project("{34C4556A-6E68-4597-B18F-56A7228D120D}") = "sky", "sky.vcxproj", "{16BA2AEF-0607-4042-8A5F-84AD220A865E}" +EndProject +Project("{34C4556A-6E68-4597-B18F-56A7228D120D}") = "sword1", "sword1.vcxproj", "{3DA0192A-48FA-414E-9917-4CFDF581FB3D}" +EndProject +Project("{34C4556A-6E68-4597-B18F-56A7228D120D}") = "sword2", "sword2.vcxproj", "{D6E51CF1-A997-4EE4-82DF-4DD9D8FBE6F2}" +EndProject +Project("{34C4556A-6E68-4597-B18F-56A7228D120D}") = "teenagent", "teenagent.vcxproj", "{A9DE3EB5-922C-44D2-B327-D757D31B39AE}" +EndProject +Project("{34C4556A-6E68-4597-B18F-56A7228D120D}") = "tinsel", "tinsel.vcxproj", "{F574021E-F226-42CD-BC5E-948DD4D64037}" +EndProject +Project("{34C4556A-6E68-4597-B18F-56A7228D120D}") = "toon", "toon.vcxproj", "{2706B12E-1D14-4DB1-AF98-1BD8E43BB6AA}" +EndProject +Project("{34C4556A-6E68-4597-B18F-56A7228D120D}") = "touche", "touche.vcxproj", "{AEFC435A-831A-41BB-A5AF-B8CDC9776C12}" +EndProject +Project("{34C4556A-6E68-4597-B18F-56A7228D120D}") = "tsage", "tsage.vcxproj", "{FA8A1CEA-D13F-43D7-937A-6E97E164CC71}" +EndProject +Project("{34C4556A-6E68-4597-B18F-56A7228D120D}") = "tucker", "tucker.vcxproj", "{123D8B1A-95BF-4296-9374-380324C40BBF}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Analysis|Win32 = Analysis|Win32 + Release|Win32 = Release|Win32 + Debug|x64 = Debug|x64 + Analysis|x64 = Analysis|x64 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {E4478496-985F-4E36-8FF6-2C91B6783506}.Debug|Win32.ActiveCfg = Debug|Win32 + {E4478496-985F-4E36-8FF6-2C91B6783506}.Debug|Win32.Build.0 = Debug|Win32 + {E4478496-985F-4E36-8FF6-2C91B6783506}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {E4478496-985F-4E36-8FF6-2C91B6783506}.Analysis|Win32.Build.0 = Analysis|Win32 + {E4478496-985F-4E36-8FF6-2C91B6783506}.Release|Win32.ActiveCfg = Release|Win32 + {E4478496-985F-4E36-8FF6-2C91B6783506}.Release|Win32.Build.0 = Release|Win32 + {E4478496-985F-4E36-8FF6-2C91B6783506}.Debug|x64.ActiveCfg = Debug|x64 + {E4478496-985F-4E36-8FF6-2C91B6783506}.Debug|x64.Build.0 = Debug|x64 + {E4478496-985F-4E36-8FF6-2C91B6783506}.Analysis|x64.ActiveCfg = Analysis|x64 + {E4478496-985F-4E36-8FF6-2C91B6783506}.Analysis|x64.Build.0 = Analysis|x64 + {E4478496-985F-4E36-8FF6-2C91B6783506}.Release|x64.ActiveCfg = Release|x64 + {E4478496-985F-4E36-8FF6-2C91B6783506}.Release|x64.Build.0 = Release|x64 + {4D36B920-3E5D-43B0-9C18-851AD09AB17C}.Debug|Win32.ActiveCfg = Debug|Win32 + {4D36B920-3E5D-43B0-9C18-851AD09AB17C}.Debug|Win32.Build.0 = Debug|Win32 + {4D36B920-3E5D-43B0-9C18-851AD09AB17C}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {4D36B920-3E5D-43B0-9C18-851AD09AB17C}.Analysis|Win32.Build.0 = Analysis|Win32 + {4D36B920-3E5D-43B0-9C18-851AD09AB17C}.Release|Win32.ActiveCfg = Release|Win32 + {4D36B920-3E5D-43B0-9C18-851AD09AB17C}.Release|Win32.Build.0 = Release|Win32 + {4D36B920-3E5D-43B0-9C18-851AD09AB17C}.Debug|x64.ActiveCfg = Debug|x64 + {4D36B920-3E5D-43B0-9C18-851AD09AB17C}.Debug|x64.Build.0 = Debug|x64 + {4D36B920-3E5D-43B0-9C18-851AD09AB17C}.Analysis|x64.ActiveCfg = Analysis|x64 + {4D36B920-3E5D-43B0-9C18-851AD09AB17C}.Analysis|x64.Build.0 = Analysis|x64 + {4D36B920-3E5D-43B0-9C18-851AD09AB17C}.Release|x64.ActiveCfg = Release|x64 + {4D36B920-3E5D-43B0-9C18-851AD09AB17C}.Release|x64.Build.0 = Release|x64 + {ECEE1CD1-0C1A-4BC9-81F9-3E5498B1CD35}.Debug|Win32.ActiveCfg = Debug|Win32 + {ECEE1CD1-0C1A-4BC9-81F9-3E5498B1CD35}.Debug|Win32.Build.0 = Debug|Win32 + {ECEE1CD1-0C1A-4BC9-81F9-3E5498B1CD35}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {ECEE1CD1-0C1A-4BC9-81F9-3E5498B1CD35}.Analysis|Win32.Build.0 = Analysis|Win32 + {ECEE1CD1-0C1A-4BC9-81F9-3E5498B1CD35}.Release|Win32.ActiveCfg = Release|Win32 + {ECEE1CD1-0C1A-4BC9-81F9-3E5498B1CD35}.Release|Win32.Build.0 = Release|Win32 + {ECEE1CD1-0C1A-4BC9-81F9-3E5498B1CD35}.Debug|x64.ActiveCfg = Debug|x64 + {ECEE1CD1-0C1A-4BC9-81F9-3E5498B1CD35}.Debug|x64.Build.0 = Debug|x64 + {ECEE1CD1-0C1A-4BC9-81F9-3E5498B1CD35}.Analysis|x64.ActiveCfg = Analysis|x64 + {ECEE1CD1-0C1A-4BC9-81F9-3E5498B1CD35}.Analysis|x64.Build.0 = Analysis|x64 + {ECEE1CD1-0C1A-4BC9-81F9-3E5498B1CD35}.Release|x64.ActiveCfg = Release|x64 + {ECEE1CD1-0C1A-4BC9-81F9-3E5498B1CD35}.Release|x64.Build.0 = Release|x64 + {9BC256D4-59C5-4070-86AB-BD914E922F62}.Debug|Win32.ActiveCfg = Debug|Win32 + {9BC256D4-59C5-4070-86AB-BD914E922F62}.Debug|Win32.Build.0 = Debug|Win32 + {9BC256D4-59C5-4070-86AB-BD914E922F62}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {9BC256D4-59C5-4070-86AB-BD914E922F62}.Analysis|Win32.Build.0 = Analysis|Win32 + {9BC256D4-59C5-4070-86AB-BD914E922F62}.Release|Win32.ActiveCfg = Release|Win32 + {9BC256D4-59C5-4070-86AB-BD914E922F62}.Release|Win32.Build.0 = Release|Win32 + {9BC256D4-59C5-4070-86AB-BD914E922F62}.Debug|x64.ActiveCfg = Debug|x64 + {9BC256D4-59C5-4070-86AB-BD914E922F62}.Debug|x64.Build.0 = Debug|x64 + {9BC256D4-59C5-4070-86AB-BD914E922F62}.Analysis|x64.ActiveCfg = Analysis|x64 + {9BC256D4-59C5-4070-86AB-BD914E922F62}.Analysis|x64.Build.0 = Analysis|x64 + {9BC256D4-59C5-4070-86AB-BD914E922F62}.Release|x64.ActiveCfg = Release|x64 + {9BC256D4-59C5-4070-86AB-BD914E922F62}.Release|x64.Build.0 = Release|x64 + {2771BF19-83C7-4E48-9777-7593DF6BAE59}.Debug|Win32.ActiveCfg = Debug|Win32 + {2771BF19-83C7-4E48-9777-7593DF6BAE59}.Debug|Win32.Build.0 = Debug|Win32 + {2771BF19-83C7-4E48-9777-7593DF6BAE59}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {2771BF19-83C7-4E48-9777-7593DF6BAE59}.Analysis|Win32.Build.0 = Analysis|Win32 + {2771BF19-83C7-4E48-9777-7593DF6BAE59}.Release|Win32.ActiveCfg = Release|Win32 + {2771BF19-83C7-4E48-9777-7593DF6BAE59}.Release|Win32.Build.0 = Release|Win32 + {2771BF19-83C7-4E48-9777-7593DF6BAE59}.Debug|x64.ActiveCfg = Debug|x64 + {2771BF19-83C7-4E48-9777-7593DF6BAE59}.Debug|x64.Build.0 = Debug|x64 + {2771BF19-83C7-4E48-9777-7593DF6BAE59}.Analysis|x64.ActiveCfg = Analysis|x64 + {2771BF19-83C7-4E48-9777-7593DF6BAE59}.Analysis|x64.Build.0 = Analysis|x64 + {2771BF19-83C7-4E48-9777-7593DF6BAE59}.Release|x64.ActiveCfg = Release|x64 + {2771BF19-83C7-4E48-9777-7593DF6BAE59}.Release|x64.Build.0 = Release|x64 + {B7DF84D9-85A1-477F-91CC-4EAA9C420507}.Debug|Win32.ActiveCfg = Debug|Win32 + {B7DF84D9-85A1-477F-91CC-4EAA9C420507}.Debug|Win32.Build.0 = Debug|Win32 + {B7DF84D9-85A1-477F-91CC-4EAA9C420507}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {B7DF84D9-85A1-477F-91CC-4EAA9C420507}.Analysis|Win32.Build.0 = Analysis|Win32 + {B7DF84D9-85A1-477F-91CC-4EAA9C420507}.Release|Win32.ActiveCfg = Release|Win32 + {B7DF84D9-85A1-477F-91CC-4EAA9C420507}.Release|Win32.Build.0 = Release|Win32 + {B7DF84D9-85A1-477F-91CC-4EAA9C420507}.Debug|x64.ActiveCfg = Debug|x64 + {B7DF84D9-85A1-477F-91CC-4EAA9C420507}.Debug|x64.Build.0 = Debug|x64 + {B7DF84D9-85A1-477F-91CC-4EAA9C420507}.Analysis|x64.ActiveCfg = Analysis|x64 + {B7DF84D9-85A1-477F-91CC-4EAA9C420507}.Analysis|x64.Build.0 = Analysis|x64 + {B7DF84D9-85A1-477F-91CC-4EAA9C420507}.Release|x64.ActiveCfg = Release|x64 + {B7DF84D9-85A1-477F-91CC-4EAA9C420507}.Release|x64.Build.0 = Release|x64 + {FB8AD6E0-3F35-4AF2-BFAD-BA41A3B794E0}.Debug|Win32.ActiveCfg = Debug|Win32 + {FB8AD6E0-3F35-4AF2-BFAD-BA41A3B794E0}.Debug|Win32.Build.0 = Debug|Win32 + {FB8AD6E0-3F35-4AF2-BFAD-BA41A3B794E0}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {FB8AD6E0-3F35-4AF2-BFAD-BA41A3B794E0}.Analysis|Win32.Build.0 = Analysis|Win32 + {FB8AD6E0-3F35-4AF2-BFAD-BA41A3B794E0}.Release|Win32.ActiveCfg = Release|Win32 + {FB8AD6E0-3F35-4AF2-BFAD-BA41A3B794E0}.Release|Win32.Build.0 = Release|Win32 + {FB8AD6E0-3F35-4AF2-BFAD-BA41A3B794E0}.Debug|x64.ActiveCfg = Debug|x64 + {FB8AD6E0-3F35-4AF2-BFAD-BA41A3B794E0}.Debug|x64.Build.0 = Debug|x64 + {FB8AD6E0-3F35-4AF2-BFAD-BA41A3B794E0}.Analysis|x64.ActiveCfg = Analysis|x64 + {FB8AD6E0-3F35-4AF2-BFAD-BA41A3B794E0}.Analysis|x64.Build.0 = Analysis|x64 + {FB8AD6E0-3F35-4AF2-BFAD-BA41A3B794E0}.Release|x64.ActiveCfg = Release|x64 + {FB8AD6E0-3F35-4AF2-BFAD-BA41A3B794E0}.Release|x64.Build.0 = Release|x64 + {1B25D9EA-9A6E-46C1-A4F8-91AFD1B01943}.Debug|Win32.ActiveCfg = Debug|Win32 + {1B25D9EA-9A6E-46C1-A4F8-91AFD1B01943}.Debug|Win32.Build.0 = Debug|Win32 + {1B25D9EA-9A6E-46C1-A4F8-91AFD1B01943}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {1B25D9EA-9A6E-46C1-A4F8-91AFD1B01943}.Analysis|Win32.Build.0 = Analysis|Win32 + {1B25D9EA-9A6E-46C1-A4F8-91AFD1B01943}.Release|Win32.ActiveCfg = Release|Win32 + {1B25D9EA-9A6E-46C1-A4F8-91AFD1B01943}.Release|Win32.Build.0 = Release|Win32 + {1B25D9EA-9A6E-46C1-A4F8-91AFD1B01943}.Debug|x64.ActiveCfg = Debug|x64 + {1B25D9EA-9A6E-46C1-A4F8-91AFD1B01943}.Debug|x64.Build.0 = Debug|x64 + {1B25D9EA-9A6E-46C1-A4F8-91AFD1B01943}.Analysis|x64.ActiveCfg = Analysis|x64 + {1B25D9EA-9A6E-46C1-A4F8-91AFD1B01943}.Analysis|x64.Build.0 = Analysis|x64 + {1B25D9EA-9A6E-46C1-A4F8-91AFD1B01943}.Release|x64.ActiveCfg = Release|x64 + {1B25D9EA-9A6E-46C1-A4F8-91AFD1B01943}.Release|x64.Build.0 = Release|x64 + {E0F58DCE-862B-4927-9AE5-D488C16D85F2}.Debug|Win32.ActiveCfg = Debug|Win32 + {E0F58DCE-862B-4927-9AE5-D488C16D85F2}.Debug|Win32.Build.0 = Debug|Win32 + {E0F58DCE-862B-4927-9AE5-D488C16D85F2}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {E0F58DCE-862B-4927-9AE5-D488C16D85F2}.Analysis|Win32.Build.0 = Analysis|Win32 + {E0F58DCE-862B-4927-9AE5-D488C16D85F2}.Release|Win32.ActiveCfg = Release|Win32 + {E0F58DCE-862B-4927-9AE5-D488C16D85F2}.Release|Win32.Build.0 = Release|Win32 + {E0F58DCE-862B-4927-9AE5-D488C16D85F2}.Debug|x64.ActiveCfg = Debug|x64 + {E0F58DCE-862B-4927-9AE5-D488C16D85F2}.Debug|x64.Build.0 = Debug|x64 + {E0F58DCE-862B-4927-9AE5-D488C16D85F2}.Analysis|x64.ActiveCfg = Analysis|x64 + {E0F58DCE-862B-4927-9AE5-D488C16D85F2}.Analysis|x64.Build.0 = Analysis|x64 + {E0F58DCE-862B-4927-9AE5-D488C16D85F2}.Release|x64.ActiveCfg = Release|x64 + {E0F58DCE-862B-4927-9AE5-D488C16D85F2}.Release|x64.Build.0 = Release|x64 + {2569F220-FD8F-4503-8EFB-6DA01E6E37B6}.Debug|Win32.ActiveCfg = Debug|Win32 + {2569F220-FD8F-4503-8EFB-6DA01E6E37B6}.Debug|Win32.Build.0 = Debug|Win32 + {2569F220-FD8F-4503-8EFB-6DA01E6E37B6}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {2569F220-FD8F-4503-8EFB-6DA01E6E37B6}.Analysis|Win32.Build.0 = Analysis|Win32 + {2569F220-FD8F-4503-8EFB-6DA01E6E37B6}.Release|Win32.ActiveCfg = Release|Win32 + {2569F220-FD8F-4503-8EFB-6DA01E6E37B6}.Release|Win32.Build.0 = Release|Win32 + {2569F220-FD8F-4503-8EFB-6DA01E6E37B6}.Debug|x64.ActiveCfg = Debug|x64 + {2569F220-FD8F-4503-8EFB-6DA01E6E37B6}.Debug|x64.Build.0 = Debug|x64 + {2569F220-FD8F-4503-8EFB-6DA01E6E37B6}.Analysis|x64.ActiveCfg = Analysis|x64 + {2569F220-FD8F-4503-8EFB-6DA01E6E37B6}.Analysis|x64.Build.0 = Analysis|x64 + {2569F220-FD8F-4503-8EFB-6DA01E6E37B6}.Release|x64.ActiveCfg = Release|x64 + {2569F220-FD8F-4503-8EFB-6DA01E6E37B6}.Release|x64.Build.0 = Release|x64 + {99D5E3AB-8D81-45F6-AFF8-A36D69DBCB30}.Debug|Win32.ActiveCfg = Debug|Win32 + {99D5E3AB-8D81-45F6-AFF8-A36D69DBCB30}.Debug|Win32.Build.0 = Debug|Win32 + {99D5E3AB-8D81-45F6-AFF8-A36D69DBCB30}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {99D5E3AB-8D81-45F6-AFF8-A36D69DBCB30}.Analysis|Win32.Build.0 = Analysis|Win32 + {99D5E3AB-8D81-45F6-AFF8-A36D69DBCB30}.Release|Win32.ActiveCfg = Release|Win32 + {99D5E3AB-8D81-45F6-AFF8-A36D69DBCB30}.Release|Win32.Build.0 = Release|Win32 + {99D5E3AB-8D81-45F6-AFF8-A36D69DBCB30}.Debug|x64.ActiveCfg = Debug|x64 + {99D5E3AB-8D81-45F6-AFF8-A36D69DBCB30}.Debug|x64.Build.0 = Debug|x64 + {99D5E3AB-8D81-45F6-AFF8-A36D69DBCB30}.Analysis|x64.ActiveCfg = Analysis|x64 + {99D5E3AB-8D81-45F6-AFF8-A36D69DBCB30}.Analysis|x64.Build.0 = Analysis|x64 + {99D5E3AB-8D81-45F6-AFF8-A36D69DBCB30}.Release|x64.ActiveCfg = Release|x64 + {99D5E3AB-8D81-45F6-AFF8-A36D69DBCB30}.Release|x64.Build.0 = Release|x64 + {49B1C14A-4F84-4047-B1AF-EE54401F8DAB}.Debug|Win32.ActiveCfg = Debug|Win32 + {49B1C14A-4F84-4047-B1AF-EE54401F8DAB}.Debug|Win32.Build.0 = Debug|Win32 + {49B1C14A-4F84-4047-B1AF-EE54401F8DAB}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {49B1C14A-4F84-4047-B1AF-EE54401F8DAB}.Analysis|Win32.Build.0 = Analysis|Win32 + {49B1C14A-4F84-4047-B1AF-EE54401F8DAB}.Release|Win32.ActiveCfg = Release|Win32 + {49B1C14A-4F84-4047-B1AF-EE54401F8DAB}.Release|Win32.Build.0 = Release|Win32 + {49B1C14A-4F84-4047-B1AF-EE54401F8DAB}.Debug|x64.ActiveCfg = Debug|x64 + {49B1C14A-4F84-4047-B1AF-EE54401F8DAB}.Debug|x64.Build.0 = Debug|x64 + {49B1C14A-4F84-4047-B1AF-EE54401F8DAB}.Analysis|x64.ActiveCfg = Analysis|x64 + {49B1C14A-4F84-4047-B1AF-EE54401F8DAB}.Analysis|x64.Build.0 = Analysis|x64 + {49B1C14A-4F84-4047-B1AF-EE54401F8DAB}.Release|x64.ActiveCfg = Release|x64 + {49B1C14A-4F84-4047-B1AF-EE54401F8DAB}.Release|x64.Build.0 = Release|x64 + {214953C2-4A67-488D-B097-06A814303A5E}.Debug|Win32.ActiveCfg = Debug|Win32 + {214953C2-4A67-488D-B097-06A814303A5E}.Debug|Win32.Build.0 = Debug|Win32 + {214953C2-4A67-488D-B097-06A814303A5E}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {214953C2-4A67-488D-B097-06A814303A5E}.Analysis|Win32.Build.0 = Analysis|Win32 + {214953C2-4A67-488D-B097-06A814303A5E}.Release|Win32.ActiveCfg = Release|Win32 + {214953C2-4A67-488D-B097-06A814303A5E}.Release|Win32.Build.0 = Release|Win32 + {214953C2-4A67-488D-B097-06A814303A5E}.Debug|x64.ActiveCfg = Debug|x64 + {214953C2-4A67-488D-B097-06A814303A5E}.Debug|x64.Build.0 = Debug|x64 + {214953C2-4A67-488D-B097-06A814303A5E}.Analysis|x64.ActiveCfg = Analysis|x64 + {214953C2-4A67-488D-B097-06A814303A5E}.Analysis|x64.Build.0 = Analysis|x64 + {214953C2-4A67-488D-B097-06A814303A5E}.Release|x64.ActiveCfg = Release|x64 + {214953C2-4A67-488D-B097-06A814303A5E}.Release|x64.Build.0 = Release|x64 + {B2826ABA-B6C8-49F5-8949-5C5362DAD773}.Debug|Win32.ActiveCfg = Debug|Win32 + {B2826ABA-B6C8-49F5-8949-5C5362DAD773}.Debug|Win32.Build.0 = Debug|Win32 + {B2826ABA-B6C8-49F5-8949-5C5362DAD773}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {B2826ABA-B6C8-49F5-8949-5C5362DAD773}.Analysis|Win32.Build.0 = Analysis|Win32 + {B2826ABA-B6C8-49F5-8949-5C5362DAD773}.Release|Win32.ActiveCfg = Release|Win32 + {B2826ABA-B6C8-49F5-8949-5C5362DAD773}.Release|Win32.Build.0 = Release|Win32 + {B2826ABA-B6C8-49F5-8949-5C5362DAD773}.Debug|x64.ActiveCfg = Debug|x64 + {B2826ABA-B6C8-49F5-8949-5C5362DAD773}.Debug|x64.Build.0 = Debug|x64 + {B2826ABA-B6C8-49F5-8949-5C5362DAD773}.Analysis|x64.ActiveCfg = Analysis|x64 + {B2826ABA-B6C8-49F5-8949-5C5362DAD773}.Analysis|x64.Build.0 = Analysis|x64 + {B2826ABA-B6C8-49F5-8949-5C5362DAD773}.Release|x64.ActiveCfg = Release|x64 + {B2826ABA-B6C8-49F5-8949-5C5362DAD773}.Release|x64.Build.0 = Release|x64 + {C7EF81D6-60E5-4996-9106-1D661BA6D901}.Debug|Win32.ActiveCfg = Debug|Win32 + {C7EF81D6-60E5-4996-9106-1D661BA6D901}.Debug|Win32.Build.0 = Debug|Win32 + {C7EF81D6-60E5-4996-9106-1D661BA6D901}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {C7EF81D6-60E5-4996-9106-1D661BA6D901}.Analysis|Win32.Build.0 = Analysis|Win32 + {C7EF81D6-60E5-4996-9106-1D661BA6D901}.Release|Win32.ActiveCfg = Release|Win32 + {C7EF81D6-60E5-4996-9106-1D661BA6D901}.Release|Win32.Build.0 = Release|Win32 + {C7EF81D6-60E5-4996-9106-1D661BA6D901}.Debug|x64.ActiveCfg = Debug|x64 + {C7EF81D6-60E5-4996-9106-1D661BA6D901}.Debug|x64.Build.0 = Debug|x64 + {C7EF81D6-60E5-4996-9106-1D661BA6D901}.Analysis|x64.ActiveCfg = Analysis|x64 + {C7EF81D6-60E5-4996-9106-1D661BA6D901}.Analysis|x64.Build.0 = Analysis|x64 + {C7EF81D6-60E5-4996-9106-1D661BA6D901}.Release|x64.ActiveCfg = Release|x64 + {C7EF81D6-60E5-4996-9106-1D661BA6D901}.Release|x64.Build.0 = Release|x64 + {3C54ED04-97FE-42D8-ADA0-F7D6C5DBAD85}.Debug|Win32.ActiveCfg = Debug|Win32 + {3C54ED04-97FE-42D8-ADA0-F7D6C5DBAD85}.Debug|Win32.Build.0 = Debug|Win32 + {3C54ED04-97FE-42D8-ADA0-F7D6C5DBAD85}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {3C54ED04-97FE-42D8-ADA0-F7D6C5DBAD85}.Analysis|Win32.Build.0 = Analysis|Win32 + {3C54ED04-97FE-42D8-ADA0-F7D6C5DBAD85}.Release|Win32.ActiveCfg = Release|Win32 + {3C54ED04-97FE-42D8-ADA0-F7D6C5DBAD85}.Release|Win32.Build.0 = Release|Win32 + {3C54ED04-97FE-42D8-ADA0-F7D6C5DBAD85}.Debug|x64.ActiveCfg = Debug|x64 + {3C54ED04-97FE-42D8-ADA0-F7D6C5DBAD85}.Debug|x64.Build.0 = Debug|x64 + {3C54ED04-97FE-42D8-ADA0-F7D6C5DBAD85}.Analysis|x64.ActiveCfg = Analysis|x64 + {3C54ED04-97FE-42D8-ADA0-F7D6C5DBAD85}.Analysis|x64.Build.0 = Analysis|x64 + {3C54ED04-97FE-42D8-ADA0-F7D6C5DBAD85}.Release|x64.ActiveCfg = Release|x64 + {3C54ED04-97FE-42D8-ADA0-F7D6C5DBAD85}.Release|x64.Build.0 = Release|x64 + {CE04161A-0A9D-4C08-BB2A-D04DE62D6393}.Debug|Win32.ActiveCfg = Debug|Win32 + {CE04161A-0A9D-4C08-BB2A-D04DE62D6393}.Debug|Win32.Build.0 = Debug|Win32 + {CE04161A-0A9D-4C08-BB2A-D04DE62D6393}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {CE04161A-0A9D-4C08-BB2A-D04DE62D6393}.Analysis|Win32.Build.0 = Analysis|Win32 + {CE04161A-0A9D-4C08-BB2A-D04DE62D6393}.Release|Win32.ActiveCfg = Release|Win32 + {CE04161A-0A9D-4C08-BB2A-D04DE62D6393}.Release|Win32.Build.0 = Release|Win32 + {CE04161A-0A9D-4C08-BB2A-D04DE62D6393}.Debug|x64.ActiveCfg = Debug|x64 + {CE04161A-0A9D-4C08-BB2A-D04DE62D6393}.Debug|x64.Build.0 = Debug|x64 + {CE04161A-0A9D-4C08-BB2A-D04DE62D6393}.Analysis|x64.ActiveCfg = Analysis|x64 + {CE04161A-0A9D-4C08-BB2A-D04DE62D6393}.Analysis|x64.Build.0 = Analysis|x64 + {CE04161A-0A9D-4C08-BB2A-D04DE62D6393}.Release|x64.ActiveCfg = Release|x64 + {CE04161A-0A9D-4C08-BB2A-D04DE62D6393}.Release|x64.Build.0 = Release|x64 + {EA21EDE2-1EF4-4CA3-8E0F-3C799AB2BA04}.Debug|Win32.ActiveCfg = Debug|Win32 + {EA21EDE2-1EF4-4CA3-8E0F-3C799AB2BA04}.Debug|Win32.Build.0 = Debug|Win32 + {EA21EDE2-1EF4-4CA3-8E0F-3C799AB2BA04}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {EA21EDE2-1EF4-4CA3-8E0F-3C799AB2BA04}.Analysis|Win32.Build.0 = Analysis|Win32 + {EA21EDE2-1EF4-4CA3-8E0F-3C799AB2BA04}.Release|Win32.ActiveCfg = Release|Win32 + {EA21EDE2-1EF4-4CA3-8E0F-3C799AB2BA04}.Release|Win32.Build.0 = Release|Win32 + {EA21EDE2-1EF4-4CA3-8E0F-3C799AB2BA04}.Debug|x64.ActiveCfg = Debug|x64 + {EA21EDE2-1EF4-4CA3-8E0F-3C799AB2BA04}.Debug|x64.Build.0 = Debug|x64 + {EA21EDE2-1EF4-4CA3-8E0F-3C799AB2BA04}.Analysis|x64.ActiveCfg = Analysis|x64 + {EA21EDE2-1EF4-4CA3-8E0F-3C799AB2BA04}.Analysis|x64.Build.0 = Analysis|x64 + {EA21EDE2-1EF4-4CA3-8E0F-3C799AB2BA04}.Release|x64.ActiveCfg = Release|x64 + {EA21EDE2-1EF4-4CA3-8E0F-3C799AB2BA04}.Release|x64.Build.0 = Release|x64 + {45167257-FD0B-4A77-AA14-E343E8EF652A}.Debug|Win32.ActiveCfg = Debug|Win32 + {45167257-FD0B-4A77-AA14-E343E8EF652A}.Debug|Win32.Build.0 = Debug|Win32 + {45167257-FD0B-4A77-AA14-E343E8EF652A}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {45167257-FD0B-4A77-AA14-E343E8EF652A}.Analysis|Win32.Build.0 = Analysis|Win32 + {45167257-FD0B-4A77-AA14-E343E8EF652A}.Release|Win32.ActiveCfg = Release|Win32 + {45167257-FD0B-4A77-AA14-E343E8EF652A}.Release|Win32.Build.0 = Release|Win32 + {45167257-FD0B-4A77-AA14-E343E8EF652A}.Debug|x64.ActiveCfg = Debug|x64 + {45167257-FD0B-4A77-AA14-E343E8EF652A}.Debug|x64.Build.0 = Debug|x64 + {45167257-FD0B-4A77-AA14-E343E8EF652A}.Analysis|x64.ActiveCfg = Analysis|x64 + {45167257-FD0B-4A77-AA14-E343E8EF652A}.Analysis|x64.Build.0 = Analysis|x64 + {45167257-FD0B-4A77-AA14-E343E8EF652A}.Release|x64.ActiveCfg = Release|x64 + {45167257-FD0B-4A77-AA14-E343E8EF652A}.Release|x64.Build.0 = Release|x64 + {16BA2AEF-0607-4042-8A5F-84AD220A865E}.Debug|Win32.ActiveCfg = Debug|Win32 + {16BA2AEF-0607-4042-8A5F-84AD220A865E}.Debug|Win32.Build.0 = Debug|Win32 + {16BA2AEF-0607-4042-8A5F-84AD220A865E}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {16BA2AEF-0607-4042-8A5F-84AD220A865E}.Analysis|Win32.Build.0 = Analysis|Win32 + {16BA2AEF-0607-4042-8A5F-84AD220A865E}.Release|Win32.ActiveCfg = Release|Win32 + {16BA2AEF-0607-4042-8A5F-84AD220A865E}.Release|Win32.Build.0 = Release|Win32 + {16BA2AEF-0607-4042-8A5F-84AD220A865E}.Debug|x64.ActiveCfg = Debug|x64 + {16BA2AEF-0607-4042-8A5F-84AD220A865E}.Debug|x64.Build.0 = Debug|x64 + {16BA2AEF-0607-4042-8A5F-84AD220A865E}.Analysis|x64.ActiveCfg = Analysis|x64 + {16BA2AEF-0607-4042-8A5F-84AD220A865E}.Analysis|x64.Build.0 = Analysis|x64 + {16BA2AEF-0607-4042-8A5F-84AD220A865E}.Release|x64.ActiveCfg = Release|x64 + {16BA2AEF-0607-4042-8A5F-84AD220A865E}.Release|x64.Build.0 = Release|x64 + {3DA0192A-48FA-414E-9917-4CFDF581FB3D}.Debug|Win32.ActiveCfg = Debug|Win32 + {3DA0192A-48FA-414E-9917-4CFDF581FB3D}.Debug|Win32.Build.0 = Debug|Win32 + {3DA0192A-48FA-414E-9917-4CFDF581FB3D}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {3DA0192A-48FA-414E-9917-4CFDF581FB3D}.Analysis|Win32.Build.0 = Analysis|Win32 + {3DA0192A-48FA-414E-9917-4CFDF581FB3D}.Release|Win32.ActiveCfg = Release|Win32 + {3DA0192A-48FA-414E-9917-4CFDF581FB3D}.Release|Win32.Build.0 = Release|Win32 + {3DA0192A-48FA-414E-9917-4CFDF581FB3D}.Debug|x64.ActiveCfg = Debug|x64 + {3DA0192A-48FA-414E-9917-4CFDF581FB3D}.Debug|x64.Build.0 = Debug|x64 + {3DA0192A-48FA-414E-9917-4CFDF581FB3D}.Analysis|x64.ActiveCfg = Analysis|x64 + {3DA0192A-48FA-414E-9917-4CFDF581FB3D}.Analysis|x64.Build.0 = Analysis|x64 + {3DA0192A-48FA-414E-9917-4CFDF581FB3D}.Release|x64.ActiveCfg = Release|x64 + {3DA0192A-48FA-414E-9917-4CFDF581FB3D}.Release|x64.Build.0 = Release|x64 + {D6E51CF1-A997-4EE4-82DF-4DD9D8FBE6F2}.Debug|Win32.ActiveCfg = Debug|Win32 + {D6E51CF1-A997-4EE4-82DF-4DD9D8FBE6F2}.Debug|Win32.Build.0 = Debug|Win32 + {D6E51CF1-A997-4EE4-82DF-4DD9D8FBE6F2}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {D6E51CF1-A997-4EE4-82DF-4DD9D8FBE6F2}.Analysis|Win32.Build.0 = Analysis|Win32 + {D6E51CF1-A997-4EE4-82DF-4DD9D8FBE6F2}.Release|Win32.ActiveCfg = Release|Win32 + {D6E51CF1-A997-4EE4-82DF-4DD9D8FBE6F2}.Release|Win32.Build.0 = Release|Win32 + {D6E51CF1-A997-4EE4-82DF-4DD9D8FBE6F2}.Debug|x64.ActiveCfg = Debug|x64 + {D6E51CF1-A997-4EE4-82DF-4DD9D8FBE6F2}.Debug|x64.Build.0 = Debug|x64 + {D6E51CF1-A997-4EE4-82DF-4DD9D8FBE6F2}.Analysis|x64.ActiveCfg = Analysis|x64 + {D6E51CF1-A997-4EE4-82DF-4DD9D8FBE6F2}.Analysis|x64.Build.0 = Analysis|x64 + {D6E51CF1-A997-4EE4-82DF-4DD9D8FBE6F2}.Release|x64.ActiveCfg = Release|x64 + {D6E51CF1-A997-4EE4-82DF-4DD9D8FBE6F2}.Release|x64.Build.0 = Release|x64 + {A9DE3EB5-922C-44D2-B327-D757D31B39AE}.Debug|Win32.ActiveCfg = Debug|Win32 + {A9DE3EB5-922C-44D2-B327-D757D31B39AE}.Debug|Win32.Build.0 = Debug|Win32 + {A9DE3EB5-922C-44D2-B327-D757D31B39AE}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {A9DE3EB5-922C-44D2-B327-D757D31B39AE}.Analysis|Win32.Build.0 = Analysis|Win32 + {A9DE3EB5-922C-44D2-B327-D757D31B39AE}.Release|Win32.ActiveCfg = Release|Win32 + {A9DE3EB5-922C-44D2-B327-D757D31B39AE}.Release|Win32.Build.0 = Release|Win32 + {A9DE3EB5-922C-44D2-B327-D757D31B39AE}.Debug|x64.ActiveCfg = Debug|x64 + {A9DE3EB5-922C-44D2-B327-D757D31B39AE}.Debug|x64.Build.0 = Debug|x64 + {A9DE3EB5-922C-44D2-B327-D757D31B39AE}.Analysis|x64.ActiveCfg = Analysis|x64 + {A9DE3EB5-922C-44D2-B327-D757D31B39AE}.Analysis|x64.Build.0 = Analysis|x64 + {A9DE3EB5-922C-44D2-B327-D757D31B39AE}.Release|x64.ActiveCfg = Release|x64 + {A9DE3EB5-922C-44D2-B327-D757D31B39AE}.Release|x64.Build.0 = Release|x64 + {F574021E-F226-42CD-BC5E-948DD4D64037}.Debug|Win32.ActiveCfg = Debug|Win32 + {F574021E-F226-42CD-BC5E-948DD4D64037}.Debug|Win32.Build.0 = Debug|Win32 + {F574021E-F226-42CD-BC5E-948DD4D64037}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {F574021E-F226-42CD-BC5E-948DD4D64037}.Analysis|Win32.Build.0 = Analysis|Win32 + {F574021E-F226-42CD-BC5E-948DD4D64037}.Release|Win32.ActiveCfg = Release|Win32 + {F574021E-F226-42CD-BC5E-948DD4D64037}.Release|Win32.Build.0 = Release|Win32 + {F574021E-F226-42CD-BC5E-948DD4D64037}.Debug|x64.ActiveCfg = Debug|x64 + {F574021E-F226-42CD-BC5E-948DD4D64037}.Debug|x64.Build.0 = Debug|x64 + {F574021E-F226-42CD-BC5E-948DD4D64037}.Analysis|x64.ActiveCfg = Analysis|x64 + {F574021E-F226-42CD-BC5E-948DD4D64037}.Analysis|x64.Build.0 = Analysis|x64 + {F574021E-F226-42CD-BC5E-948DD4D64037}.Release|x64.ActiveCfg = Release|x64 + {F574021E-F226-42CD-BC5E-948DD4D64037}.Release|x64.Build.0 = Release|x64 + {2706B12E-1D14-4DB1-AF98-1BD8E43BB6AA}.Debug|Win32.ActiveCfg = Debug|Win32 + {2706B12E-1D14-4DB1-AF98-1BD8E43BB6AA}.Debug|Win32.Build.0 = Debug|Win32 + {2706B12E-1D14-4DB1-AF98-1BD8E43BB6AA}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {2706B12E-1D14-4DB1-AF98-1BD8E43BB6AA}.Analysis|Win32.Build.0 = Analysis|Win32 + {2706B12E-1D14-4DB1-AF98-1BD8E43BB6AA}.Release|Win32.ActiveCfg = Release|Win32 + {2706B12E-1D14-4DB1-AF98-1BD8E43BB6AA}.Release|Win32.Build.0 = Release|Win32 + {2706B12E-1D14-4DB1-AF98-1BD8E43BB6AA}.Debug|x64.ActiveCfg = Debug|x64 + {2706B12E-1D14-4DB1-AF98-1BD8E43BB6AA}.Debug|x64.Build.0 = Debug|x64 + {2706B12E-1D14-4DB1-AF98-1BD8E43BB6AA}.Analysis|x64.ActiveCfg = Analysis|x64 + {2706B12E-1D14-4DB1-AF98-1BD8E43BB6AA}.Analysis|x64.Build.0 = Analysis|x64 + {2706B12E-1D14-4DB1-AF98-1BD8E43BB6AA}.Release|x64.ActiveCfg = Release|x64 + {2706B12E-1D14-4DB1-AF98-1BD8E43BB6AA}.Release|x64.Build.0 = Release|x64 + {AEFC435A-831A-41BB-A5AF-B8CDC9776C12}.Debug|Win32.ActiveCfg = Debug|Win32 + {AEFC435A-831A-41BB-A5AF-B8CDC9776C12}.Debug|Win32.Build.0 = Debug|Win32 + {AEFC435A-831A-41BB-A5AF-B8CDC9776C12}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {AEFC435A-831A-41BB-A5AF-B8CDC9776C12}.Analysis|Win32.Build.0 = Analysis|Win32 + {AEFC435A-831A-41BB-A5AF-B8CDC9776C12}.Release|Win32.ActiveCfg = Release|Win32 + {AEFC435A-831A-41BB-A5AF-B8CDC9776C12}.Release|Win32.Build.0 = Release|Win32 + {AEFC435A-831A-41BB-A5AF-B8CDC9776C12}.Debug|x64.ActiveCfg = Debug|x64 + {AEFC435A-831A-41BB-A5AF-B8CDC9776C12}.Debug|x64.Build.0 = Debug|x64 + {AEFC435A-831A-41BB-A5AF-B8CDC9776C12}.Analysis|x64.ActiveCfg = Analysis|x64 + {AEFC435A-831A-41BB-A5AF-B8CDC9776C12}.Analysis|x64.Build.0 = Analysis|x64 + {AEFC435A-831A-41BB-A5AF-B8CDC9776C12}.Release|x64.ActiveCfg = Release|x64 + {AEFC435A-831A-41BB-A5AF-B8CDC9776C12}.Release|x64.Build.0 = Release|x64 + {FA8A1CEA-D13F-43D7-937A-6E97E164CC71}.Debug|Win32.ActiveCfg = Debug|Win32 + {FA8A1CEA-D13F-43D7-937A-6E97E164CC71}.Debug|Win32.Build.0 = Debug|Win32 + {FA8A1CEA-D13F-43D7-937A-6E97E164CC71}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {FA8A1CEA-D13F-43D7-937A-6E97E164CC71}.Analysis|Win32.Build.0 = Analysis|Win32 + {FA8A1CEA-D13F-43D7-937A-6E97E164CC71}.Release|Win32.ActiveCfg = Release|Win32 + {FA8A1CEA-D13F-43D7-937A-6E97E164CC71}.Release|Win32.Build.0 = Release|Win32 + {FA8A1CEA-D13F-43D7-937A-6E97E164CC71}.Debug|x64.ActiveCfg = Debug|x64 + {FA8A1CEA-D13F-43D7-937A-6E97E164CC71}.Debug|x64.Build.0 = Debug|x64 + {FA8A1CEA-D13F-43D7-937A-6E97E164CC71}.Analysis|x64.ActiveCfg = Analysis|x64 + {FA8A1CEA-D13F-43D7-937A-6E97E164CC71}.Analysis|x64.Build.0 = Analysis|x64 + {FA8A1CEA-D13F-43D7-937A-6E97E164CC71}.Release|x64.ActiveCfg = Release|x64 + {FA8A1CEA-D13F-43D7-937A-6E97E164CC71}.Release|x64.Build.0 = Release|x64 + {123D8B1A-95BF-4296-9374-380324C40BBF}.Debug|Win32.ActiveCfg = Debug|Win32 + {123D8B1A-95BF-4296-9374-380324C40BBF}.Debug|Win32.Build.0 = Debug|Win32 + {123D8B1A-95BF-4296-9374-380324C40BBF}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {123D8B1A-95BF-4296-9374-380324C40BBF}.Analysis|Win32.Build.0 = Analysis|Win32 + {123D8B1A-95BF-4296-9374-380324C40BBF}.Release|Win32.ActiveCfg = Release|Win32 + {123D8B1A-95BF-4296-9374-380324C40BBF}.Release|Win32.Build.0 = Release|Win32 + {123D8B1A-95BF-4296-9374-380324C40BBF}.Debug|x64.ActiveCfg = Debug|x64 + {123D8B1A-95BF-4296-9374-380324C40BBF}.Debug|x64.Build.0 = Debug|x64 + {123D8B1A-95BF-4296-9374-380324C40BBF}.Analysis|x64.ActiveCfg = Analysis|x64 + {123D8B1A-95BF-4296-9374-380324C40BBF}.Analysis|x64.Build.0 = Analysis|x64 + {123D8B1A-95BF-4296-9374-380324C40BBF}.Release|x64.ActiveCfg = Release|x64 + {123D8B1A-95BF-4296-9374-380324C40BBF}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff -Nru scummvm-1.4.0/dists/msvc10/scummvm.vcxproj scummvm-1.4.1/dists/msvc10/scummvm.vcxproj --- scummvm-1.4.0/dists/msvc10/scummvm.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/scummvm.vcxproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,765 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Analysis + Win32 + + + Analysis + x64 + + + Release + Win32 + + + Release + x64 + + + + {45167257-FD0B-4A77-AA14-E343E8EF652A} + scummvm + Win32Proj + + + + Application + + + Application + + + Application + + + Application + + + Application + + + Application + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + $(OutDir)scummvm.exe + zlib.lib;libmad.lib;libvorbisfile_static.lib;libvorbis_static.lib;libogg_static.lib;libFLAC_static.lib;libpng.lib;libtheora_static.lib;sdl.lib;winmm.lib;%(AdditionalDependencies) + + + + + false + + + $(OutDir)scummvm.exe + zlib.lib;libmad.lib;libvorbisfile_static.lib;libvorbis_static.lib;libogg_static.lib;libFLAC_static.lib;libpng.lib;libtheora_static.lib;sdl.lib;winmm.lib;%(AdditionalDependencies) + + + + + false + + + $(OutDir)scummvm.exe + zlib.lib;libmad.lib;libvorbisfile_static.lib;libvorbis_static.lib;libogg_static.lib;libFLAC_static.lib;libpng.lib;libtheora_static.lib;sdl.lib;winmm.lib;%(AdditionalDependencies) + + + + + false + + + $(OutDir)scummvm.exe + zlib.lib;libmad.lib;libvorbisfile_static.lib;libvorbis_static.lib;libogg_static.lib;libFLAC_static.lib;libpng.lib;libtheora_static.lib;sdl.lib;winmm.lib;%(AdditionalDependencies) + + + + + false + + + $(OutDir)scummvm.exe + zlib.lib;libmad.lib;libvorbisfile_static.lib;libvorbis_static.lib;libogg_static.lib;libFLAC_static.lib;libpng.lib;libtheora_static.lib;sdl.lib;winmm.lib;%(AdditionalDependencies) + + + + + false + + + $(OutDir)scummvm.exe + zlib.lib;libmad.lib;libvorbisfile_static.lib;libvorbis_static.lib;libogg_static.lib;libFLAC_static.lib;libpng.lib;libtheora_static.lib;sdl.lib;winmm.lib;%(AdditionalDependencies) + + + + + + + + + + + + + $(IntDir)audio_decoders_%(Filename).obj + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(IntDir)backends_platform_sdl_%(Filename).obj + + + + + + + + + + + + + + $(IntDir)base_%(Filename).obj + + + + + + + + + + + + + + + $(IntDir)common_%(Filename).obj + + + + + + + + + + + + + + $(IntDir)common_%(Filename).obj + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(IntDir)gui_%(Filename).obj + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Document + nasm.exe -f win32 -g -o "$(IntDir)%(Filename).obj" "%(FullPath)" + $(IntDir)%(Filename).obj;%(Outputs) + nasm.exe -f win32 -g -o "$(IntDir)%(Filename).obj" "%(FullPath)" + $(IntDir)%(Filename).obj;%(Outputs) + nasm.exe -f win32 -g -o "$(IntDir)%(Filename).obj" "%(FullPath)" + $(IntDir)%(Filename).obj;%(Outputs) + + + Document + nasm.exe -f win32 -g -o "$(IntDir)%(Filename).obj" "%(FullPath)" + $(IntDir)%(Filename).obj;%(Outputs) + nasm.exe -f win32 -g -o "$(IntDir)%(Filename).obj" "%(FullPath)" + $(IntDir)%(Filename).obj;%(Outputs) + nasm.exe -f win32 -g -o "$(IntDir)%(Filename).obj" "%(FullPath)" + $(IntDir)%(Filename).obj;%(Outputs) + + + + + {E4478496-985F-4E36-8FF6-2C91B6783506} + + + {4D36B920-3E5D-43B0-9C18-851AD09AB17C} + + + {ECEE1CD1-0C1A-4BC9-81F9-3E5498B1CD35} + + + {9BC256D4-59C5-4070-86AB-BD914E922F62} + + + {2771BF19-83C7-4E48-9777-7593DF6BAE59} + + + {B7DF84D9-85A1-477F-91CC-4EAA9C420507} + + + {FB8AD6E0-3F35-4AF2-BFAD-BA41A3B794E0} + + + {1B25D9EA-9A6E-46C1-A4F8-91AFD1B01943} + + + {E0F58DCE-862B-4927-9AE5-D488C16D85F2} + + + {2569F220-FD8F-4503-8EFB-6DA01E6E37B6} + + + {99D5E3AB-8D81-45F6-AFF8-A36D69DBCB30} + + + {49B1C14A-4F84-4047-B1AF-EE54401F8DAB} + + + {214953C2-4A67-488D-B097-06A814303A5E} + + + {B2826ABA-B6C8-49F5-8949-5C5362DAD773} + + + {C7EF81D6-60E5-4996-9106-1D661BA6D901} + + + {3C54ED04-97FE-42D8-ADA0-F7D6C5DBAD85} + + + {CE04161A-0A9D-4C08-BB2A-D04DE62D6393} + + + {EA21EDE2-1EF4-4CA3-8E0F-3C799AB2BA04} + + + {16BA2AEF-0607-4042-8A5F-84AD220A865E} + + + {3DA0192A-48FA-414E-9917-4CFDF581FB3D} + + + {D6E51CF1-A997-4EE4-82DF-4DD9D8FBE6F2} + + + {A9DE3EB5-922C-44D2-B327-D757D31B39AE} + + + {F574021E-F226-42CD-BC5E-948DD4D64037} + + + {2706B12E-1D14-4DB1-AF98-1BD8E43BB6AA} + + + {AEFC435A-831A-41BB-A5AF-B8CDC9776C12} + + + {FA8A1CEA-D13F-43D7-937A-6E97E164CC71} + + + {123D8B1A-95BF-4296-9374-380324C40BBF} + + + + + + diff -Nru scummvm-1.4.0/dists/msvc10/scummvm.vcxproj.filters scummvm-1.4.1/dists/msvc10/scummvm.vcxproj.filters --- scummvm-1.4.0/dists/msvc10/scummvm.vcxproj.filters 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/scummvm.vcxproj.filters 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,1670 @@ + + + + + F01847C7-4E45-4848-9FA7-D8C2F44C8D12 + + + 46F8767F-887E-42BA-A492-3EDFF442B332 + + + C2C91D8C-360D-4F23-B354-57DA0C7E9937 + + + CB32018B-2F93-4775-AC03-5F4DC76CF5A4 + + + 31C6DA3C-EDBD-4AC8-9368-2FC93F953E5D + + + FD5A87DA-BE08-4559-B442-98E3178FA9F5 + + + 7867357A-E51E-4FCA-8C8E-51FCB55882AB + + + E02BF676-B2AF-482F-9B04-E04A39360822 + + + 6A6FC98B-D011-4DB1-9662-11E6778CA020 + + + 8498B6D6-6C45-4A06-8E52-21A6F7D24D0F + + + 7A1E7833-CC5A-4639-ABCE-320D6300F009 + + + 3B266C20-7760-4728-B497-F73689563DC7 + + + 088B6B21-0E2F-4624-94A2-F08726DB7CDD + + + 946970C2-2E70-47BE-B62B-066755CBD41F + + + 892C9DE2-2548-484F-BB87-31AEA3E58D03 + + + 486FC0A5-5977-43A0-A4B4-4EC81286EC7B + + + 05B046DE-7462-48A2-BB0D-4039FDD9A01F + + + 34DB00BA-034C-4048-963F-028364FC616B + + + 04E69E43-0884-4DD9-8D82-57A1679C6F32 + + + 2939CC1F-6F1F-4BEE-9498-08E000DD0103 + + + BE690412-EA8D-4D12-9050-B50FCE545560 + + + A2CC1DB9-F993-4341-B55D-08E78408937E + + + 27F45BF9-665B-476E-B8A8-329E6B74EF7D + + + 2B168008-3E67-49D0-8631-FE325E279DA2 + + + 3809A677-79EB-418F-83D4-539E699599E1 + + + 3D8B444D-12B5-4B0F-AA5C-6DE2AFE6DADE + + + 129EC1EF-2D90-4805-8BA2-9D821B94A436 + + + 5E56F3D3-F196-4ADD-B874-51C29F46AFA5 + + + 248887AB-D9E7-4112-9E66-C730B65940C8 + + + AB0BF493-DB97-4859-B90A-312CB91B1194 + + + 4B18CDEB-2E0E-4D9B-944D-611BAEEA697D + + + C557075A-ABEF-435D-9A42-2530AA3986D6 + + + 68ECF9B0-1B56-41A4-B179-237CDCB65864 + + + F3163029-B0FA-4F52-8E9D-D8A69332F923 + + + 4EBB85A6-94FE-4098-AD8B-D90C307719DF + + + 2B96567D-A2AD-487D-8F77-FE08A47A9177 + + + 882FA471-072E-4728-9982-75C769A29112 + + + 95BF6E27-FEB7-46E4-89D2-001E8F9B0AE5 + + + 29ED4445-73A0-4E20-B8BB-BB4D36D627B4 + + + 2CE1222C-6586-4C9C-BE5C-63E486B8768C + + + D15AF625-C512-4E51-8323-3375828FD299 + + + 02F01ED4-AE47-4024-A1DD-4D9A98827CA9 + + + 62AA1805-4782-47AB-AF60-C3D2263DA0C4 + + + D988028D-8674-4D33-A024-340AA9942A61 + + + B985189B-2CDD-416B-A29B-18294837C8A4 + + + 092814D5-A023-4D92-B273-61819D8C00A1 + + + AACF75FE-B611-40D5-A82A-6677E629F8D5 + + + BA8E5C2D-AD2D-4C9E-BDDB-E85F792C712D + + + 3A359400-60ED-498D-8690-867550E9788B + + + 93D9EF15-738D-4B0B-AB7F-62264B1D3A45 + + + 16E22B1A-5C2F-4660-B03B-BE3D56DAB2F9 + + + + + audio\decoders + + + audio\decoders + + + audio\decoders + + + audio\decoders + + + audio\decoders + + + audio\decoders + + + audio\decoders + + + audio\decoders + + + audio\decoders + + + audio\decoders + + + audio\decoders + + + audio\decoders + + + audio\decoders + + + audio\decoders + + + audio\mods + + + audio\mods + + + audio\mods + + + audio\mods + + + audio\mods + + + audio\mods + + + audio\mods + + + audio\mods + + + audio\softsynth\fmtowns_pc98 + + + audio\softsynth\fmtowns_pc98 + + + audio\softsynth\fmtowns_pc98 + + + audio\softsynth\fmtowns_pc98 + + + audio\softsynth\fmtowns_pc98 + + + audio\softsynth\fmtowns_pc98 + + + audio\softsynth\mt32 + + + audio\softsynth\mt32 + + + audio\softsynth\mt32 + + + audio\softsynth\mt32 + + + audio\softsynth\mt32 + + + audio\softsynth\mt32 + + + audio\softsynth\mt32 + + + audio\softsynth\mt32 + + + audio\softsynth\opl + + + audio\softsynth\opl + + + audio\softsynth\opl + + + audio\softsynth + + + audio\softsynth + + + audio\softsynth + + + audio\softsynth + + + audio\softsynth + + + audio\softsynth + + + audio\softsynth + + + audio\softsynth + + + audio\softsynth + + + audio + + + audio + + + audio + + + audio + + + audio + + + audio + + + audio + + + audio + + + audio + + + audio + + + audio + + + audio + + + audio + + + backends\audiocd\default + + + backends\audiocd\sdl + + + backends\events\default + + + backends\events\sdl + + + backends\fs\windows + + + backends\fs\windows + + + backends\fs + + + backends\fs + + + backends\graphics\sdl + + + backends\graphics\surfacesdl + + + backends\log + + + backends\midi + + + backends\midi + + + backends\midi + + + backends\midi + + + backends\midi + + + backends\midi + + + backends\mixer\doublebuffersdl + + + backends\mixer\sdl + + + backends\mutex\sdl + + + backends\platform\sdl\win32 + + + backends\platform\sdl\win32 + + + backends\platform\sdl + + + backends\platform\sdl + + + backends\platform\sdl + + + backends\plugins\sdl + + + backends\plugins\win32 + + + backends\saves\default + + + backends\saves + + + backends\taskbar\win32 + + + backends\timer\default + + + backends\timer\sdl + + + backends + + + backends + + + base + + + base + + + base + + + base + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + engines + + + engines + + + engines + + + engines + + + engines + + + engines + + + graphics\fonts + + + graphics\fonts + + + graphics\fonts + + + graphics\fonts + + + graphics\fonts + + + graphics\scaler + + + graphics\scaler + + + graphics\scaler + + + graphics\scaler + + + graphics\scaler + + + graphics\scaler + + + graphics\scaler + + + graphics\scaler + + + graphics\scaler + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + gui\widgets + + + gui\widgets + + + gui\widgets + + + gui\widgets + + + gui\widgets + + + gui\widgets + + + gui + + + gui + + + gui + + + gui + + + gui + + + gui + + + gui + + + gui + + + gui + + + gui + + + gui + + + gui + + + gui + + + gui + + + gui + + + gui + + + gui + + + gui + + + gui + + + gui + + + gui + + + video\codecs + + + video\codecs + + + video\codecs + + + video\codecs + + + video\codecs + + + video\codecs + + + video\codecs + + + video\codecs + + + video\codecs + + + video\codecs + + + video + + + video + + + video + + + video + + + video + + + video + + + video + + + video + + + + + audio\decoders + + + audio\decoders + + + audio\decoders + + + audio\decoders + + + audio\decoders + + + audio\decoders + + + audio\decoders + + + audio\decoders + + + audio\decoders + + + audio\decoders + + + audio\decoders + + + audio\decoders + + + audio\decoders + + + audio\decoders + + + audio\decoders + + + audio\decoders + + + audio\decoders + + + audio\decoders + + + audio\mods + + + audio\mods + + + audio\mods + + + audio\mods + + + audio\mods + + + audio\mods + + + audio\mods + + + audio\mods + + + audio\softsynth\fmtowns_pc98 + + + audio\softsynth\fmtowns_pc98 + + + audio\softsynth\fmtowns_pc98 + + + audio\softsynth\fmtowns_pc98 + + + audio\softsynth\fmtowns_pc98 + + + audio\softsynth\mt32 + + + audio\softsynth\mt32 + + + audio\softsynth\mt32 + + + audio\softsynth\mt32 + + + audio\softsynth\mt32 + + + audio\softsynth\mt32 + + + audio\softsynth\mt32 + + + audio\softsynth\mt32 + + + audio\softsynth\mt32 + + + audio\softsynth\mt32 + + + audio\softsynth\opl + + + audio\softsynth\opl + + + audio\softsynth\opl + + + audio\softsynth + + + audio\softsynth + + + audio\softsynth + + + audio\softsynth + + + audio + + + audio + + + audio + + + audio + + + audio + + + audio + + + audio + + + audio + + + audio + + + audio + + + audio + + + audio + + + backends\audiocd\default + + + backends\audiocd\sdl + + + backends\audiocd + + + backends\events\default + + + backends\events\sdl + + + backends\fs\windows + + + backends\fs\windows + + + backends\fs + + + backends\fs + + + backends\fs + + + backends\graphics\sdl + + + backends\graphics\surfacesdl + + + backends\graphics + + + backends\graphics + + + backends\log + + + backends\mixer\doublebuffersdl + + + backends\mixer\sdl + + + backends\mutex\sdl + + + backends\mutex + + + backends\platform\sdl\win32 + + + backends\platform\sdl + + + backends\platform\sdl + + + backends\plugins\sdl + + + backends\plugins\win32 + + + backends\plugins + + + backends\saves\default + + + backends\taskbar\win32 + + + backends\taskbar\win32 + + + backends\timer\default + + + backends\timer\sdl + + + backends + + + backends + + + base + + + base + + + base + + + base + + + base + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + engines + + + engines + + + engines + + + engines + + + engines + + + engines + + + engines + + + engines + + + graphics\fonts + + + graphics\fonts + + + graphics\scaler + + + graphics\scaler + + + graphics\scaler + + + graphics\scaler + + + graphics\scaler + + + graphics\scaler + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + graphics + + + gui\widgets + + + gui\widgets + + + gui\widgets + + + gui\widgets + + + gui\widgets + + + gui\widgets + + + gui + + + gui + + + gui + + + gui + + + gui + + + gui + + + gui + + + gui + + + gui + + + gui + + + gui + + + gui + + + gui + + + gui + + + gui + + + gui + + + gui + + + gui + + + gui + + + gui + + + gui + + + gui + + + gui + + + gui + + + gui + + + video + + + video + + + video\codecs + + + video\codecs + + + video\codecs + + + video\codecs + + + video\codecs + + + video\codecs + + + video\codecs + + + video\codecs + + + video\codecs + + + video\codecs + + + video\codecs + + + video\codecs + + + video + + + video + + + video + + + video + + + video + + + video + + + video + + + + + + audio\softsynth\mt32 + + + audio + + + backends\platform\sdl + + + backends + + + base + + + common + + + engines + + + graphics + + + gui + + + icons + + + video + + + + + + + + + + + + dists + + + + + graphics\scaler + + + graphics\scaler + + + \ No newline at end of file diff -Nru scummvm-1.4.0/dists/msvc10/sky.vcxproj scummvm-1.4.1/dists/msvc10/sky.vcxproj --- scummvm-1.4.0/dists/msvc10/sky.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/sky.vcxproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,135 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Analysis + Win32 + + + Analysis + x64 + + + Release + Win32 + + + Release + x64 + + + + {16BA2AEF-0607-4042-8A5F-84AD220A865E} + sky + Win32Proj + + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc10/sky.vcxproj.filters scummvm-1.4.1/dists/msvc10/sky.vcxproj.filters --- scummvm-1.4.0/dists/msvc10/sky.vcxproj.filters 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/sky.vcxproj.filters 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,83 @@ + + + + + 696A5135-EAF7-4601-AE7D-E07C6100C7E6 + + + + + music + + + music + + + music + + + music + + + music + + + music + + + + + + + + + + + + + + + + + + + + + music + + + music + + + music + + + music + + + music + + + music + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -Nru scummvm-1.4.0/dists/msvc10/sword1.vcxproj scummvm-1.4.1/dists/msvc10/sword1.vcxproj --- scummvm-1.4.0/dists/msvc10/sword1.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/sword1.vcxproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,131 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Analysis + Win32 + + + Analysis + x64 + + + Release + Win32 + + + Release + x64 + + + + {3DA0192A-48FA-414E-9917-4CFDF581FB3D} + sword1 + Win32Proj + + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc10/sword2.vcxproj scummvm-1.4.1/dists/msvc10/sword2.vcxproj --- scummvm-1.4.0/dists/msvc10/sword2.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/sword2.vcxproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,141 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Analysis + Win32 + + + Analysis + x64 + + + Release + Win32 + + + Release + x64 + + + + {D6E51CF1-A997-4EE4-82DF-4DD9D8FBE6F2} + sword2 + Win32Proj + + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc10/teenagent.vcxproj scummvm-1.4.1/dists/msvc10/teenagent.vcxproj --- scummvm-1.4.0/dists/msvc10/teenagent.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/teenagent.vcxproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,123 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Analysis + Win32 + + + Analysis + x64 + + + Release + Win32 + + + Release + x64 + + + + {A9DE3EB5-922C-44D2-B327-D757D31B39AE} + teenagent + Win32Proj + + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc10/tinsel.vcxproj scummvm-1.4.1/dists/msvc10/tinsel.vcxproj --- scummvm-1.4.0/dists/msvc10/tinsel.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/tinsel.vcxproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,211 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Analysis + Win32 + + + Analysis + x64 + + + Release + Win32 + + + Release + x64 + + + + {F574021E-F226-42CD-BC5E-948DD4D64037} + tinsel + Win32Proj + + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ProgramDatabase + + + + + ProgramDatabase + + + + + + + + + ProgramDatabase + + + + + ProgramDatabase + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc10/toon.vcxproj scummvm-1.4.1/dists/msvc10/toon.vcxproj --- scummvm-1.4.0/dists/msvc10/toon.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/toon.vcxproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,130 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Analysis + Win32 + + + Analysis + x64 + + + Release + Win32 + + + Release + x64 + + + + {2706B12E-1D14-4DB1-AF98-1BD8E43BB6AA} + toon + Win32Proj + + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc10/touche.vcxproj scummvm-1.4.1/dists/msvc10/touche.vcxproj --- scummvm-1.4.0/dists/msvc10/touche.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/touche.vcxproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,105 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Analysis + Win32 + + + Analysis + x64 + + + Release + Win32 + + + Release + x64 + + + + {AEFC435A-831A-41BB-A5AF-B8CDC9776C12} + touche + Win32Proj + + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc10/tsage.vcxproj scummvm-1.4.1/dists/msvc10/tsage.vcxproj --- scummvm-1.4.0/dists/msvc10/tsage.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/tsage.vcxproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,171 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Analysis + Win32 + + + Analysis + x64 + + + Release + Win32 + + + Release + x64 + + + + {FA8A1CEA-D13F-43D7-937A-6E97E164CC71} + tsage + Win32Proj + + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc10/tsage.vcxproj.filters scummvm-1.4.1/dists/msvc10/tsage.vcxproj.filters --- scummvm-1.4.0/dists/msvc10/tsage.vcxproj.filters 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/tsage.vcxproj.filters 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,202 @@ + + + + + 44E46CD0-F117-4D6A-AACC-CA6B877726DF + + + EB4F8F87-1028-47F4-8F50-6F45C671A9D7 + + + + + blue_force + + + blue_force + + + blue_force + + + blue_force + + + blue_force + + + blue_force + + + blue_force + + + blue_force + + + blue_force + + + blue_force + + + blue_force + + + blue_force + + + blue_force + + + blue_force + + + ringworld + + + ringworld + + + ringworld + + + ringworld + + + ringworld + + + ringworld + + + ringworld + + + ringworld + + + ringworld + + + ringworld + + + ringworld + + + ringworld + + + + + + + + + + + + + + + + + + + blue_force + + + blue_force + + + blue_force + + + blue_force + + + blue_force + + + blue_force + + + blue_force + + + blue_force + + + blue_force + + + blue_force + + + blue_force + + + blue_force + + + blue_force + + + blue_force + + + ringworld + + + ringworld + + + ringworld + + + ringworld + + + ringworld + + + ringworld + + + ringworld + + + ringworld + + + ringworld + + + ringworld + + + ringworld + + + ringworld + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -Nru scummvm-1.4.0/dists/msvc10/tucker.vcxproj scummvm-1.4.1/dists/msvc10/tucker.vcxproj --- scummvm-1.4.0/dists/msvc10/tucker.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc10/tucker.vcxproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,103 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Analysis + Win32 + + + Analysis + x64 + + + Release + Win32 + + + Release + x64 + + + + {123D8B1A-95BF-4296-9374-380324C40BBF} + tucker + Win32Proj + + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc8/agi.vcproj scummvm-1.4.1/dists/msvc8/agi.vcproj --- scummvm-1.4.0/dists/msvc8/agi.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc8/agi.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc8/agos.vcproj scummvm-1.4.1/dists/msvc8/agos.vcproj --- scummvm-1.4.0/dists/msvc8/agos.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc8/agos.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc8/cine.vcproj scummvm-1.4.1/dists/msvc8/cine.vcproj --- scummvm-1.4.0/dists/msvc8/cine.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc8/cine.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc8/cruise.vcproj scummvm-1.4.1/dists/msvc8/cruise.vcproj --- scummvm-1.4.0/dists/msvc8/cruise.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc8/cruise.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc8/draci.vcproj scummvm-1.4.1/dists/msvc8/draci.vcproj --- scummvm-1.4.0/dists/msvc8/draci.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc8/draci.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc8/drascula.vcproj scummvm-1.4.1/dists/msvc8/drascula.vcproj --- scummvm-1.4.0/dists/msvc8/drascula.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc8/drascula.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc8/gob.vcproj scummvm-1.4.1/dists/msvc8/gob.vcproj --- scummvm-1.4.0/dists/msvc8/gob.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc8/gob.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,199 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc8/groovie.vcproj scummvm-1.4.1/dists/msvc8/groovie.vcproj --- scummvm-1.4.0/dists/msvc8/groovie.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc8/groovie.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc8/hugo.vcproj scummvm-1.4.1/dists/msvc8/hugo.vcproj --- scummvm-1.4.0/dists/msvc8/hugo.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc8/hugo.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc8/kyra.vcproj scummvm-1.4.1/dists/msvc8/kyra.vcproj --- scummvm-1.4.0/dists/msvc8/kyra.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc8/kyra.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc8/lure.vcproj scummvm-1.4.1/dists/msvc8/lure.vcproj --- scummvm-1.4.0/dists/msvc8/lure.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc8/lure.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc8/made.vcproj scummvm-1.4.1/dists/msvc8/made.vcproj --- scummvm-1.4.0/dists/msvc8/made.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc8/made.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc8/mohawk.vcproj scummvm-1.4.1/dists/msvc8/mohawk.vcproj --- scummvm-1.4.0/dists/msvc8/mohawk.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc8/mohawk.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc8/parallaction.vcproj scummvm-1.4.1/dists/msvc8/parallaction.vcproj --- scummvm-1.4.0/dists/msvc8/parallaction.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc8/parallaction.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc8/queen.vcproj scummvm-1.4.1/dists/msvc8/queen.vcproj --- scummvm-1.4.0/dists/msvc8/queen.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc8/queen.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc8/saga.vcproj scummvm-1.4.1/dists/msvc8/saga.vcproj --- scummvm-1.4.0/dists/msvc8/saga.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc8/saga.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc8/sci.vcproj scummvm-1.4.1/dists/msvc8/sci.vcproj --- scummvm-1.4.0/dists/msvc8/sci.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc8/sci.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc8/scumm.vcproj scummvm-1.4.1/dists/msvc8/scumm.vcproj --- scummvm-1.4.0/dists/msvc8/scumm.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc8/scumm.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,232 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc8/ScummVM_Analysis64.vsprops scummvm-1.4.1/dists/msvc8/ScummVM_Analysis64.vsprops --- scummvm-1.4.0/dists/msvc8/ScummVM_Analysis64.vsprops 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc8/ScummVM_Analysis64.vsprops 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,26 @@ + + + + + diff -Nru scummvm-1.4.0/dists/msvc8/ScummVM_Analysis.vsprops scummvm-1.4.1/dists/msvc8/ScummVM_Analysis.vsprops --- scummvm-1.4.0/dists/msvc8/ScummVM_Analysis.vsprops 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc8/ScummVM_Analysis.vsprops 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,26 @@ + + + + + diff -Nru scummvm-1.4.0/dists/msvc8/ScummVM_Debug64.vsprops scummvm-1.4.1/dists/msvc8/ScummVM_Debug64.vsprops --- scummvm-1.4.0/dists/msvc8/ScummVM_Debug64.vsprops 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc8/ScummVM_Debug64.vsprops 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,26 @@ + + + + + diff -Nru scummvm-1.4.0/dists/msvc8/ScummVM_Debug.vsprops scummvm-1.4.1/dists/msvc8/ScummVM_Debug.vsprops --- scummvm-1.4.0/dists/msvc8/ScummVM_Debug.vsprops 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc8/ScummVM_Debug.vsprops 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,26 @@ + + + + + diff -Nru scummvm-1.4.0/dists/msvc8/ScummVM_Global64.vsprops scummvm-1.4.1/dists/msvc8/ScummVM_Global64.vsprops --- scummvm-1.4.0/dists/msvc8/ScummVM_Global64.vsprops 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc8/ScummVM_Global64.vsprops 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,36 @@ + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc8/ScummVM_Global.vsprops scummvm-1.4.1/dists/msvc8/ScummVM_Global.vsprops --- scummvm-1.4.0/dists/msvc8/ScummVM_Global.vsprops 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc8/ScummVM_Global.vsprops 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,36 @@ + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc8/ScummVM_Release64.vsprops scummvm-1.4.1/dists/msvc8/ScummVM_Release64.vsprops --- scummvm-1.4.0/dists/msvc8/ScummVM_Release64.vsprops 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc8/ScummVM_Release64.vsprops 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,25 @@ + + + + + diff -Nru scummvm-1.4.0/dists/msvc8/ScummVM_Release.vsprops scummvm-1.4.1/dists/msvc8/ScummVM_Release.vsprops --- scummvm-1.4.0/dists/msvc8/ScummVM_Release.vsprops 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc8/ScummVM_Release.vsprops 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,25 @@ + + + + + diff -Nru scummvm-1.4.0/dists/msvc8/scummvm.sln scummvm-1.4.1/dists/msvc8/scummvm.sln --- scummvm-1.4.0/dists/msvc8/scummvm.sln 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc8/scummvm.sln 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,438 @@ +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{DA6E3EA1-6B28-45BE-ACB7-C7883D6EC626}") = "scummvm", "scummvm.vcproj", "{1695D647-75EC-41DC-86FE-14E28E486903}" + ProjectSection(ProjectDependencies) = postProject + {63FCF20C-BB46-4DDA-A8F0-ADB7E7D29D0F} = {63FCF20C-BB46-4DDA-A8F0-ADB7E7D29D0F} + {5468C0A6-349E-4BCE-BAC1-0F790FD7B0DD} = {5468C0A6-349E-4BCE-BAC1-0F790FD7B0DD} + {8F59FAAA-03A7-4476-84DD-B10738852F16} = {8F59FAAA-03A7-4476-84DD-B10738852F16} + {1EFC3962-55F8-49D7-BEF2-9CEA8CAA3E1E} = {1EFC3962-55F8-49D7-BEF2-9CEA8CAA3E1E} + {B2AE25EF-84DA-44B7-9CB3-98EF89E93834} = {B2AE25EF-84DA-44B7-9CB3-98EF89E93834} + {0FE54811-1BD9-4DB8-BA14-D0694D51B697} = {0FE54811-1BD9-4DB8-BA14-D0694D51B697} + {E8B118E0-2D1F-41FD-893E-9D839EBEF0C2} = {E8B118E0-2D1F-41FD-893E-9D839EBEF0C2} + {3B142524-E38A-4D06-A75D-418D6562F6A1} = {3B142524-E38A-4D06-A75D-418D6562F6A1} + {836D2A57-F09A-47A1-904F-B29FF0ADE56E} = {836D2A57-F09A-47A1-904F-B29FF0ADE56E} + {BA4F2867-E94C-409C-8D65-71F89D4484D3} = {BA4F2867-E94C-409C-8D65-71F89D4484D3} + {FAB3215E-4551-488F-ABCA-D0E3E725E3F6} = {FAB3215E-4551-488F-ABCA-D0E3E725E3F6} + {78A008B9-2879-4EEF-8201-6C10E721221F} = {78A008B9-2879-4EEF-8201-6C10E721221F} + {338D6973-91AC-405B-83BD-D6EE693D9FE3} = {338D6973-91AC-405B-83BD-D6EE693D9FE3} + {96ED0BCE-21F3-4124-9DFE-3FBA31E7D7E4} = {96ED0BCE-21F3-4124-9DFE-3FBA31E7D7E4} + {483ABC2F-80DC-41BF-9C9A-175DB703B821} = {483ABC2F-80DC-41BF-9C9A-175DB703B821} + {4C77213B-A780-4ABD-A5B4-D7B9B1157E83} = {4C77213B-A780-4ABD-A5B4-D7B9B1157E83} + {FDC8C84E-84D3-4E4F-9DBC-86EFA0073372} = {FDC8C84E-84D3-4E4F-9DBC-86EFA0073372} + {EA213774-DEA2-43D7-BE8A-A9BC0762B2E2} = {EA213774-DEA2-43D7-BE8A-A9BC0762B2E2} + {3F02AFF1-7B41-4F65-B340-117AAC6D154C} = {3F02AFF1-7B41-4F65-B340-117AAC6D154C} + {18E4780D-AF84-474F-8DBE-C447865C8A8D} = {18E4780D-AF84-474F-8DBE-C447865C8A8D} + {EEBC07EF-8481-408B-9280-76C7E801D136} = {EEBC07EF-8481-408B-9280-76C7E801D136} + {0DE53210-0B79-4C23-8E41-569D9B9B928D} = {0DE53210-0B79-4C23-8E41-569D9B9B928D} + {B0708567-7C15-4CEF-B9CC-291F14F51E59} = {B0708567-7C15-4CEF-B9CC-291F14F51E59} + {C7F352DC-113D-41D4-8901-F84837CB1805} = {C7F352DC-113D-41D4-8901-F84837CB1805} + {2ED36D51-50C6-405B-8F72-7F1A3FCA9CDD} = {2ED36D51-50C6-405B-8F72-7F1A3FCA9CDD} + {52B810F5-5998-41B5-81B0-14A516E86A58} = {52B810F5-5998-41B5-81B0-14A516E86A58} + {62260BD0-A897-43D3-9CBE-5A54B5CF2929} = {62260BD0-A897-43D3-9CBE-5A54B5CF2929} + EndProjectSection +EndProject +Project("{DA6E3EA1-6B28-45BE-ACB7-C7883D6EC626}") = "agi", "agi.vcproj", "{63FCF20C-BB46-4DDA-A8F0-ADB7E7D29D0F}" +EndProject +Project("{DA6E3EA1-6B28-45BE-ACB7-C7883D6EC626}") = "agos", "agos.vcproj", "{5468C0A6-349E-4BCE-BAC1-0F790FD7B0DD}" +EndProject +Project("{DA6E3EA1-6B28-45BE-ACB7-C7883D6EC626}") = "cine", "cine.vcproj", "{8F59FAAA-03A7-4476-84DD-B10738852F16}" +EndProject +Project("{DA6E3EA1-6B28-45BE-ACB7-C7883D6EC626}") = "cruise", "cruise.vcproj", "{1EFC3962-55F8-49D7-BEF2-9CEA8CAA3E1E}" +EndProject +Project("{DA6E3EA1-6B28-45BE-ACB7-C7883D6EC626}") = "draci", "draci.vcproj", "{B2AE25EF-84DA-44B7-9CB3-98EF89E93834}" +EndProject +Project("{DA6E3EA1-6B28-45BE-ACB7-C7883D6EC626}") = "drascula", "drascula.vcproj", "{0FE54811-1BD9-4DB8-BA14-D0694D51B697}" +EndProject +Project("{DA6E3EA1-6B28-45BE-ACB7-C7883D6EC626}") = "gob", "gob.vcproj", "{E8B118E0-2D1F-41FD-893E-9D839EBEF0C2}" +EndProject +Project("{DA6E3EA1-6B28-45BE-ACB7-C7883D6EC626}") = "groovie", "groovie.vcproj", "{3B142524-E38A-4D06-A75D-418D6562F6A1}" +EndProject +Project("{DA6E3EA1-6B28-45BE-ACB7-C7883D6EC626}") = "hugo", "hugo.vcproj", "{836D2A57-F09A-47A1-904F-B29FF0ADE56E}" +EndProject +Project("{DA6E3EA1-6B28-45BE-ACB7-C7883D6EC626}") = "kyra", "kyra.vcproj", "{BA4F2867-E94C-409C-8D65-71F89D4484D3}" +EndProject +Project("{DA6E3EA1-6B28-45BE-ACB7-C7883D6EC626}") = "lure", "lure.vcproj", "{FAB3215E-4551-488F-ABCA-D0E3E725E3F6}" +EndProject +Project("{DA6E3EA1-6B28-45BE-ACB7-C7883D6EC626}") = "made", "made.vcproj", "{78A008B9-2879-4EEF-8201-6C10E721221F}" +EndProject +Project("{DA6E3EA1-6B28-45BE-ACB7-C7883D6EC626}") = "mohawk", "mohawk.vcproj", "{338D6973-91AC-405B-83BD-D6EE693D9FE3}" +EndProject +Project("{DA6E3EA1-6B28-45BE-ACB7-C7883D6EC626}") = "parallaction", "parallaction.vcproj", "{96ED0BCE-21F3-4124-9DFE-3FBA31E7D7E4}" +EndProject +Project("{DA6E3EA1-6B28-45BE-ACB7-C7883D6EC626}") = "queen", "queen.vcproj", "{483ABC2F-80DC-41BF-9C9A-175DB703B821}" +EndProject +Project("{DA6E3EA1-6B28-45BE-ACB7-C7883D6EC626}") = "saga", "saga.vcproj", "{4C77213B-A780-4ABD-A5B4-D7B9B1157E83}" +EndProject +Project("{DA6E3EA1-6B28-45BE-ACB7-C7883D6EC626}") = "sci", "sci.vcproj", "{FDC8C84E-84D3-4E4F-9DBC-86EFA0073372}" +EndProject +Project("{DA6E3EA1-6B28-45BE-ACB7-C7883D6EC626}") = "scumm", "scumm.vcproj", "{EA213774-DEA2-43D7-BE8A-A9BC0762B2E2}" +EndProject +Project("{DA6E3EA1-6B28-45BE-ACB7-C7883D6EC626}") = "sky", "sky.vcproj", "{3F02AFF1-7B41-4F65-B340-117AAC6D154C}" +EndProject +Project("{DA6E3EA1-6B28-45BE-ACB7-C7883D6EC626}") = "sword1", "sword1.vcproj", "{18E4780D-AF84-474F-8DBE-C447865C8A8D}" +EndProject +Project("{DA6E3EA1-6B28-45BE-ACB7-C7883D6EC626}") = "sword2", "sword2.vcproj", "{EEBC07EF-8481-408B-9280-76C7E801D136}" +EndProject +Project("{DA6E3EA1-6B28-45BE-ACB7-C7883D6EC626}") = "teenagent", "teenagent.vcproj", "{0DE53210-0B79-4C23-8E41-569D9B9B928D}" +EndProject +Project("{DA6E3EA1-6B28-45BE-ACB7-C7883D6EC626}") = "tinsel", "tinsel.vcproj", "{B0708567-7C15-4CEF-B9CC-291F14F51E59}" +EndProject +Project("{DA6E3EA1-6B28-45BE-ACB7-C7883D6EC626}") = "toon", "toon.vcproj", "{C7F352DC-113D-41D4-8901-F84837CB1805}" +EndProject +Project("{DA6E3EA1-6B28-45BE-ACB7-C7883D6EC626}") = "touche", "touche.vcproj", "{2ED36D51-50C6-405B-8F72-7F1A3FCA9CDD}" +EndProject +Project("{DA6E3EA1-6B28-45BE-ACB7-C7883D6EC626}") = "tsage", "tsage.vcproj", "{52B810F5-5998-41B5-81B0-14A516E86A58}" +EndProject +Project("{DA6E3EA1-6B28-45BE-ACB7-C7883D6EC626}") = "tucker", "tucker.vcproj", "{62260BD0-A897-43D3-9CBE-5A54B5CF2929}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Analysis|Win32 = Analysis|Win32 + Release|Win32 = Release|Win32 + Debug|x64 = Debug|x64 + Analysis|x64 = Analysis|x64 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {63FCF20C-BB46-4DDA-A8F0-ADB7E7D29D0F}.Debug|Win32.ActiveCfg = Debug|Win32 + {63FCF20C-BB46-4DDA-A8F0-ADB7E7D29D0F}.Debug|Win32.Build.0 = Debug|Win32 + {63FCF20C-BB46-4DDA-A8F0-ADB7E7D29D0F}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {63FCF20C-BB46-4DDA-A8F0-ADB7E7D29D0F}.Analysis|Win32.Build.0 = Analysis|Win32 + {63FCF20C-BB46-4DDA-A8F0-ADB7E7D29D0F}.Release|Win32.ActiveCfg = Release|Win32 + {63FCF20C-BB46-4DDA-A8F0-ADB7E7D29D0F}.Release|Win32.Build.0 = Release|Win32 + {63FCF20C-BB46-4DDA-A8F0-ADB7E7D29D0F}.Debug|x64.ActiveCfg = Debug|x64 + {63FCF20C-BB46-4DDA-A8F0-ADB7E7D29D0F}.Debug|x64.Build.0 = Debug|x64 + {63FCF20C-BB46-4DDA-A8F0-ADB7E7D29D0F}.Analysis|x64.ActiveCfg = Analysis|x64 + {63FCF20C-BB46-4DDA-A8F0-ADB7E7D29D0F}.Analysis|x64.Build.0 = Analysis|x64 + {63FCF20C-BB46-4DDA-A8F0-ADB7E7D29D0F}.Release|x64.ActiveCfg = Release|x64 + {63FCF20C-BB46-4DDA-A8F0-ADB7E7D29D0F}.Release|x64.Build.0 = Release|x64 + {5468C0A6-349E-4BCE-BAC1-0F790FD7B0DD}.Debug|Win32.ActiveCfg = Debug|Win32 + {5468C0A6-349E-4BCE-BAC1-0F790FD7B0DD}.Debug|Win32.Build.0 = Debug|Win32 + {5468C0A6-349E-4BCE-BAC1-0F790FD7B0DD}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {5468C0A6-349E-4BCE-BAC1-0F790FD7B0DD}.Analysis|Win32.Build.0 = Analysis|Win32 + {5468C0A6-349E-4BCE-BAC1-0F790FD7B0DD}.Release|Win32.ActiveCfg = Release|Win32 + {5468C0A6-349E-4BCE-BAC1-0F790FD7B0DD}.Release|Win32.Build.0 = Release|Win32 + {5468C0A6-349E-4BCE-BAC1-0F790FD7B0DD}.Debug|x64.ActiveCfg = Debug|x64 + {5468C0A6-349E-4BCE-BAC1-0F790FD7B0DD}.Debug|x64.Build.0 = Debug|x64 + {5468C0A6-349E-4BCE-BAC1-0F790FD7B0DD}.Analysis|x64.ActiveCfg = Analysis|x64 + {5468C0A6-349E-4BCE-BAC1-0F790FD7B0DD}.Analysis|x64.Build.0 = Analysis|x64 + {5468C0A6-349E-4BCE-BAC1-0F790FD7B0DD}.Release|x64.ActiveCfg = Release|x64 + {5468C0A6-349E-4BCE-BAC1-0F790FD7B0DD}.Release|x64.Build.0 = Release|x64 + {8F59FAAA-03A7-4476-84DD-B10738852F16}.Debug|Win32.ActiveCfg = Debug|Win32 + {8F59FAAA-03A7-4476-84DD-B10738852F16}.Debug|Win32.Build.0 = Debug|Win32 + {8F59FAAA-03A7-4476-84DD-B10738852F16}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {8F59FAAA-03A7-4476-84DD-B10738852F16}.Analysis|Win32.Build.0 = Analysis|Win32 + {8F59FAAA-03A7-4476-84DD-B10738852F16}.Release|Win32.ActiveCfg = Release|Win32 + {8F59FAAA-03A7-4476-84DD-B10738852F16}.Release|Win32.Build.0 = Release|Win32 + {8F59FAAA-03A7-4476-84DD-B10738852F16}.Debug|x64.ActiveCfg = Debug|x64 + {8F59FAAA-03A7-4476-84DD-B10738852F16}.Debug|x64.Build.0 = Debug|x64 + {8F59FAAA-03A7-4476-84DD-B10738852F16}.Analysis|x64.ActiveCfg = Analysis|x64 + {8F59FAAA-03A7-4476-84DD-B10738852F16}.Analysis|x64.Build.0 = Analysis|x64 + {8F59FAAA-03A7-4476-84DD-B10738852F16}.Release|x64.ActiveCfg = Release|x64 + {8F59FAAA-03A7-4476-84DD-B10738852F16}.Release|x64.Build.0 = Release|x64 + {1EFC3962-55F8-49D7-BEF2-9CEA8CAA3E1E}.Debug|Win32.ActiveCfg = Debug|Win32 + {1EFC3962-55F8-49D7-BEF2-9CEA8CAA3E1E}.Debug|Win32.Build.0 = Debug|Win32 + {1EFC3962-55F8-49D7-BEF2-9CEA8CAA3E1E}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {1EFC3962-55F8-49D7-BEF2-9CEA8CAA3E1E}.Analysis|Win32.Build.0 = Analysis|Win32 + {1EFC3962-55F8-49D7-BEF2-9CEA8CAA3E1E}.Release|Win32.ActiveCfg = Release|Win32 + {1EFC3962-55F8-49D7-BEF2-9CEA8CAA3E1E}.Release|Win32.Build.0 = Release|Win32 + {1EFC3962-55F8-49D7-BEF2-9CEA8CAA3E1E}.Debug|x64.ActiveCfg = Debug|x64 + {1EFC3962-55F8-49D7-BEF2-9CEA8CAA3E1E}.Debug|x64.Build.0 = Debug|x64 + {1EFC3962-55F8-49D7-BEF2-9CEA8CAA3E1E}.Analysis|x64.ActiveCfg = Analysis|x64 + {1EFC3962-55F8-49D7-BEF2-9CEA8CAA3E1E}.Analysis|x64.Build.0 = Analysis|x64 + {1EFC3962-55F8-49D7-BEF2-9CEA8CAA3E1E}.Release|x64.ActiveCfg = Release|x64 + {1EFC3962-55F8-49D7-BEF2-9CEA8CAA3E1E}.Release|x64.Build.0 = Release|x64 + {B2AE25EF-84DA-44B7-9CB3-98EF89E93834}.Debug|Win32.ActiveCfg = Debug|Win32 + {B2AE25EF-84DA-44B7-9CB3-98EF89E93834}.Debug|Win32.Build.0 = Debug|Win32 + {B2AE25EF-84DA-44B7-9CB3-98EF89E93834}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {B2AE25EF-84DA-44B7-9CB3-98EF89E93834}.Analysis|Win32.Build.0 = Analysis|Win32 + {B2AE25EF-84DA-44B7-9CB3-98EF89E93834}.Release|Win32.ActiveCfg = Release|Win32 + {B2AE25EF-84DA-44B7-9CB3-98EF89E93834}.Release|Win32.Build.0 = Release|Win32 + {B2AE25EF-84DA-44B7-9CB3-98EF89E93834}.Debug|x64.ActiveCfg = Debug|x64 + {B2AE25EF-84DA-44B7-9CB3-98EF89E93834}.Debug|x64.Build.0 = Debug|x64 + {B2AE25EF-84DA-44B7-9CB3-98EF89E93834}.Analysis|x64.ActiveCfg = Analysis|x64 + {B2AE25EF-84DA-44B7-9CB3-98EF89E93834}.Analysis|x64.Build.0 = Analysis|x64 + {B2AE25EF-84DA-44B7-9CB3-98EF89E93834}.Release|x64.ActiveCfg = Release|x64 + {B2AE25EF-84DA-44B7-9CB3-98EF89E93834}.Release|x64.Build.0 = Release|x64 + {0FE54811-1BD9-4DB8-BA14-D0694D51B697}.Debug|Win32.ActiveCfg = Debug|Win32 + {0FE54811-1BD9-4DB8-BA14-D0694D51B697}.Debug|Win32.Build.0 = Debug|Win32 + {0FE54811-1BD9-4DB8-BA14-D0694D51B697}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {0FE54811-1BD9-4DB8-BA14-D0694D51B697}.Analysis|Win32.Build.0 = Analysis|Win32 + {0FE54811-1BD9-4DB8-BA14-D0694D51B697}.Release|Win32.ActiveCfg = Release|Win32 + {0FE54811-1BD9-4DB8-BA14-D0694D51B697}.Release|Win32.Build.0 = Release|Win32 + {0FE54811-1BD9-4DB8-BA14-D0694D51B697}.Debug|x64.ActiveCfg = Debug|x64 + {0FE54811-1BD9-4DB8-BA14-D0694D51B697}.Debug|x64.Build.0 = Debug|x64 + {0FE54811-1BD9-4DB8-BA14-D0694D51B697}.Analysis|x64.ActiveCfg = Analysis|x64 + {0FE54811-1BD9-4DB8-BA14-D0694D51B697}.Analysis|x64.Build.0 = Analysis|x64 + {0FE54811-1BD9-4DB8-BA14-D0694D51B697}.Release|x64.ActiveCfg = Release|x64 + {0FE54811-1BD9-4DB8-BA14-D0694D51B697}.Release|x64.Build.0 = Release|x64 + {E8B118E0-2D1F-41FD-893E-9D839EBEF0C2}.Debug|Win32.ActiveCfg = Debug|Win32 + {E8B118E0-2D1F-41FD-893E-9D839EBEF0C2}.Debug|Win32.Build.0 = Debug|Win32 + {E8B118E0-2D1F-41FD-893E-9D839EBEF0C2}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {E8B118E0-2D1F-41FD-893E-9D839EBEF0C2}.Analysis|Win32.Build.0 = Analysis|Win32 + {E8B118E0-2D1F-41FD-893E-9D839EBEF0C2}.Release|Win32.ActiveCfg = Release|Win32 + {E8B118E0-2D1F-41FD-893E-9D839EBEF0C2}.Release|Win32.Build.0 = Release|Win32 + {E8B118E0-2D1F-41FD-893E-9D839EBEF0C2}.Debug|x64.ActiveCfg = Debug|x64 + {E8B118E0-2D1F-41FD-893E-9D839EBEF0C2}.Debug|x64.Build.0 = Debug|x64 + {E8B118E0-2D1F-41FD-893E-9D839EBEF0C2}.Analysis|x64.ActiveCfg = Analysis|x64 + {E8B118E0-2D1F-41FD-893E-9D839EBEF0C2}.Analysis|x64.Build.0 = Analysis|x64 + {E8B118E0-2D1F-41FD-893E-9D839EBEF0C2}.Release|x64.ActiveCfg = Release|x64 + {E8B118E0-2D1F-41FD-893E-9D839EBEF0C2}.Release|x64.Build.0 = Release|x64 + {3B142524-E38A-4D06-A75D-418D6562F6A1}.Debug|Win32.ActiveCfg = Debug|Win32 + {3B142524-E38A-4D06-A75D-418D6562F6A1}.Debug|Win32.Build.0 = Debug|Win32 + {3B142524-E38A-4D06-A75D-418D6562F6A1}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {3B142524-E38A-4D06-A75D-418D6562F6A1}.Analysis|Win32.Build.0 = Analysis|Win32 + {3B142524-E38A-4D06-A75D-418D6562F6A1}.Release|Win32.ActiveCfg = Release|Win32 + {3B142524-E38A-4D06-A75D-418D6562F6A1}.Release|Win32.Build.0 = Release|Win32 + {3B142524-E38A-4D06-A75D-418D6562F6A1}.Debug|x64.ActiveCfg = Debug|x64 + {3B142524-E38A-4D06-A75D-418D6562F6A1}.Debug|x64.Build.0 = Debug|x64 + {3B142524-E38A-4D06-A75D-418D6562F6A1}.Analysis|x64.ActiveCfg = Analysis|x64 + {3B142524-E38A-4D06-A75D-418D6562F6A1}.Analysis|x64.Build.0 = Analysis|x64 + {3B142524-E38A-4D06-A75D-418D6562F6A1}.Release|x64.ActiveCfg = Release|x64 + {3B142524-E38A-4D06-A75D-418D6562F6A1}.Release|x64.Build.0 = Release|x64 + {836D2A57-F09A-47A1-904F-B29FF0ADE56E}.Debug|Win32.ActiveCfg = Debug|Win32 + {836D2A57-F09A-47A1-904F-B29FF0ADE56E}.Debug|Win32.Build.0 = Debug|Win32 + {836D2A57-F09A-47A1-904F-B29FF0ADE56E}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {836D2A57-F09A-47A1-904F-B29FF0ADE56E}.Analysis|Win32.Build.0 = Analysis|Win32 + {836D2A57-F09A-47A1-904F-B29FF0ADE56E}.Release|Win32.ActiveCfg = Release|Win32 + {836D2A57-F09A-47A1-904F-B29FF0ADE56E}.Release|Win32.Build.0 = Release|Win32 + {836D2A57-F09A-47A1-904F-B29FF0ADE56E}.Debug|x64.ActiveCfg = Debug|x64 + {836D2A57-F09A-47A1-904F-B29FF0ADE56E}.Debug|x64.Build.0 = Debug|x64 + {836D2A57-F09A-47A1-904F-B29FF0ADE56E}.Analysis|x64.ActiveCfg = Analysis|x64 + {836D2A57-F09A-47A1-904F-B29FF0ADE56E}.Analysis|x64.Build.0 = Analysis|x64 + {836D2A57-F09A-47A1-904F-B29FF0ADE56E}.Release|x64.ActiveCfg = Release|x64 + {836D2A57-F09A-47A1-904F-B29FF0ADE56E}.Release|x64.Build.0 = Release|x64 + {BA4F2867-E94C-409C-8D65-71F89D4484D3}.Debug|Win32.ActiveCfg = Debug|Win32 + {BA4F2867-E94C-409C-8D65-71F89D4484D3}.Debug|Win32.Build.0 = Debug|Win32 + {BA4F2867-E94C-409C-8D65-71F89D4484D3}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {BA4F2867-E94C-409C-8D65-71F89D4484D3}.Analysis|Win32.Build.0 = Analysis|Win32 + {BA4F2867-E94C-409C-8D65-71F89D4484D3}.Release|Win32.ActiveCfg = Release|Win32 + {BA4F2867-E94C-409C-8D65-71F89D4484D3}.Release|Win32.Build.0 = Release|Win32 + {BA4F2867-E94C-409C-8D65-71F89D4484D3}.Debug|x64.ActiveCfg = Debug|x64 + {BA4F2867-E94C-409C-8D65-71F89D4484D3}.Debug|x64.Build.0 = Debug|x64 + {BA4F2867-E94C-409C-8D65-71F89D4484D3}.Analysis|x64.ActiveCfg = Analysis|x64 + {BA4F2867-E94C-409C-8D65-71F89D4484D3}.Analysis|x64.Build.0 = Analysis|x64 + {BA4F2867-E94C-409C-8D65-71F89D4484D3}.Release|x64.ActiveCfg = Release|x64 + {BA4F2867-E94C-409C-8D65-71F89D4484D3}.Release|x64.Build.0 = Release|x64 + {FAB3215E-4551-488F-ABCA-D0E3E725E3F6}.Debug|Win32.ActiveCfg = Debug|Win32 + {FAB3215E-4551-488F-ABCA-D0E3E725E3F6}.Debug|Win32.Build.0 = Debug|Win32 + {FAB3215E-4551-488F-ABCA-D0E3E725E3F6}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {FAB3215E-4551-488F-ABCA-D0E3E725E3F6}.Analysis|Win32.Build.0 = Analysis|Win32 + {FAB3215E-4551-488F-ABCA-D0E3E725E3F6}.Release|Win32.ActiveCfg = Release|Win32 + {FAB3215E-4551-488F-ABCA-D0E3E725E3F6}.Release|Win32.Build.0 = Release|Win32 + {FAB3215E-4551-488F-ABCA-D0E3E725E3F6}.Debug|x64.ActiveCfg = Debug|x64 + {FAB3215E-4551-488F-ABCA-D0E3E725E3F6}.Debug|x64.Build.0 = Debug|x64 + {FAB3215E-4551-488F-ABCA-D0E3E725E3F6}.Analysis|x64.ActiveCfg = Analysis|x64 + {FAB3215E-4551-488F-ABCA-D0E3E725E3F6}.Analysis|x64.Build.0 = Analysis|x64 + {FAB3215E-4551-488F-ABCA-D0E3E725E3F6}.Release|x64.ActiveCfg = Release|x64 + {FAB3215E-4551-488F-ABCA-D0E3E725E3F6}.Release|x64.Build.0 = Release|x64 + {78A008B9-2879-4EEF-8201-6C10E721221F}.Debug|Win32.ActiveCfg = Debug|Win32 + {78A008B9-2879-4EEF-8201-6C10E721221F}.Debug|Win32.Build.0 = Debug|Win32 + {78A008B9-2879-4EEF-8201-6C10E721221F}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {78A008B9-2879-4EEF-8201-6C10E721221F}.Analysis|Win32.Build.0 = Analysis|Win32 + {78A008B9-2879-4EEF-8201-6C10E721221F}.Release|Win32.ActiveCfg = Release|Win32 + {78A008B9-2879-4EEF-8201-6C10E721221F}.Release|Win32.Build.0 = Release|Win32 + {78A008B9-2879-4EEF-8201-6C10E721221F}.Debug|x64.ActiveCfg = Debug|x64 + {78A008B9-2879-4EEF-8201-6C10E721221F}.Debug|x64.Build.0 = Debug|x64 + {78A008B9-2879-4EEF-8201-6C10E721221F}.Analysis|x64.ActiveCfg = Analysis|x64 + {78A008B9-2879-4EEF-8201-6C10E721221F}.Analysis|x64.Build.0 = Analysis|x64 + {78A008B9-2879-4EEF-8201-6C10E721221F}.Release|x64.ActiveCfg = Release|x64 + {78A008B9-2879-4EEF-8201-6C10E721221F}.Release|x64.Build.0 = Release|x64 + {338D6973-91AC-405B-83BD-D6EE693D9FE3}.Debug|Win32.ActiveCfg = Debug|Win32 + {338D6973-91AC-405B-83BD-D6EE693D9FE3}.Debug|Win32.Build.0 = Debug|Win32 + {338D6973-91AC-405B-83BD-D6EE693D9FE3}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {338D6973-91AC-405B-83BD-D6EE693D9FE3}.Analysis|Win32.Build.0 = Analysis|Win32 + {338D6973-91AC-405B-83BD-D6EE693D9FE3}.Release|Win32.ActiveCfg = Release|Win32 + {338D6973-91AC-405B-83BD-D6EE693D9FE3}.Release|Win32.Build.0 = Release|Win32 + {338D6973-91AC-405B-83BD-D6EE693D9FE3}.Debug|x64.ActiveCfg = Debug|x64 + {338D6973-91AC-405B-83BD-D6EE693D9FE3}.Debug|x64.Build.0 = Debug|x64 + {338D6973-91AC-405B-83BD-D6EE693D9FE3}.Analysis|x64.ActiveCfg = Analysis|x64 + {338D6973-91AC-405B-83BD-D6EE693D9FE3}.Analysis|x64.Build.0 = Analysis|x64 + {338D6973-91AC-405B-83BD-D6EE693D9FE3}.Release|x64.ActiveCfg = Release|x64 + {338D6973-91AC-405B-83BD-D6EE693D9FE3}.Release|x64.Build.0 = Release|x64 + {96ED0BCE-21F3-4124-9DFE-3FBA31E7D7E4}.Debug|Win32.ActiveCfg = Debug|Win32 + {96ED0BCE-21F3-4124-9DFE-3FBA31E7D7E4}.Debug|Win32.Build.0 = Debug|Win32 + {96ED0BCE-21F3-4124-9DFE-3FBA31E7D7E4}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {96ED0BCE-21F3-4124-9DFE-3FBA31E7D7E4}.Analysis|Win32.Build.0 = Analysis|Win32 + {96ED0BCE-21F3-4124-9DFE-3FBA31E7D7E4}.Release|Win32.ActiveCfg = Release|Win32 + {96ED0BCE-21F3-4124-9DFE-3FBA31E7D7E4}.Release|Win32.Build.0 = Release|Win32 + {96ED0BCE-21F3-4124-9DFE-3FBA31E7D7E4}.Debug|x64.ActiveCfg = Debug|x64 + {96ED0BCE-21F3-4124-9DFE-3FBA31E7D7E4}.Debug|x64.Build.0 = Debug|x64 + {96ED0BCE-21F3-4124-9DFE-3FBA31E7D7E4}.Analysis|x64.ActiveCfg = Analysis|x64 + {96ED0BCE-21F3-4124-9DFE-3FBA31E7D7E4}.Analysis|x64.Build.0 = Analysis|x64 + {96ED0BCE-21F3-4124-9DFE-3FBA31E7D7E4}.Release|x64.ActiveCfg = Release|x64 + {96ED0BCE-21F3-4124-9DFE-3FBA31E7D7E4}.Release|x64.Build.0 = Release|x64 + {483ABC2F-80DC-41BF-9C9A-175DB703B821}.Debug|Win32.ActiveCfg = Debug|Win32 + {483ABC2F-80DC-41BF-9C9A-175DB703B821}.Debug|Win32.Build.0 = Debug|Win32 + {483ABC2F-80DC-41BF-9C9A-175DB703B821}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {483ABC2F-80DC-41BF-9C9A-175DB703B821}.Analysis|Win32.Build.0 = Analysis|Win32 + {483ABC2F-80DC-41BF-9C9A-175DB703B821}.Release|Win32.ActiveCfg = Release|Win32 + {483ABC2F-80DC-41BF-9C9A-175DB703B821}.Release|Win32.Build.0 = Release|Win32 + {483ABC2F-80DC-41BF-9C9A-175DB703B821}.Debug|x64.ActiveCfg = Debug|x64 + {483ABC2F-80DC-41BF-9C9A-175DB703B821}.Debug|x64.Build.0 = Debug|x64 + {483ABC2F-80DC-41BF-9C9A-175DB703B821}.Analysis|x64.ActiveCfg = Analysis|x64 + {483ABC2F-80DC-41BF-9C9A-175DB703B821}.Analysis|x64.Build.0 = Analysis|x64 + {483ABC2F-80DC-41BF-9C9A-175DB703B821}.Release|x64.ActiveCfg = Release|x64 + {483ABC2F-80DC-41BF-9C9A-175DB703B821}.Release|x64.Build.0 = Release|x64 + {4C77213B-A780-4ABD-A5B4-D7B9B1157E83}.Debug|Win32.ActiveCfg = Debug|Win32 + {4C77213B-A780-4ABD-A5B4-D7B9B1157E83}.Debug|Win32.Build.0 = Debug|Win32 + {4C77213B-A780-4ABD-A5B4-D7B9B1157E83}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {4C77213B-A780-4ABD-A5B4-D7B9B1157E83}.Analysis|Win32.Build.0 = Analysis|Win32 + {4C77213B-A780-4ABD-A5B4-D7B9B1157E83}.Release|Win32.ActiveCfg = Release|Win32 + {4C77213B-A780-4ABD-A5B4-D7B9B1157E83}.Release|Win32.Build.0 = Release|Win32 + {4C77213B-A780-4ABD-A5B4-D7B9B1157E83}.Debug|x64.ActiveCfg = Debug|x64 + {4C77213B-A780-4ABD-A5B4-D7B9B1157E83}.Debug|x64.Build.0 = Debug|x64 + {4C77213B-A780-4ABD-A5B4-D7B9B1157E83}.Analysis|x64.ActiveCfg = Analysis|x64 + {4C77213B-A780-4ABD-A5B4-D7B9B1157E83}.Analysis|x64.Build.0 = Analysis|x64 + {4C77213B-A780-4ABD-A5B4-D7B9B1157E83}.Release|x64.ActiveCfg = Release|x64 + {4C77213B-A780-4ABD-A5B4-D7B9B1157E83}.Release|x64.Build.0 = Release|x64 + {FDC8C84E-84D3-4E4F-9DBC-86EFA0073372}.Debug|Win32.ActiveCfg = Debug|Win32 + {FDC8C84E-84D3-4E4F-9DBC-86EFA0073372}.Debug|Win32.Build.0 = Debug|Win32 + {FDC8C84E-84D3-4E4F-9DBC-86EFA0073372}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {FDC8C84E-84D3-4E4F-9DBC-86EFA0073372}.Analysis|Win32.Build.0 = Analysis|Win32 + {FDC8C84E-84D3-4E4F-9DBC-86EFA0073372}.Release|Win32.ActiveCfg = Release|Win32 + {FDC8C84E-84D3-4E4F-9DBC-86EFA0073372}.Release|Win32.Build.0 = Release|Win32 + {FDC8C84E-84D3-4E4F-9DBC-86EFA0073372}.Debug|x64.ActiveCfg = Debug|x64 + {FDC8C84E-84D3-4E4F-9DBC-86EFA0073372}.Debug|x64.Build.0 = Debug|x64 + {FDC8C84E-84D3-4E4F-9DBC-86EFA0073372}.Analysis|x64.ActiveCfg = Analysis|x64 + {FDC8C84E-84D3-4E4F-9DBC-86EFA0073372}.Analysis|x64.Build.0 = Analysis|x64 + {FDC8C84E-84D3-4E4F-9DBC-86EFA0073372}.Release|x64.ActiveCfg = Release|x64 + {FDC8C84E-84D3-4E4F-9DBC-86EFA0073372}.Release|x64.Build.0 = Release|x64 + {EA213774-DEA2-43D7-BE8A-A9BC0762B2E2}.Debug|Win32.ActiveCfg = Debug|Win32 + {EA213774-DEA2-43D7-BE8A-A9BC0762B2E2}.Debug|Win32.Build.0 = Debug|Win32 + {EA213774-DEA2-43D7-BE8A-A9BC0762B2E2}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {EA213774-DEA2-43D7-BE8A-A9BC0762B2E2}.Analysis|Win32.Build.0 = Analysis|Win32 + {EA213774-DEA2-43D7-BE8A-A9BC0762B2E2}.Release|Win32.ActiveCfg = Release|Win32 + {EA213774-DEA2-43D7-BE8A-A9BC0762B2E2}.Release|Win32.Build.0 = Release|Win32 + {EA213774-DEA2-43D7-BE8A-A9BC0762B2E2}.Debug|x64.ActiveCfg = Debug|x64 + {EA213774-DEA2-43D7-BE8A-A9BC0762B2E2}.Debug|x64.Build.0 = Debug|x64 + {EA213774-DEA2-43D7-BE8A-A9BC0762B2E2}.Analysis|x64.ActiveCfg = Analysis|x64 + {EA213774-DEA2-43D7-BE8A-A9BC0762B2E2}.Analysis|x64.Build.0 = Analysis|x64 + {EA213774-DEA2-43D7-BE8A-A9BC0762B2E2}.Release|x64.ActiveCfg = Release|x64 + {EA213774-DEA2-43D7-BE8A-A9BC0762B2E2}.Release|x64.Build.0 = Release|x64 + {1695D647-75EC-41DC-86FE-14E28E486903}.Debug|Win32.ActiveCfg = Debug|Win32 + {1695D647-75EC-41DC-86FE-14E28E486903}.Debug|Win32.Build.0 = Debug|Win32 + {1695D647-75EC-41DC-86FE-14E28E486903}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {1695D647-75EC-41DC-86FE-14E28E486903}.Analysis|Win32.Build.0 = Analysis|Win32 + {1695D647-75EC-41DC-86FE-14E28E486903}.Release|Win32.ActiveCfg = Release|Win32 + {1695D647-75EC-41DC-86FE-14E28E486903}.Release|Win32.Build.0 = Release|Win32 + {1695D647-75EC-41DC-86FE-14E28E486903}.Debug|x64.ActiveCfg = Debug|x64 + {1695D647-75EC-41DC-86FE-14E28E486903}.Debug|x64.Build.0 = Debug|x64 + {1695D647-75EC-41DC-86FE-14E28E486903}.Analysis|x64.ActiveCfg = Analysis|x64 + {1695D647-75EC-41DC-86FE-14E28E486903}.Analysis|x64.Build.0 = Analysis|x64 + {1695D647-75EC-41DC-86FE-14E28E486903}.Release|x64.ActiveCfg = Release|x64 + {1695D647-75EC-41DC-86FE-14E28E486903}.Release|x64.Build.0 = Release|x64 + {3F02AFF1-7B41-4F65-B340-117AAC6D154C}.Debug|Win32.ActiveCfg = Debug|Win32 + {3F02AFF1-7B41-4F65-B340-117AAC6D154C}.Debug|Win32.Build.0 = Debug|Win32 + {3F02AFF1-7B41-4F65-B340-117AAC6D154C}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {3F02AFF1-7B41-4F65-B340-117AAC6D154C}.Analysis|Win32.Build.0 = Analysis|Win32 + {3F02AFF1-7B41-4F65-B340-117AAC6D154C}.Release|Win32.ActiveCfg = Release|Win32 + {3F02AFF1-7B41-4F65-B340-117AAC6D154C}.Release|Win32.Build.0 = Release|Win32 + {3F02AFF1-7B41-4F65-B340-117AAC6D154C}.Debug|x64.ActiveCfg = Debug|x64 + {3F02AFF1-7B41-4F65-B340-117AAC6D154C}.Debug|x64.Build.0 = Debug|x64 + {3F02AFF1-7B41-4F65-B340-117AAC6D154C}.Analysis|x64.ActiveCfg = Analysis|x64 + {3F02AFF1-7B41-4F65-B340-117AAC6D154C}.Analysis|x64.Build.0 = Analysis|x64 + {3F02AFF1-7B41-4F65-B340-117AAC6D154C}.Release|x64.ActiveCfg = Release|x64 + {3F02AFF1-7B41-4F65-B340-117AAC6D154C}.Release|x64.Build.0 = Release|x64 + {18E4780D-AF84-474F-8DBE-C447865C8A8D}.Debug|Win32.ActiveCfg = Debug|Win32 + {18E4780D-AF84-474F-8DBE-C447865C8A8D}.Debug|Win32.Build.0 = Debug|Win32 + {18E4780D-AF84-474F-8DBE-C447865C8A8D}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {18E4780D-AF84-474F-8DBE-C447865C8A8D}.Analysis|Win32.Build.0 = Analysis|Win32 + {18E4780D-AF84-474F-8DBE-C447865C8A8D}.Release|Win32.ActiveCfg = Release|Win32 + {18E4780D-AF84-474F-8DBE-C447865C8A8D}.Release|Win32.Build.0 = Release|Win32 + {18E4780D-AF84-474F-8DBE-C447865C8A8D}.Debug|x64.ActiveCfg = Debug|x64 + {18E4780D-AF84-474F-8DBE-C447865C8A8D}.Debug|x64.Build.0 = Debug|x64 + {18E4780D-AF84-474F-8DBE-C447865C8A8D}.Analysis|x64.ActiveCfg = Analysis|x64 + {18E4780D-AF84-474F-8DBE-C447865C8A8D}.Analysis|x64.Build.0 = Analysis|x64 + {18E4780D-AF84-474F-8DBE-C447865C8A8D}.Release|x64.ActiveCfg = Release|x64 + {18E4780D-AF84-474F-8DBE-C447865C8A8D}.Release|x64.Build.0 = Release|x64 + {EEBC07EF-8481-408B-9280-76C7E801D136}.Debug|Win32.ActiveCfg = Debug|Win32 + {EEBC07EF-8481-408B-9280-76C7E801D136}.Debug|Win32.Build.0 = Debug|Win32 + {EEBC07EF-8481-408B-9280-76C7E801D136}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {EEBC07EF-8481-408B-9280-76C7E801D136}.Analysis|Win32.Build.0 = Analysis|Win32 + {EEBC07EF-8481-408B-9280-76C7E801D136}.Release|Win32.ActiveCfg = Release|Win32 + {EEBC07EF-8481-408B-9280-76C7E801D136}.Release|Win32.Build.0 = Release|Win32 + {EEBC07EF-8481-408B-9280-76C7E801D136}.Debug|x64.ActiveCfg = Debug|x64 + {EEBC07EF-8481-408B-9280-76C7E801D136}.Debug|x64.Build.0 = Debug|x64 + {EEBC07EF-8481-408B-9280-76C7E801D136}.Analysis|x64.ActiveCfg = Analysis|x64 + {EEBC07EF-8481-408B-9280-76C7E801D136}.Analysis|x64.Build.0 = Analysis|x64 + {EEBC07EF-8481-408B-9280-76C7E801D136}.Release|x64.ActiveCfg = Release|x64 + {EEBC07EF-8481-408B-9280-76C7E801D136}.Release|x64.Build.0 = Release|x64 + {0DE53210-0B79-4C23-8E41-569D9B9B928D}.Debug|Win32.ActiveCfg = Debug|Win32 + {0DE53210-0B79-4C23-8E41-569D9B9B928D}.Debug|Win32.Build.0 = Debug|Win32 + {0DE53210-0B79-4C23-8E41-569D9B9B928D}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {0DE53210-0B79-4C23-8E41-569D9B9B928D}.Analysis|Win32.Build.0 = Analysis|Win32 + {0DE53210-0B79-4C23-8E41-569D9B9B928D}.Release|Win32.ActiveCfg = Release|Win32 + {0DE53210-0B79-4C23-8E41-569D9B9B928D}.Release|Win32.Build.0 = Release|Win32 + {0DE53210-0B79-4C23-8E41-569D9B9B928D}.Debug|x64.ActiveCfg = Debug|x64 + {0DE53210-0B79-4C23-8E41-569D9B9B928D}.Debug|x64.Build.0 = Debug|x64 + {0DE53210-0B79-4C23-8E41-569D9B9B928D}.Analysis|x64.ActiveCfg = Analysis|x64 + {0DE53210-0B79-4C23-8E41-569D9B9B928D}.Analysis|x64.Build.0 = Analysis|x64 + {0DE53210-0B79-4C23-8E41-569D9B9B928D}.Release|x64.ActiveCfg = Release|x64 + {0DE53210-0B79-4C23-8E41-569D9B9B928D}.Release|x64.Build.0 = Release|x64 + {B0708567-7C15-4CEF-B9CC-291F14F51E59}.Debug|Win32.ActiveCfg = Debug|Win32 + {B0708567-7C15-4CEF-B9CC-291F14F51E59}.Debug|Win32.Build.0 = Debug|Win32 + {B0708567-7C15-4CEF-B9CC-291F14F51E59}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {B0708567-7C15-4CEF-B9CC-291F14F51E59}.Analysis|Win32.Build.0 = Analysis|Win32 + {B0708567-7C15-4CEF-B9CC-291F14F51E59}.Release|Win32.ActiveCfg = Release|Win32 + {B0708567-7C15-4CEF-B9CC-291F14F51E59}.Release|Win32.Build.0 = Release|Win32 + {B0708567-7C15-4CEF-B9CC-291F14F51E59}.Debug|x64.ActiveCfg = Debug|x64 + {B0708567-7C15-4CEF-B9CC-291F14F51E59}.Debug|x64.Build.0 = Debug|x64 + {B0708567-7C15-4CEF-B9CC-291F14F51E59}.Analysis|x64.ActiveCfg = Analysis|x64 + {B0708567-7C15-4CEF-B9CC-291F14F51E59}.Analysis|x64.Build.0 = Analysis|x64 + {B0708567-7C15-4CEF-B9CC-291F14F51E59}.Release|x64.ActiveCfg = Release|x64 + {B0708567-7C15-4CEF-B9CC-291F14F51E59}.Release|x64.Build.0 = Release|x64 + {C7F352DC-113D-41D4-8901-F84837CB1805}.Debug|Win32.ActiveCfg = Debug|Win32 + {C7F352DC-113D-41D4-8901-F84837CB1805}.Debug|Win32.Build.0 = Debug|Win32 + {C7F352DC-113D-41D4-8901-F84837CB1805}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {C7F352DC-113D-41D4-8901-F84837CB1805}.Analysis|Win32.Build.0 = Analysis|Win32 + {C7F352DC-113D-41D4-8901-F84837CB1805}.Release|Win32.ActiveCfg = Release|Win32 + {C7F352DC-113D-41D4-8901-F84837CB1805}.Release|Win32.Build.0 = Release|Win32 + {C7F352DC-113D-41D4-8901-F84837CB1805}.Debug|x64.ActiveCfg = Debug|x64 + {C7F352DC-113D-41D4-8901-F84837CB1805}.Debug|x64.Build.0 = Debug|x64 + {C7F352DC-113D-41D4-8901-F84837CB1805}.Analysis|x64.ActiveCfg = Analysis|x64 + {C7F352DC-113D-41D4-8901-F84837CB1805}.Analysis|x64.Build.0 = Analysis|x64 + {C7F352DC-113D-41D4-8901-F84837CB1805}.Release|x64.ActiveCfg = Release|x64 + {C7F352DC-113D-41D4-8901-F84837CB1805}.Release|x64.Build.0 = Release|x64 + {2ED36D51-50C6-405B-8F72-7F1A3FCA9CDD}.Debug|Win32.ActiveCfg = Debug|Win32 + {2ED36D51-50C6-405B-8F72-7F1A3FCA9CDD}.Debug|Win32.Build.0 = Debug|Win32 + {2ED36D51-50C6-405B-8F72-7F1A3FCA9CDD}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {2ED36D51-50C6-405B-8F72-7F1A3FCA9CDD}.Analysis|Win32.Build.0 = Analysis|Win32 + {2ED36D51-50C6-405B-8F72-7F1A3FCA9CDD}.Release|Win32.ActiveCfg = Release|Win32 + {2ED36D51-50C6-405B-8F72-7F1A3FCA9CDD}.Release|Win32.Build.0 = Release|Win32 + {2ED36D51-50C6-405B-8F72-7F1A3FCA9CDD}.Debug|x64.ActiveCfg = Debug|x64 + {2ED36D51-50C6-405B-8F72-7F1A3FCA9CDD}.Debug|x64.Build.0 = Debug|x64 + {2ED36D51-50C6-405B-8F72-7F1A3FCA9CDD}.Analysis|x64.ActiveCfg = Analysis|x64 + {2ED36D51-50C6-405B-8F72-7F1A3FCA9CDD}.Analysis|x64.Build.0 = Analysis|x64 + {2ED36D51-50C6-405B-8F72-7F1A3FCA9CDD}.Release|x64.ActiveCfg = Release|x64 + {2ED36D51-50C6-405B-8F72-7F1A3FCA9CDD}.Release|x64.Build.0 = Release|x64 + {52B810F5-5998-41B5-81B0-14A516E86A58}.Debug|Win32.ActiveCfg = Debug|Win32 + {52B810F5-5998-41B5-81B0-14A516E86A58}.Debug|Win32.Build.0 = Debug|Win32 + {52B810F5-5998-41B5-81B0-14A516E86A58}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {52B810F5-5998-41B5-81B0-14A516E86A58}.Analysis|Win32.Build.0 = Analysis|Win32 + {52B810F5-5998-41B5-81B0-14A516E86A58}.Release|Win32.ActiveCfg = Release|Win32 + {52B810F5-5998-41B5-81B0-14A516E86A58}.Release|Win32.Build.0 = Release|Win32 + {52B810F5-5998-41B5-81B0-14A516E86A58}.Debug|x64.ActiveCfg = Debug|x64 + {52B810F5-5998-41B5-81B0-14A516E86A58}.Debug|x64.Build.0 = Debug|x64 + {52B810F5-5998-41B5-81B0-14A516E86A58}.Analysis|x64.ActiveCfg = Analysis|x64 + {52B810F5-5998-41B5-81B0-14A516E86A58}.Analysis|x64.Build.0 = Analysis|x64 + {52B810F5-5998-41B5-81B0-14A516E86A58}.Release|x64.ActiveCfg = Release|x64 + {52B810F5-5998-41B5-81B0-14A516E86A58}.Release|x64.Build.0 = Release|x64 + {62260BD0-A897-43D3-9CBE-5A54B5CF2929}.Debug|Win32.ActiveCfg = Debug|Win32 + {62260BD0-A897-43D3-9CBE-5A54B5CF2929}.Debug|Win32.Build.0 = Debug|Win32 + {62260BD0-A897-43D3-9CBE-5A54B5CF2929}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {62260BD0-A897-43D3-9CBE-5A54B5CF2929}.Analysis|Win32.Build.0 = Analysis|Win32 + {62260BD0-A897-43D3-9CBE-5A54B5CF2929}.Release|Win32.ActiveCfg = Release|Win32 + {62260BD0-A897-43D3-9CBE-5A54B5CF2929}.Release|Win32.Build.0 = Release|Win32 + {62260BD0-A897-43D3-9CBE-5A54B5CF2929}.Debug|x64.ActiveCfg = Debug|x64 + {62260BD0-A897-43D3-9CBE-5A54B5CF2929}.Debug|x64.Build.0 = Debug|x64 + {62260BD0-A897-43D3-9CBE-5A54B5CF2929}.Analysis|x64.ActiveCfg = Analysis|x64 + {62260BD0-A897-43D3-9CBE-5A54B5CF2929}.Analysis|x64.Build.0 = Analysis|x64 + {62260BD0-A897-43D3-9CBE-5A54B5CF2929}.Release|x64.ActiveCfg = Release|x64 + {62260BD0-A897-43D3-9CBE-5A54B5CF2929}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff -Nru scummvm-1.4.0/dists/msvc8/scummvm.vcproj scummvm-1.4.1/dists/msvc8/scummvm.vcproj --- scummvm-1.4.0/dists/msvc8/scummvm.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc8/scummvm.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,796 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc8/sky.vcproj scummvm-1.4.1/dists/msvc8/sky.vcproj --- scummvm-1.4.0/dists/msvc8/sky.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc8/sky.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc8/sword1.vcproj scummvm-1.4.1/dists/msvc8/sword1.vcproj --- scummvm-1.4.0/dists/msvc8/sword1.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc8/sword1.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc8/sword2.vcproj scummvm-1.4.1/dists/msvc8/sword2.vcproj --- scummvm-1.4.0/dists/msvc8/sword2.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc8/sword2.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc8/teenagent.vcproj scummvm-1.4.1/dists/msvc8/teenagent.vcproj --- scummvm-1.4.0/dists/msvc8/teenagent.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc8/teenagent.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc8/tinsel.vcproj scummvm-1.4.1/dists/msvc8/tinsel.vcproj --- scummvm-1.4.0/dists/msvc8/tinsel.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc8/tinsel.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc8/toon.vcproj scummvm-1.4.1/dists/msvc8/toon.vcproj --- scummvm-1.4.0/dists/msvc8/toon.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc8/toon.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc8/touche.vcproj scummvm-1.4.1/dists/msvc8/touche.vcproj --- scummvm-1.4.0/dists/msvc8/touche.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc8/touche.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc8/tsage.vcproj scummvm-1.4.1/dists/msvc8/tsage.vcproj --- scummvm-1.4.0/dists/msvc8/tsage.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc8/tsage.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc8/tucker.vcproj scummvm-1.4.1/dists/msvc8/tucker.vcproj --- scummvm-1.4.0/dists/msvc8/tucker.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc8/tucker.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc9/agi.vcproj scummvm-1.4.1/dists/msvc9/agi.vcproj --- scummvm-1.4.0/dists/msvc9/agi.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc9/agi.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc9/agos.vcproj scummvm-1.4.1/dists/msvc9/agos.vcproj --- scummvm-1.4.0/dists/msvc9/agos.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc9/agos.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc9/cge.vcproj scummvm-1.4.1/dists/msvc9/cge.vcproj --- scummvm-1.4.0/dists/msvc9/cge.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc9/cge.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc9/cine.vcproj scummvm-1.4.1/dists/msvc9/cine.vcproj --- scummvm-1.4.0/dists/msvc9/cine.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc9/cine.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc9/cruise.vcproj scummvm-1.4.1/dists/msvc9/cruise.vcproj --- scummvm-1.4.0/dists/msvc9/cruise.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc9/cruise.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc9/draci.vcproj scummvm-1.4.1/dists/msvc9/draci.vcproj --- scummvm-1.4.0/dists/msvc9/draci.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc9/draci.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc9/drascula.vcproj scummvm-1.4.1/dists/msvc9/drascula.vcproj --- scummvm-1.4.0/dists/msvc9/drascula.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc9/drascula.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc9/gob.vcproj scummvm-1.4.1/dists/msvc9/gob.vcproj --- scummvm-1.4.0/dists/msvc9/gob.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc9/gob.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,200 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc9/groovie.vcproj scummvm-1.4.1/dists/msvc9/groovie.vcproj --- scummvm-1.4.0/dists/msvc9/groovie.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc9/groovie.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc9/hugo.vcproj scummvm-1.4.1/dists/msvc9/hugo.vcproj --- scummvm-1.4.0/dists/msvc9/hugo.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc9/hugo.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc9/kyra.vcproj scummvm-1.4.1/dists/msvc9/kyra.vcproj --- scummvm-1.4.0/dists/msvc9/kyra.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc9/kyra.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc9/lure.vcproj scummvm-1.4.1/dists/msvc9/lure.vcproj --- scummvm-1.4.0/dists/msvc9/lure.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc9/lure.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc9/made.vcproj scummvm-1.4.1/dists/msvc9/made.vcproj --- scummvm-1.4.0/dists/msvc9/made.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc9/made.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc9/mohawk.vcproj scummvm-1.4.1/dists/msvc9/mohawk.vcproj --- scummvm-1.4.0/dists/msvc9/mohawk.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc9/mohawk.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc9/parallaction.vcproj scummvm-1.4.1/dists/msvc9/parallaction.vcproj --- scummvm-1.4.0/dists/msvc9/parallaction.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc9/parallaction.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc9/queen.vcproj scummvm-1.4.1/dists/msvc9/queen.vcproj --- scummvm-1.4.0/dists/msvc9/queen.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc9/queen.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc9/saga.vcproj scummvm-1.4.1/dists/msvc9/saga.vcproj --- scummvm-1.4.0/dists/msvc9/saga.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc9/saga.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc9/sci.vcproj scummvm-1.4.1/dists/msvc9/sci.vcproj --- scummvm-1.4.0/dists/msvc9/sci.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc9/sci.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc9/scumm.vcproj scummvm-1.4.1/dists/msvc9/scumm.vcproj --- scummvm-1.4.0/dists/msvc9/scumm.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc9/scumm.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,233 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc9/ScummVM_Analysis64.vsprops scummvm-1.4.1/dists/msvc9/ScummVM_Analysis64.vsprops --- scummvm-1.4.0/dists/msvc9/ScummVM_Analysis64.vsprops 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc9/ScummVM_Analysis64.vsprops 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,26 @@ + + + + + diff -Nru scummvm-1.4.0/dists/msvc9/ScummVM_Analysis.vsprops scummvm-1.4.1/dists/msvc9/ScummVM_Analysis.vsprops --- scummvm-1.4.0/dists/msvc9/ScummVM_Analysis.vsprops 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc9/ScummVM_Analysis.vsprops 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,26 @@ + + + + + diff -Nru scummvm-1.4.0/dists/msvc9/ScummVM_Debug64.vsprops scummvm-1.4.1/dists/msvc9/ScummVM_Debug64.vsprops --- scummvm-1.4.0/dists/msvc9/ScummVM_Debug64.vsprops 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc9/ScummVM_Debug64.vsprops 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,26 @@ + + + + + diff -Nru scummvm-1.4.0/dists/msvc9/ScummVM_Debug.vsprops scummvm-1.4.1/dists/msvc9/ScummVM_Debug.vsprops --- scummvm-1.4.0/dists/msvc9/ScummVM_Debug.vsprops 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc9/ScummVM_Debug.vsprops 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,26 @@ + + + + + diff -Nru scummvm-1.4.0/dists/msvc9/ScummVM_Global64.vsprops scummvm-1.4.1/dists/msvc9/ScummVM_Global64.vsprops --- scummvm-1.4.0/dists/msvc9/ScummVM_Global64.vsprops 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc9/ScummVM_Global64.vsprops 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,36 @@ + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc9/ScummVM_Global.vsprops scummvm-1.4.1/dists/msvc9/ScummVM_Global.vsprops --- scummvm-1.4.0/dists/msvc9/ScummVM_Global.vsprops 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc9/ScummVM_Global.vsprops 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,36 @@ + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc9/ScummVM_Release64.vsprops scummvm-1.4.1/dists/msvc9/ScummVM_Release64.vsprops --- scummvm-1.4.0/dists/msvc9/ScummVM_Release64.vsprops 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc9/ScummVM_Release64.vsprops 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,25 @@ + + + + + diff -Nru scummvm-1.4.0/dists/msvc9/ScummVM_Release.vsprops scummvm-1.4.1/dists/msvc9/ScummVM_Release.vsprops --- scummvm-1.4.0/dists/msvc9/ScummVM_Release.vsprops 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc9/ScummVM_Release.vsprops 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,25 @@ + + + + + diff -Nru scummvm-1.4.0/dists/msvc9/scummvm.sln scummvm-1.4.1/dists/msvc9/scummvm.sln --- scummvm-1.4.0/dists/msvc9/scummvm.sln 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc9/scummvm.sln 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,438 @@ +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{D2DE92C5-D15F-46FD-BC1F-0EBE10B2EE14}") = "scummvm", "scummvm.vcproj", "{105C0F4E-036D-4C2F-918F-9F01295DF436}" + ProjectSection(ProjectDependencies) = postProject + {CC1E772F-D3F2-40AB-8BE5-3ED5F9BE1804} = {CC1E772F-D3F2-40AB-8BE5-3ED5F9BE1804} + {C937443B-F47A-4405-AD76-584822146DE7} = {C937443B-F47A-4405-AD76-584822146DE7} + {33C403C9-0D54-404A-8920-260F9819F582} = {33C403C9-0D54-404A-8920-260F9819F582} + {E363BFEC-7239-4C5F-B47B-9DCF8B843136} = {E363BFEC-7239-4C5F-B47B-9DCF8B843136} + {C4CF6AA4-478E-480C-9ACE-8F2580A34495} = {C4CF6AA4-478E-480C-9ACE-8F2580A34495} + {1034DB20-3DCE-4FC0-97CB-74F863CAF450} = {1034DB20-3DCE-4FC0-97CB-74F863CAF450} + {56D5B732-E3BC-4836-95E8-AA8D13CFE1D6} = {56D5B732-E3BC-4836-95E8-AA8D13CFE1D6} + {4E79393A-721F-4C9D-A6DF-3CED6DA06B26} = {4E79393A-721F-4C9D-A6DF-3CED6DA06B26} + {3B6092F1-3AE8-4AF7-B4B4-205219C07716} = {3B6092F1-3AE8-4AF7-B4B4-205219C07716} + {F068C6DB-65A0-4007-A95E-AC072F07B90A} = {F068C6DB-65A0-4007-A95E-AC072F07B90A} + {4800711C-3602-4866-BF73-5E5728C7E690} = {4800711C-3602-4866-BF73-5E5728C7E690} + {AD86E195-543B-46F4-B8F0-344A600C44DD} = {AD86E195-543B-46F4-B8F0-344A600C44DD} + {F497375A-0D15-4786-9FC0-7242792A7F00} = {F497375A-0D15-4786-9FC0-7242792A7F00} + {B73D6567-8589-4945-9C5C-E78CDA7D36A4} = {B73D6567-8589-4945-9C5C-E78CDA7D36A4} + {45B3AFE5-B575-4D5C-9414-1A61DD60263B} = {45B3AFE5-B575-4D5C-9414-1A61DD60263B} + {E60A9E73-B497-4621-A268-7A5B12B1AE9F} = {E60A9E73-B497-4621-A268-7A5B12B1AE9F} + {9E5C8C22-B927-4D1B-A9ED-C9A7C6F58537} = {9E5C8C22-B927-4D1B-A9ED-C9A7C6F58537} + {EA5D0F40-ED5C-4062-8A6D-2E9027F89BE3} = {EA5D0F40-ED5C-4062-8A6D-2E9027F89BE3} + {7604C4A0-46A0-4820-AE0B-E6FC823A7611} = {7604C4A0-46A0-4820-AE0B-E6FC823A7611} + {0E115478-9583-4D41-B8BD-603AF41CCA2D} = {0E115478-9583-4D41-B8BD-603AF41CCA2D} + {C234974F-D17E-488A-A1D2-DD139799E8CD} = {C234974F-D17E-488A-A1D2-DD139799E8CD} + {CC3A7A60-76F8-4985-9050-2B99136F5DCB} = {CC3A7A60-76F8-4985-9050-2B99136F5DCB} + {85BC4AF5-E0ED-41D3-920E-D10D5D90A6D7} = {85BC4AF5-E0ED-41D3-920E-D10D5D90A6D7} + {F84C1F9B-F49D-4CD9-916D-DF10129FD8D5} = {F84C1F9B-F49D-4CD9-916D-DF10129FD8D5} + {17E5DAAC-1622-4F0D-BB8E-70EA620B3D89} = {17E5DAAC-1622-4F0D-BB8E-70EA620B3D89} + {E1614405-825C-4008-ABF6-3C69F1192A48} = {E1614405-825C-4008-ABF6-3C69F1192A48} + {96DF59DC-85B6-48AA-B34D-378088A2BDCA} = {96DF59DC-85B6-48AA-B34D-378088A2BDCA} + EndProjectSection +EndProject +Project("{D2DE92C5-D15F-46FD-BC1F-0EBE10B2EE14}") = "agi", "agi.vcproj", "{CC1E772F-D3F2-40AB-8BE5-3ED5F9BE1804}" +EndProject +Project("{D2DE92C5-D15F-46FD-BC1F-0EBE10B2EE14}") = "agos", "agos.vcproj", "{C937443B-F47A-4405-AD76-584822146DE7}" +EndProject +Project("{D2DE92C5-D15F-46FD-BC1F-0EBE10B2EE14}") = "cine", "cine.vcproj", "{33C403C9-0D54-404A-8920-260F9819F582}" +EndProject +Project("{D2DE92C5-D15F-46FD-BC1F-0EBE10B2EE14}") = "cruise", "cruise.vcproj", "{E363BFEC-7239-4C5F-B47B-9DCF8B843136}" +EndProject +Project("{D2DE92C5-D15F-46FD-BC1F-0EBE10B2EE14}") = "draci", "draci.vcproj", "{C4CF6AA4-478E-480C-9ACE-8F2580A34495}" +EndProject +Project("{D2DE92C5-D15F-46FD-BC1F-0EBE10B2EE14}") = "drascula", "drascula.vcproj", "{1034DB20-3DCE-4FC0-97CB-74F863CAF450}" +EndProject +Project("{D2DE92C5-D15F-46FD-BC1F-0EBE10B2EE14}") = "gob", "gob.vcproj", "{56D5B732-E3BC-4836-95E8-AA8D13CFE1D6}" +EndProject +Project("{D2DE92C5-D15F-46FD-BC1F-0EBE10B2EE14}") = "groovie", "groovie.vcproj", "{4E79393A-721F-4C9D-A6DF-3CED6DA06B26}" +EndProject +Project("{D2DE92C5-D15F-46FD-BC1F-0EBE10B2EE14}") = "hugo", "hugo.vcproj", "{3B6092F1-3AE8-4AF7-B4B4-205219C07716}" +EndProject +Project("{D2DE92C5-D15F-46FD-BC1F-0EBE10B2EE14}") = "kyra", "kyra.vcproj", "{F068C6DB-65A0-4007-A95E-AC072F07B90A}" +EndProject +Project("{D2DE92C5-D15F-46FD-BC1F-0EBE10B2EE14}") = "lure", "lure.vcproj", "{4800711C-3602-4866-BF73-5E5728C7E690}" +EndProject +Project("{D2DE92C5-D15F-46FD-BC1F-0EBE10B2EE14}") = "made", "made.vcproj", "{AD86E195-543B-46F4-B8F0-344A600C44DD}" +EndProject +Project("{D2DE92C5-D15F-46FD-BC1F-0EBE10B2EE14}") = "mohawk", "mohawk.vcproj", "{F497375A-0D15-4786-9FC0-7242792A7F00}" +EndProject +Project("{D2DE92C5-D15F-46FD-BC1F-0EBE10B2EE14}") = "parallaction", "parallaction.vcproj", "{B73D6567-8589-4945-9C5C-E78CDA7D36A4}" +EndProject +Project("{D2DE92C5-D15F-46FD-BC1F-0EBE10B2EE14}") = "queen", "queen.vcproj", "{45B3AFE5-B575-4D5C-9414-1A61DD60263B}" +EndProject +Project("{D2DE92C5-D15F-46FD-BC1F-0EBE10B2EE14}") = "saga", "saga.vcproj", "{E60A9E73-B497-4621-A268-7A5B12B1AE9F}" +EndProject +Project("{D2DE92C5-D15F-46FD-BC1F-0EBE10B2EE14}") = "sci", "sci.vcproj", "{9E5C8C22-B927-4D1B-A9ED-C9A7C6F58537}" +EndProject +Project("{D2DE92C5-D15F-46FD-BC1F-0EBE10B2EE14}") = "scumm", "scumm.vcproj", "{EA5D0F40-ED5C-4062-8A6D-2E9027F89BE3}" +EndProject +Project("{D2DE92C5-D15F-46FD-BC1F-0EBE10B2EE14}") = "sky", "sky.vcproj", "{7604C4A0-46A0-4820-AE0B-E6FC823A7611}" +EndProject +Project("{D2DE92C5-D15F-46FD-BC1F-0EBE10B2EE14}") = "sword1", "sword1.vcproj", "{0E115478-9583-4D41-B8BD-603AF41CCA2D}" +EndProject +Project("{D2DE92C5-D15F-46FD-BC1F-0EBE10B2EE14}") = "sword2", "sword2.vcproj", "{C234974F-D17E-488A-A1D2-DD139799E8CD}" +EndProject +Project("{D2DE92C5-D15F-46FD-BC1F-0EBE10B2EE14}") = "teenagent", "teenagent.vcproj", "{CC3A7A60-76F8-4985-9050-2B99136F5DCB}" +EndProject +Project("{D2DE92C5-D15F-46FD-BC1F-0EBE10B2EE14}") = "tinsel", "tinsel.vcproj", "{85BC4AF5-E0ED-41D3-920E-D10D5D90A6D7}" +EndProject +Project("{D2DE92C5-D15F-46FD-BC1F-0EBE10B2EE14}") = "toon", "toon.vcproj", "{F84C1F9B-F49D-4CD9-916D-DF10129FD8D5}" +EndProject +Project("{D2DE92C5-D15F-46FD-BC1F-0EBE10B2EE14}") = "touche", "touche.vcproj", "{17E5DAAC-1622-4F0D-BB8E-70EA620B3D89}" +EndProject +Project("{D2DE92C5-D15F-46FD-BC1F-0EBE10B2EE14}") = "tsage", "tsage.vcproj", "{E1614405-825C-4008-ABF6-3C69F1192A48}" +EndProject +Project("{D2DE92C5-D15F-46FD-BC1F-0EBE10B2EE14}") = "tucker", "tucker.vcproj", "{96DF59DC-85B6-48AA-B34D-378088A2BDCA}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Analysis|Win32 = Analysis|Win32 + Release|Win32 = Release|Win32 + Debug|x64 = Debug|x64 + Analysis|x64 = Analysis|x64 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {CC1E772F-D3F2-40AB-8BE5-3ED5F9BE1804}.Debug|Win32.ActiveCfg = Debug|Win32 + {CC1E772F-D3F2-40AB-8BE5-3ED5F9BE1804}.Debug|Win32.Build.0 = Debug|Win32 + {CC1E772F-D3F2-40AB-8BE5-3ED5F9BE1804}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {CC1E772F-D3F2-40AB-8BE5-3ED5F9BE1804}.Analysis|Win32.Build.0 = Analysis|Win32 + {CC1E772F-D3F2-40AB-8BE5-3ED5F9BE1804}.Release|Win32.ActiveCfg = Release|Win32 + {CC1E772F-D3F2-40AB-8BE5-3ED5F9BE1804}.Release|Win32.Build.0 = Release|Win32 + {CC1E772F-D3F2-40AB-8BE5-3ED5F9BE1804}.Debug|x64.ActiveCfg = Debug|x64 + {CC1E772F-D3F2-40AB-8BE5-3ED5F9BE1804}.Debug|x64.Build.0 = Debug|x64 + {CC1E772F-D3F2-40AB-8BE5-3ED5F9BE1804}.Analysis|x64.ActiveCfg = Analysis|x64 + {CC1E772F-D3F2-40AB-8BE5-3ED5F9BE1804}.Analysis|x64.Build.0 = Analysis|x64 + {CC1E772F-D3F2-40AB-8BE5-3ED5F9BE1804}.Release|x64.ActiveCfg = Release|x64 + {CC1E772F-D3F2-40AB-8BE5-3ED5F9BE1804}.Release|x64.Build.0 = Release|x64 + {C937443B-F47A-4405-AD76-584822146DE7}.Debug|Win32.ActiveCfg = Debug|Win32 + {C937443B-F47A-4405-AD76-584822146DE7}.Debug|Win32.Build.0 = Debug|Win32 + {C937443B-F47A-4405-AD76-584822146DE7}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {C937443B-F47A-4405-AD76-584822146DE7}.Analysis|Win32.Build.0 = Analysis|Win32 + {C937443B-F47A-4405-AD76-584822146DE7}.Release|Win32.ActiveCfg = Release|Win32 + {C937443B-F47A-4405-AD76-584822146DE7}.Release|Win32.Build.0 = Release|Win32 + {C937443B-F47A-4405-AD76-584822146DE7}.Debug|x64.ActiveCfg = Debug|x64 + {C937443B-F47A-4405-AD76-584822146DE7}.Debug|x64.Build.0 = Debug|x64 + {C937443B-F47A-4405-AD76-584822146DE7}.Analysis|x64.ActiveCfg = Analysis|x64 + {C937443B-F47A-4405-AD76-584822146DE7}.Analysis|x64.Build.0 = Analysis|x64 + {C937443B-F47A-4405-AD76-584822146DE7}.Release|x64.ActiveCfg = Release|x64 + {C937443B-F47A-4405-AD76-584822146DE7}.Release|x64.Build.0 = Release|x64 + {33C403C9-0D54-404A-8920-260F9819F582}.Debug|Win32.ActiveCfg = Debug|Win32 + {33C403C9-0D54-404A-8920-260F9819F582}.Debug|Win32.Build.0 = Debug|Win32 + {33C403C9-0D54-404A-8920-260F9819F582}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {33C403C9-0D54-404A-8920-260F9819F582}.Analysis|Win32.Build.0 = Analysis|Win32 + {33C403C9-0D54-404A-8920-260F9819F582}.Release|Win32.ActiveCfg = Release|Win32 + {33C403C9-0D54-404A-8920-260F9819F582}.Release|Win32.Build.0 = Release|Win32 + {33C403C9-0D54-404A-8920-260F9819F582}.Debug|x64.ActiveCfg = Debug|x64 + {33C403C9-0D54-404A-8920-260F9819F582}.Debug|x64.Build.0 = Debug|x64 + {33C403C9-0D54-404A-8920-260F9819F582}.Analysis|x64.ActiveCfg = Analysis|x64 + {33C403C9-0D54-404A-8920-260F9819F582}.Analysis|x64.Build.0 = Analysis|x64 + {33C403C9-0D54-404A-8920-260F9819F582}.Release|x64.ActiveCfg = Release|x64 + {33C403C9-0D54-404A-8920-260F9819F582}.Release|x64.Build.0 = Release|x64 + {E363BFEC-7239-4C5F-B47B-9DCF8B843136}.Debug|Win32.ActiveCfg = Debug|Win32 + {E363BFEC-7239-4C5F-B47B-9DCF8B843136}.Debug|Win32.Build.0 = Debug|Win32 + {E363BFEC-7239-4C5F-B47B-9DCF8B843136}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {E363BFEC-7239-4C5F-B47B-9DCF8B843136}.Analysis|Win32.Build.0 = Analysis|Win32 + {E363BFEC-7239-4C5F-B47B-9DCF8B843136}.Release|Win32.ActiveCfg = Release|Win32 + {E363BFEC-7239-4C5F-B47B-9DCF8B843136}.Release|Win32.Build.0 = Release|Win32 + {E363BFEC-7239-4C5F-B47B-9DCF8B843136}.Debug|x64.ActiveCfg = Debug|x64 + {E363BFEC-7239-4C5F-B47B-9DCF8B843136}.Debug|x64.Build.0 = Debug|x64 + {E363BFEC-7239-4C5F-B47B-9DCF8B843136}.Analysis|x64.ActiveCfg = Analysis|x64 + {E363BFEC-7239-4C5F-B47B-9DCF8B843136}.Analysis|x64.Build.0 = Analysis|x64 + {E363BFEC-7239-4C5F-B47B-9DCF8B843136}.Release|x64.ActiveCfg = Release|x64 + {E363BFEC-7239-4C5F-B47B-9DCF8B843136}.Release|x64.Build.0 = Release|x64 + {C4CF6AA4-478E-480C-9ACE-8F2580A34495}.Debug|Win32.ActiveCfg = Debug|Win32 + {C4CF6AA4-478E-480C-9ACE-8F2580A34495}.Debug|Win32.Build.0 = Debug|Win32 + {C4CF6AA4-478E-480C-9ACE-8F2580A34495}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {C4CF6AA4-478E-480C-9ACE-8F2580A34495}.Analysis|Win32.Build.0 = Analysis|Win32 + {C4CF6AA4-478E-480C-9ACE-8F2580A34495}.Release|Win32.ActiveCfg = Release|Win32 + {C4CF6AA4-478E-480C-9ACE-8F2580A34495}.Release|Win32.Build.0 = Release|Win32 + {C4CF6AA4-478E-480C-9ACE-8F2580A34495}.Debug|x64.ActiveCfg = Debug|x64 + {C4CF6AA4-478E-480C-9ACE-8F2580A34495}.Debug|x64.Build.0 = Debug|x64 + {C4CF6AA4-478E-480C-9ACE-8F2580A34495}.Analysis|x64.ActiveCfg = Analysis|x64 + {C4CF6AA4-478E-480C-9ACE-8F2580A34495}.Analysis|x64.Build.0 = Analysis|x64 + {C4CF6AA4-478E-480C-9ACE-8F2580A34495}.Release|x64.ActiveCfg = Release|x64 + {C4CF6AA4-478E-480C-9ACE-8F2580A34495}.Release|x64.Build.0 = Release|x64 + {1034DB20-3DCE-4FC0-97CB-74F863CAF450}.Debug|Win32.ActiveCfg = Debug|Win32 + {1034DB20-3DCE-4FC0-97CB-74F863CAF450}.Debug|Win32.Build.0 = Debug|Win32 + {1034DB20-3DCE-4FC0-97CB-74F863CAF450}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {1034DB20-3DCE-4FC0-97CB-74F863CAF450}.Analysis|Win32.Build.0 = Analysis|Win32 + {1034DB20-3DCE-4FC0-97CB-74F863CAF450}.Release|Win32.ActiveCfg = Release|Win32 + {1034DB20-3DCE-4FC0-97CB-74F863CAF450}.Release|Win32.Build.0 = Release|Win32 + {1034DB20-3DCE-4FC0-97CB-74F863CAF450}.Debug|x64.ActiveCfg = Debug|x64 + {1034DB20-3DCE-4FC0-97CB-74F863CAF450}.Debug|x64.Build.0 = Debug|x64 + {1034DB20-3DCE-4FC0-97CB-74F863CAF450}.Analysis|x64.ActiveCfg = Analysis|x64 + {1034DB20-3DCE-4FC0-97CB-74F863CAF450}.Analysis|x64.Build.0 = Analysis|x64 + {1034DB20-3DCE-4FC0-97CB-74F863CAF450}.Release|x64.ActiveCfg = Release|x64 + {1034DB20-3DCE-4FC0-97CB-74F863CAF450}.Release|x64.Build.0 = Release|x64 + {56D5B732-E3BC-4836-95E8-AA8D13CFE1D6}.Debug|Win32.ActiveCfg = Debug|Win32 + {56D5B732-E3BC-4836-95E8-AA8D13CFE1D6}.Debug|Win32.Build.0 = Debug|Win32 + {56D5B732-E3BC-4836-95E8-AA8D13CFE1D6}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {56D5B732-E3BC-4836-95E8-AA8D13CFE1D6}.Analysis|Win32.Build.0 = Analysis|Win32 + {56D5B732-E3BC-4836-95E8-AA8D13CFE1D6}.Release|Win32.ActiveCfg = Release|Win32 + {56D5B732-E3BC-4836-95E8-AA8D13CFE1D6}.Release|Win32.Build.0 = Release|Win32 + {56D5B732-E3BC-4836-95E8-AA8D13CFE1D6}.Debug|x64.ActiveCfg = Debug|x64 + {56D5B732-E3BC-4836-95E8-AA8D13CFE1D6}.Debug|x64.Build.0 = Debug|x64 + {56D5B732-E3BC-4836-95E8-AA8D13CFE1D6}.Analysis|x64.ActiveCfg = Analysis|x64 + {56D5B732-E3BC-4836-95E8-AA8D13CFE1D6}.Analysis|x64.Build.0 = Analysis|x64 + {56D5B732-E3BC-4836-95E8-AA8D13CFE1D6}.Release|x64.ActiveCfg = Release|x64 + {56D5B732-E3BC-4836-95E8-AA8D13CFE1D6}.Release|x64.Build.0 = Release|x64 + {4E79393A-721F-4C9D-A6DF-3CED6DA06B26}.Debug|Win32.ActiveCfg = Debug|Win32 + {4E79393A-721F-4C9D-A6DF-3CED6DA06B26}.Debug|Win32.Build.0 = Debug|Win32 + {4E79393A-721F-4C9D-A6DF-3CED6DA06B26}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {4E79393A-721F-4C9D-A6DF-3CED6DA06B26}.Analysis|Win32.Build.0 = Analysis|Win32 + {4E79393A-721F-4C9D-A6DF-3CED6DA06B26}.Release|Win32.ActiveCfg = Release|Win32 + {4E79393A-721F-4C9D-A6DF-3CED6DA06B26}.Release|Win32.Build.0 = Release|Win32 + {4E79393A-721F-4C9D-A6DF-3CED6DA06B26}.Debug|x64.ActiveCfg = Debug|x64 + {4E79393A-721F-4C9D-A6DF-3CED6DA06B26}.Debug|x64.Build.0 = Debug|x64 + {4E79393A-721F-4C9D-A6DF-3CED6DA06B26}.Analysis|x64.ActiveCfg = Analysis|x64 + {4E79393A-721F-4C9D-A6DF-3CED6DA06B26}.Analysis|x64.Build.0 = Analysis|x64 + {4E79393A-721F-4C9D-A6DF-3CED6DA06B26}.Release|x64.ActiveCfg = Release|x64 + {4E79393A-721F-4C9D-A6DF-3CED6DA06B26}.Release|x64.Build.0 = Release|x64 + {3B6092F1-3AE8-4AF7-B4B4-205219C07716}.Debug|Win32.ActiveCfg = Debug|Win32 + {3B6092F1-3AE8-4AF7-B4B4-205219C07716}.Debug|Win32.Build.0 = Debug|Win32 + {3B6092F1-3AE8-4AF7-B4B4-205219C07716}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {3B6092F1-3AE8-4AF7-B4B4-205219C07716}.Analysis|Win32.Build.0 = Analysis|Win32 + {3B6092F1-3AE8-4AF7-B4B4-205219C07716}.Release|Win32.ActiveCfg = Release|Win32 + {3B6092F1-3AE8-4AF7-B4B4-205219C07716}.Release|Win32.Build.0 = Release|Win32 + {3B6092F1-3AE8-4AF7-B4B4-205219C07716}.Debug|x64.ActiveCfg = Debug|x64 + {3B6092F1-3AE8-4AF7-B4B4-205219C07716}.Debug|x64.Build.0 = Debug|x64 + {3B6092F1-3AE8-4AF7-B4B4-205219C07716}.Analysis|x64.ActiveCfg = Analysis|x64 + {3B6092F1-3AE8-4AF7-B4B4-205219C07716}.Analysis|x64.Build.0 = Analysis|x64 + {3B6092F1-3AE8-4AF7-B4B4-205219C07716}.Release|x64.ActiveCfg = Release|x64 + {3B6092F1-3AE8-4AF7-B4B4-205219C07716}.Release|x64.Build.0 = Release|x64 + {F068C6DB-65A0-4007-A95E-AC072F07B90A}.Debug|Win32.ActiveCfg = Debug|Win32 + {F068C6DB-65A0-4007-A95E-AC072F07B90A}.Debug|Win32.Build.0 = Debug|Win32 + {F068C6DB-65A0-4007-A95E-AC072F07B90A}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {F068C6DB-65A0-4007-A95E-AC072F07B90A}.Analysis|Win32.Build.0 = Analysis|Win32 + {F068C6DB-65A0-4007-A95E-AC072F07B90A}.Release|Win32.ActiveCfg = Release|Win32 + {F068C6DB-65A0-4007-A95E-AC072F07B90A}.Release|Win32.Build.0 = Release|Win32 + {F068C6DB-65A0-4007-A95E-AC072F07B90A}.Debug|x64.ActiveCfg = Debug|x64 + {F068C6DB-65A0-4007-A95E-AC072F07B90A}.Debug|x64.Build.0 = Debug|x64 + {F068C6DB-65A0-4007-A95E-AC072F07B90A}.Analysis|x64.ActiveCfg = Analysis|x64 + {F068C6DB-65A0-4007-A95E-AC072F07B90A}.Analysis|x64.Build.0 = Analysis|x64 + {F068C6DB-65A0-4007-A95E-AC072F07B90A}.Release|x64.ActiveCfg = Release|x64 + {F068C6DB-65A0-4007-A95E-AC072F07B90A}.Release|x64.Build.0 = Release|x64 + {4800711C-3602-4866-BF73-5E5728C7E690}.Debug|Win32.ActiveCfg = Debug|Win32 + {4800711C-3602-4866-BF73-5E5728C7E690}.Debug|Win32.Build.0 = Debug|Win32 + {4800711C-3602-4866-BF73-5E5728C7E690}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {4800711C-3602-4866-BF73-5E5728C7E690}.Analysis|Win32.Build.0 = Analysis|Win32 + {4800711C-3602-4866-BF73-5E5728C7E690}.Release|Win32.ActiveCfg = Release|Win32 + {4800711C-3602-4866-BF73-5E5728C7E690}.Release|Win32.Build.0 = Release|Win32 + {4800711C-3602-4866-BF73-5E5728C7E690}.Debug|x64.ActiveCfg = Debug|x64 + {4800711C-3602-4866-BF73-5E5728C7E690}.Debug|x64.Build.0 = Debug|x64 + {4800711C-3602-4866-BF73-5E5728C7E690}.Analysis|x64.ActiveCfg = Analysis|x64 + {4800711C-3602-4866-BF73-5E5728C7E690}.Analysis|x64.Build.0 = Analysis|x64 + {4800711C-3602-4866-BF73-5E5728C7E690}.Release|x64.ActiveCfg = Release|x64 + {4800711C-3602-4866-BF73-5E5728C7E690}.Release|x64.Build.0 = Release|x64 + {AD86E195-543B-46F4-B8F0-344A600C44DD}.Debug|Win32.ActiveCfg = Debug|Win32 + {AD86E195-543B-46F4-B8F0-344A600C44DD}.Debug|Win32.Build.0 = Debug|Win32 + {AD86E195-543B-46F4-B8F0-344A600C44DD}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {AD86E195-543B-46F4-B8F0-344A600C44DD}.Analysis|Win32.Build.0 = Analysis|Win32 + {AD86E195-543B-46F4-B8F0-344A600C44DD}.Release|Win32.ActiveCfg = Release|Win32 + {AD86E195-543B-46F4-B8F0-344A600C44DD}.Release|Win32.Build.0 = Release|Win32 + {AD86E195-543B-46F4-B8F0-344A600C44DD}.Debug|x64.ActiveCfg = Debug|x64 + {AD86E195-543B-46F4-B8F0-344A600C44DD}.Debug|x64.Build.0 = Debug|x64 + {AD86E195-543B-46F4-B8F0-344A600C44DD}.Analysis|x64.ActiveCfg = Analysis|x64 + {AD86E195-543B-46F4-B8F0-344A600C44DD}.Analysis|x64.Build.0 = Analysis|x64 + {AD86E195-543B-46F4-B8F0-344A600C44DD}.Release|x64.ActiveCfg = Release|x64 + {AD86E195-543B-46F4-B8F0-344A600C44DD}.Release|x64.Build.0 = Release|x64 + {F497375A-0D15-4786-9FC0-7242792A7F00}.Debug|Win32.ActiveCfg = Debug|Win32 + {F497375A-0D15-4786-9FC0-7242792A7F00}.Debug|Win32.Build.0 = Debug|Win32 + {F497375A-0D15-4786-9FC0-7242792A7F00}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {F497375A-0D15-4786-9FC0-7242792A7F00}.Analysis|Win32.Build.0 = Analysis|Win32 + {F497375A-0D15-4786-9FC0-7242792A7F00}.Release|Win32.ActiveCfg = Release|Win32 + {F497375A-0D15-4786-9FC0-7242792A7F00}.Release|Win32.Build.0 = Release|Win32 + {F497375A-0D15-4786-9FC0-7242792A7F00}.Debug|x64.ActiveCfg = Debug|x64 + {F497375A-0D15-4786-9FC0-7242792A7F00}.Debug|x64.Build.0 = Debug|x64 + {F497375A-0D15-4786-9FC0-7242792A7F00}.Analysis|x64.ActiveCfg = Analysis|x64 + {F497375A-0D15-4786-9FC0-7242792A7F00}.Analysis|x64.Build.0 = Analysis|x64 + {F497375A-0D15-4786-9FC0-7242792A7F00}.Release|x64.ActiveCfg = Release|x64 + {F497375A-0D15-4786-9FC0-7242792A7F00}.Release|x64.Build.0 = Release|x64 + {B73D6567-8589-4945-9C5C-E78CDA7D36A4}.Debug|Win32.ActiveCfg = Debug|Win32 + {B73D6567-8589-4945-9C5C-E78CDA7D36A4}.Debug|Win32.Build.0 = Debug|Win32 + {B73D6567-8589-4945-9C5C-E78CDA7D36A4}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {B73D6567-8589-4945-9C5C-E78CDA7D36A4}.Analysis|Win32.Build.0 = Analysis|Win32 + {B73D6567-8589-4945-9C5C-E78CDA7D36A4}.Release|Win32.ActiveCfg = Release|Win32 + {B73D6567-8589-4945-9C5C-E78CDA7D36A4}.Release|Win32.Build.0 = Release|Win32 + {B73D6567-8589-4945-9C5C-E78CDA7D36A4}.Debug|x64.ActiveCfg = Debug|x64 + {B73D6567-8589-4945-9C5C-E78CDA7D36A4}.Debug|x64.Build.0 = Debug|x64 + {B73D6567-8589-4945-9C5C-E78CDA7D36A4}.Analysis|x64.ActiveCfg = Analysis|x64 + {B73D6567-8589-4945-9C5C-E78CDA7D36A4}.Analysis|x64.Build.0 = Analysis|x64 + {B73D6567-8589-4945-9C5C-E78CDA7D36A4}.Release|x64.ActiveCfg = Release|x64 + {B73D6567-8589-4945-9C5C-E78CDA7D36A4}.Release|x64.Build.0 = Release|x64 + {45B3AFE5-B575-4D5C-9414-1A61DD60263B}.Debug|Win32.ActiveCfg = Debug|Win32 + {45B3AFE5-B575-4D5C-9414-1A61DD60263B}.Debug|Win32.Build.0 = Debug|Win32 + {45B3AFE5-B575-4D5C-9414-1A61DD60263B}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {45B3AFE5-B575-4D5C-9414-1A61DD60263B}.Analysis|Win32.Build.0 = Analysis|Win32 + {45B3AFE5-B575-4D5C-9414-1A61DD60263B}.Release|Win32.ActiveCfg = Release|Win32 + {45B3AFE5-B575-4D5C-9414-1A61DD60263B}.Release|Win32.Build.0 = Release|Win32 + {45B3AFE5-B575-4D5C-9414-1A61DD60263B}.Debug|x64.ActiveCfg = Debug|x64 + {45B3AFE5-B575-4D5C-9414-1A61DD60263B}.Debug|x64.Build.0 = Debug|x64 + {45B3AFE5-B575-4D5C-9414-1A61DD60263B}.Analysis|x64.ActiveCfg = Analysis|x64 + {45B3AFE5-B575-4D5C-9414-1A61DD60263B}.Analysis|x64.Build.0 = Analysis|x64 + {45B3AFE5-B575-4D5C-9414-1A61DD60263B}.Release|x64.ActiveCfg = Release|x64 + {45B3AFE5-B575-4D5C-9414-1A61DD60263B}.Release|x64.Build.0 = Release|x64 + {E60A9E73-B497-4621-A268-7A5B12B1AE9F}.Debug|Win32.ActiveCfg = Debug|Win32 + {E60A9E73-B497-4621-A268-7A5B12B1AE9F}.Debug|Win32.Build.0 = Debug|Win32 + {E60A9E73-B497-4621-A268-7A5B12B1AE9F}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {E60A9E73-B497-4621-A268-7A5B12B1AE9F}.Analysis|Win32.Build.0 = Analysis|Win32 + {E60A9E73-B497-4621-A268-7A5B12B1AE9F}.Release|Win32.ActiveCfg = Release|Win32 + {E60A9E73-B497-4621-A268-7A5B12B1AE9F}.Release|Win32.Build.0 = Release|Win32 + {E60A9E73-B497-4621-A268-7A5B12B1AE9F}.Debug|x64.ActiveCfg = Debug|x64 + {E60A9E73-B497-4621-A268-7A5B12B1AE9F}.Debug|x64.Build.0 = Debug|x64 + {E60A9E73-B497-4621-A268-7A5B12B1AE9F}.Analysis|x64.ActiveCfg = Analysis|x64 + {E60A9E73-B497-4621-A268-7A5B12B1AE9F}.Analysis|x64.Build.0 = Analysis|x64 + {E60A9E73-B497-4621-A268-7A5B12B1AE9F}.Release|x64.ActiveCfg = Release|x64 + {E60A9E73-B497-4621-A268-7A5B12B1AE9F}.Release|x64.Build.0 = Release|x64 + {9E5C8C22-B927-4D1B-A9ED-C9A7C6F58537}.Debug|Win32.ActiveCfg = Debug|Win32 + {9E5C8C22-B927-4D1B-A9ED-C9A7C6F58537}.Debug|Win32.Build.0 = Debug|Win32 + {9E5C8C22-B927-4D1B-A9ED-C9A7C6F58537}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {9E5C8C22-B927-4D1B-A9ED-C9A7C6F58537}.Analysis|Win32.Build.0 = Analysis|Win32 + {9E5C8C22-B927-4D1B-A9ED-C9A7C6F58537}.Release|Win32.ActiveCfg = Release|Win32 + {9E5C8C22-B927-4D1B-A9ED-C9A7C6F58537}.Release|Win32.Build.0 = Release|Win32 + {9E5C8C22-B927-4D1B-A9ED-C9A7C6F58537}.Debug|x64.ActiveCfg = Debug|x64 + {9E5C8C22-B927-4D1B-A9ED-C9A7C6F58537}.Debug|x64.Build.0 = Debug|x64 + {9E5C8C22-B927-4D1B-A9ED-C9A7C6F58537}.Analysis|x64.ActiveCfg = Analysis|x64 + {9E5C8C22-B927-4D1B-A9ED-C9A7C6F58537}.Analysis|x64.Build.0 = Analysis|x64 + {9E5C8C22-B927-4D1B-A9ED-C9A7C6F58537}.Release|x64.ActiveCfg = Release|x64 + {9E5C8C22-B927-4D1B-A9ED-C9A7C6F58537}.Release|x64.Build.0 = Release|x64 + {EA5D0F40-ED5C-4062-8A6D-2E9027F89BE3}.Debug|Win32.ActiveCfg = Debug|Win32 + {EA5D0F40-ED5C-4062-8A6D-2E9027F89BE3}.Debug|Win32.Build.0 = Debug|Win32 + {EA5D0F40-ED5C-4062-8A6D-2E9027F89BE3}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {EA5D0F40-ED5C-4062-8A6D-2E9027F89BE3}.Analysis|Win32.Build.0 = Analysis|Win32 + {EA5D0F40-ED5C-4062-8A6D-2E9027F89BE3}.Release|Win32.ActiveCfg = Release|Win32 + {EA5D0F40-ED5C-4062-8A6D-2E9027F89BE3}.Release|Win32.Build.0 = Release|Win32 + {EA5D0F40-ED5C-4062-8A6D-2E9027F89BE3}.Debug|x64.ActiveCfg = Debug|x64 + {EA5D0F40-ED5C-4062-8A6D-2E9027F89BE3}.Debug|x64.Build.0 = Debug|x64 + {EA5D0F40-ED5C-4062-8A6D-2E9027F89BE3}.Analysis|x64.ActiveCfg = Analysis|x64 + {EA5D0F40-ED5C-4062-8A6D-2E9027F89BE3}.Analysis|x64.Build.0 = Analysis|x64 + {EA5D0F40-ED5C-4062-8A6D-2E9027F89BE3}.Release|x64.ActiveCfg = Release|x64 + {EA5D0F40-ED5C-4062-8A6D-2E9027F89BE3}.Release|x64.Build.0 = Release|x64 + {105C0F4E-036D-4C2F-918F-9F01295DF436}.Debug|Win32.ActiveCfg = Debug|Win32 + {105C0F4E-036D-4C2F-918F-9F01295DF436}.Debug|Win32.Build.0 = Debug|Win32 + {105C0F4E-036D-4C2F-918F-9F01295DF436}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {105C0F4E-036D-4C2F-918F-9F01295DF436}.Analysis|Win32.Build.0 = Analysis|Win32 + {105C0F4E-036D-4C2F-918F-9F01295DF436}.Release|Win32.ActiveCfg = Release|Win32 + {105C0F4E-036D-4C2F-918F-9F01295DF436}.Release|Win32.Build.0 = Release|Win32 + {105C0F4E-036D-4C2F-918F-9F01295DF436}.Debug|x64.ActiveCfg = Debug|x64 + {105C0F4E-036D-4C2F-918F-9F01295DF436}.Debug|x64.Build.0 = Debug|x64 + {105C0F4E-036D-4C2F-918F-9F01295DF436}.Analysis|x64.ActiveCfg = Analysis|x64 + {105C0F4E-036D-4C2F-918F-9F01295DF436}.Analysis|x64.Build.0 = Analysis|x64 + {105C0F4E-036D-4C2F-918F-9F01295DF436}.Release|x64.ActiveCfg = Release|x64 + {105C0F4E-036D-4C2F-918F-9F01295DF436}.Release|x64.Build.0 = Release|x64 + {7604C4A0-46A0-4820-AE0B-E6FC823A7611}.Debug|Win32.ActiveCfg = Debug|Win32 + {7604C4A0-46A0-4820-AE0B-E6FC823A7611}.Debug|Win32.Build.0 = Debug|Win32 + {7604C4A0-46A0-4820-AE0B-E6FC823A7611}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {7604C4A0-46A0-4820-AE0B-E6FC823A7611}.Analysis|Win32.Build.0 = Analysis|Win32 + {7604C4A0-46A0-4820-AE0B-E6FC823A7611}.Release|Win32.ActiveCfg = Release|Win32 + {7604C4A0-46A0-4820-AE0B-E6FC823A7611}.Release|Win32.Build.0 = Release|Win32 + {7604C4A0-46A0-4820-AE0B-E6FC823A7611}.Debug|x64.ActiveCfg = Debug|x64 + {7604C4A0-46A0-4820-AE0B-E6FC823A7611}.Debug|x64.Build.0 = Debug|x64 + {7604C4A0-46A0-4820-AE0B-E6FC823A7611}.Analysis|x64.ActiveCfg = Analysis|x64 + {7604C4A0-46A0-4820-AE0B-E6FC823A7611}.Analysis|x64.Build.0 = Analysis|x64 + {7604C4A0-46A0-4820-AE0B-E6FC823A7611}.Release|x64.ActiveCfg = Release|x64 + {7604C4A0-46A0-4820-AE0B-E6FC823A7611}.Release|x64.Build.0 = Release|x64 + {0E115478-9583-4D41-B8BD-603AF41CCA2D}.Debug|Win32.ActiveCfg = Debug|Win32 + {0E115478-9583-4D41-B8BD-603AF41CCA2D}.Debug|Win32.Build.0 = Debug|Win32 + {0E115478-9583-4D41-B8BD-603AF41CCA2D}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {0E115478-9583-4D41-B8BD-603AF41CCA2D}.Analysis|Win32.Build.0 = Analysis|Win32 + {0E115478-9583-4D41-B8BD-603AF41CCA2D}.Release|Win32.ActiveCfg = Release|Win32 + {0E115478-9583-4D41-B8BD-603AF41CCA2D}.Release|Win32.Build.0 = Release|Win32 + {0E115478-9583-4D41-B8BD-603AF41CCA2D}.Debug|x64.ActiveCfg = Debug|x64 + {0E115478-9583-4D41-B8BD-603AF41CCA2D}.Debug|x64.Build.0 = Debug|x64 + {0E115478-9583-4D41-B8BD-603AF41CCA2D}.Analysis|x64.ActiveCfg = Analysis|x64 + {0E115478-9583-4D41-B8BD-603AF41CCA2D}.Analysis|x64.Build.0 = Analysis|x64 + {0E115478-9583-4D41-B8BD-603AF41CCA2D}.Release|x64.ActiveCfg = Release|x64 + {0E115478-9583-4D41-B8BD-603AF41CCA2D}.Release|x64.Build.0 = Release|x64 + {C234974F-D17E-488A-A1D2-DD139799E8CD}.Debug|Win32.ActiveCfg = Debug|Win32 + {C234974F-D17E-488A-A1D2-DD139799E8CD}.Debug|Win32.Build.0 = Debug|Win32 + {C234974F-D17E-488A-A1D2-DD139799E8CD}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {C234974F-D17E-488A-A1D2-DD139799E8CD}.Analysis|Win32.Build.0 = Analysis|Win32 + {C234974F-D17E-488A-A1D2-DD139799E8CD}.Release|Win32.ActiveCfg = Release|Win32 + {C234974F-D17E-488A-A1D2-DD139799E8CD}.Release|Win32.Build.0 = Release|Win32 + {C234974F-D17E-488A-A1D2-DD139799E8CD}.Debug|x64.ActiveCfg = Debug|x64 + {C234974F-D17E-488A-A1D2-DD139799E8CD}.Debug|x64.Build.0 = Debug|x64 + {C234974F-D17E-488A-A1D2-DD139799E8CD}.Analysis|x64.ActiveCfg = Analysis|x64 + {C234974F-D17E-488A-A1D2-DD139799E8CD}.Analysis|x64.Build.0 = Analysis|x64 + {C234974F-D17E-488A-A1D2-DD139799E8CD}.Release|x64.ActiveCfg = Release|x64 + {C234974F-D17E-488A-A1D2-DD139799E8CD}.Release|x64.Build.0 = Release|x64 + {CC3A7A60-76F8-4985-9050-2B99136F5DCB}.Debug|Win32.ActiveCfg = Debug|Win32 + {CC3A7A60-76F8-4985-9050-2B99136F5DCB}.Debug|Win32.Build.0 = Debug|Win32 + {CC3A7A60-76F8-4985-9050-2B99136F5DCB}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {CC3A7A60-76F8-4985-9050-2B99136F5DCB}.Analysis|Win32.Build.0 = Analysis|Win32 + {CC3A7A60-76F8-4985-9050-2B99136F5DCB}.Release|Win32.ActiveCfg = Release|Win32 + {CC3A7A60-76F8-4985-9050-2B99136F5DCB}.Release|Win32.Build.0 = Release|Win32 + {CC3A7A60-76F8-4985-9050-2B99136F5DCB}.Debug|x64.ActiveCfg = Debug|x64 + {CC3A7A60-76F8-4985-9050-2B99136F5DCB}.Debug|x64.Build.0 = Debug|x64 + {CC3A7A60-76F8-4985-9050-2B99136F5DCB}.Analysis|x64.ActiveCfg = Analysis|x64 + {CC3A7A60-76F8-4985-9050-2B99136F5DCB}.Analysis|x64.Build.0 = Analysis|x64 + {CC3A7A60-76F8-4985-9050-2B99136F5DCB}.Release|x64.ActiveCfg = Release|x64 + {CC3A7A60-76F8-4985-9050-2B99136F5DCB}.Release|x64.Build.0 = Release|x64 + {85BC4AF5-E0ED-41D3-920E-D10D5D90A6D7}.Debug|Win32.ActiveCfg = Debug|Win32 + {85BC4AF5-E0ED-41D3-920E-D10D5D90A6D7}.Debug|Win32.Build.0 = Debug|Win32 + {85BC4AF5-E0ED-41D3-920E-D10D5D90A6D7}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {85BC4AF5-E0ED-41D3-920E-D10D5D90A6D7}.Analysis|Win32.Build.0 = Analysis|Win32 + {85BC4AF5-E0ED-41D3-920E-D10D5D90A6D7}.Release|Win32.ActiveCfg = Release|Win32 + {85BC4AF5-E0ED-41D3-920E-D10D5D90A6D7}.Release|Win32.Build.0 = Release|Win32 + {85BC4AF5-E0ED-41D3-920E-D10D5D90A6D7}.Debug|x64.ActiveCfg = Debug|x64 + {85BC4AF5-E0ED-41D3-920E-D10D5D90A6D7}.Debug|x64.Build.0 = Debug|x64 + {85BC4AF5-E0ED-41D3-920E-D10D5D90A6D7}.Analysis|x64.ActiveCfg = Analysis|x64 + {85BC4AF5-E0ED-41D3-920E-D10D5D90A6D7}.Analysis|x64.Build.0 = Analysis|x64 + {85BC4AF5-E0ED-41D3-920E-D10D5D90A6D7}.Release|x64.ActiveCfg = Release|x64 + {85BC4AF5-E0ED-41D3-920E-D10D5D90A6D7}.Release|x64.Build.0 = Release|x64 + {F84C1F9B-F49D-4CD9-916D-DF10129FD8D5}.Debug|Win32.ActiveCfg = Debug|Win32 + {F84C1F9B-F49D-4CD9-916D-DF10129FD8D5}.Debug|Win32.Build.0 = Debug|Win32 + {F84C1F9B-F49D-4CD9-916D-DF10129FD8D5}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {F84C1F9B-F49D-4CD9-916D-DF10129FD8D5}.Analysis|Win32.Build.0 = Analysis|Win32 + {F84C1F9B-F49D-4CD9-916D-DF10129FD8D5}.Release|Win32.ActiveCfg = Release|Win32 + {F84C1F9B-F49D-4CD9-916D-DF10129FD8D5}.Release|Win32.Build.0 = Release|Win32 + {F84C1F9B-F49D-4CD9-916D-DF10129FD8D5}.Debug|x64.ActiveCfg = Debug|x64 + {F84C1F9B-F49D-4CD9-916D-DF10129FD8D5}.Debug|x64.Build.0 = Debug|x64 + {F84C1F9B-F49D-4CD9-916D-DF10129FD8D5}.Analysis|x64.ActiveCfg = Analysis|x64 + {F84C1F9B-F49D-4CD9-916D-DF10129FD8D5}.Analysis|x64.Build.0 = Analysis|x64 + {F84C1F9B-F49D-4CD9-916D-DF10129FD8D5}.Release|x64.ActiveCfg = Release|x64 + {F84C1F9B-F49D-4CD9-916D-DF10129FD8D5}.Release|x64.Build.0 = Release|x64 + {17E5DAAC-1622-4F0D-BB8E-70EA620B3D89}.Debug|Win32.ActiveCfg = Debug|Win32 + {17E5DAAC-1622-4F0D-BB8E-70EA620B3D89}.Debug|Win32.Build.0 = Debug|Win32 + {17E5DAAC-1622-4F0D-BB8E-70EA620B3D89}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {17E5DAAC-1622-4F0D-BB8E-70EA620B3D89}.Analysis|Win32.Build.0 = Analysis|Win32 + {17E5DAAC-1622-4F0D-BB8E-70EA620B3D89}.Release|Win32.ActiveCfg = Release|Win32 + {17E5DAAC-1622-4F0D-BB8E-70EA620B3D89}.Release|Win32.Build.0 = Release|Win32 + {17E5DAAC-1622-4F0D-BB8E-70EA620B3D89}.Debug|x64.ActiveCfg = Debug|x64 + {17E5DAAC-1622-4F0D-BB8E-70EA620B3D89}.Debug|x64.Build.0 = Debug|x64 + {17E5DAAC-1622-4F0D-BB8E-70EA620B3D89}.Analysis|x64.ActiveCfg = Analysis|x64 + {17E5DAAC-1622-4F0D-BB8E-70EA620B3D89}.Analysis|x64.Build.0 = Analysis|x64 + {17E5DAAC-1622-4F0D-BB8E-70EA620B3D89}.Release|x64.ActiveCfg = Release|x64 + {17E5DAAC-1622-4F0D-BB8E-70EA620B3D89}.Release|x64.Build.0 = Release|x64 + {E1614405-825C-4008-ABF6-3C69F1192A48}.Debug|Win32.ActiveCfg = Debug|Win32 + {E1614405-825C-4008-ABF6-3C69F1192A48}.Debug|Win32.Build.0 = Debug|Win32 + {E1614405-825C-4008-ABF6-3C69F1192A48}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {E1614405-825C-4008-ABF6-3C69F1192A48}.Analysis|Win32.Build.0 = Analysis|Win32 + {E1614405-825C-4008-ABF6-3C69F1192A48}.Release|Win32.ActiveCfg = Release|Win32 + {E1614405-825C-4008-ABF6-3C69F1192A48}.Release|Win32.Build.0 = Release|Win32 + {E1614405-825C-4008-ABF6-3C69F1192A48}.Debug|x64.ActiveCfg = Debug|x64 + {E1614405-825C-4008-ABF6-3C69F1192A48}.Debug|x64.Build.0 = Debug|x64 + {E1614405-825C-4008-ABF6-3C69F1192A48}.Analysis|x64.ActiveCfg = Analysis|x64 + {E1614405-825C-4008-ABF6-3C69F1192A48}.Analysis|x64.Build.0 = Analysis|x64 + {E1614405-825C-4008-ABF6-3C69F1192A48}.Release|x64.ActiveCfg = Release|x64 + {E1614405-825C-4008-ABF6-3C69F1192A48}.Release|x64.Build.0 = Release|x64 + {96DF59DC-85B6-48AA-B34D-378088A2BDCA}.Debug|Win32.ActiveCfg = Debug|Win32 + {96DF59DC-85B6-48AA-B34D-378088A2BDCA}.Debug|Win32.Build.0 = Debug|Win32 + {96DF59DC-85B6-48AA-B34D-378088A2BDCA}.Analysis|Win32.ActiveCfg = Analysis|Win32 + {96DF59DC-85B6-48AA-B34D-378088A2BDCA}.Analysis|Win32.Build.0 = Analysis|Win32 + {96DF59DC-85B6-48AA-B34D-378088A2BDCA}.Release|Win32.ActiveCfg = Release|Win32 + {96DF59DC-85B6-48AA-B34D-378088A2BDCA}.Release|Win32.Build.0 = Release|Win32 + {96DF59DC-85B6-48AA-B34D-378088A2BDCA}.Debug|x64.ActiveCfg = Debug|x64 + {96DF59DC-85B6-48AA-B34D-378088A2BDCA}.Debug|x64.Build.0 = Debug|x64 + {96DF59DC-85B6-48AA-B34D-378088A2BDCA}.Analysis|x64.ActiveCfg = Analysis|x64 + {96DF59DC-85B6-48AA-B34D-378088A2BDCA}.Analysis|x64.Build.0 = Analysis|x64 + {96DF59DC-85B6-48AA-B34D-378088A2BDCA}.Release|x64.ActiveCfg = Release|x64 + {96DF59DC-85B6-48AA-B34D-378088A2BDCA}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff -Nru scummvm-1.4.0/dists/msvc9/scummvm.vcproj scummvm-1.4.1/dists/msvc9/scummvm.vcproj --- scummvm-1.4.0/dists/msvc9/scummvm.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc9/scummvm.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,797 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc9/sky.vcproj scummvm-1.4.1/dists/msvc9/sky.vcproj --- scummvm-1.4.0/dists/msvc9/sky.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc9/sky.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc9/sword1.vcproj scummvm-1.4.1/dists/msvc9/sword1.vcproj --- scummvm-1.4.0/dists/msvc9/sword1.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc9/sword1.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc9/sword2.vcproj scummvm-1.4.1/dists/msvc9/sword2.vcproj --- scummvm-1.4.0/dists/msvc9/sword2.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc9/sword2.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc9/teenagent.vcproj scummvm-1.4.1/dists/msvc9/teenagent.vcproj --- scummvm-1.4.0/dists/msvc9/teenagent.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc9/teenagent.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc9/tinsel.vcproj scummvm-1.4.1/dists/msvc9/tinsel.vcproj --- scummvm-1.4.0/dists/msvc9/tinsel.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc9/tinsel.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc9/toon.vcproj scummvm-1.4.1/dists/msvc9/toon.vcproj --- scummvm-1.4.0/dists/msvc9/toon.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc9/toon.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc9/touche.vcproj scummvm-1.4.1/dists/msvc9/touche.vcproj --- scummvm-1.4.0/dists/msvc9/touche.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc9/touche.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc9/tsage.vcproj scummvm-1.4.1/dists/msvc9/tsage.vcproj --- scummvm-1.4.0/dists/msvc9/tsage.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc9/tsage.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/msvc9/tucker.vcproj scummvm-1.4.1/dists/msvc9/tucker.vcproj --- scummvm-1.4.0/dists/msvc9/tucker.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/dists/msvc9/tucker.vcproj 2012-01-14 09:28:43.000000000 +0000 @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru scummvm-1.4.0/dists/redhat/scummvm.spec scummvm-1.4.1/dists/redhat/scummvm.spec --- scummvm-1.4.0/dists/redhat/scummvm.spec 2011-11-03 18:06:46.000000000 +0000 +++ scummvm-1.4.1/dists/redhat/scummvm.spec 2012-01-14 09:28:43.000000000 +0000 @@ -7,7 +7,7 @@ # Prologue information #------------------------------------------------------------------------------ Name : scummvm -Version : 1.4.0 +Version : 1.4.1 Release : 1 Summary : Graphic adventure game interpreter Group : Interpreters @@ -17,6 +17,7 @@ Source : %{name}-%{version}.tar.bz2 Source1 : libmad-0.15.1b.tar.bz2 +Source2 : faad2-2.7.tar.bz2 BuildRoot : %{_tmppath}/%{name}-%{version}-root BuildRequires: desktop-file-utils @@ -44,12 +45,13 @@ # install scripts #------------------------------------------------------------------------------ %prep -%setup -q -a 1 -n scummvm-%{version} +%setup -q -a 1 -a 2 -n scummvm-%{version} mkdir tmp %build (cd libmad-0.15.1b; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make; make install) -./configure --with-mad-prefix=%{_builddir}/scummvm-%{version}/tmp --prefix=%{_prefix} --enable-release +(cd faad2-2.7; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make; make install) +./configure --with-mad-prefix=%{_builddir}/scummvm-%{version}/tmp --with-faad-prefix=%{_builddir}/scummvm-%{version}/tmp --prefix=%{_prefix} --enable-release make %install @@ -115,6 +117,8 @@ # Change Log #------------------------------------------------------------------------------ %changelog +* Thu Dec 29 2011 (1.4.0-2) + - include libfaad2 * Fri Sep 17 2010 (1.2.0) - include png/svg icons - remove libmpeg2 diff -Nru scummvm-1.4.0/dists/redhat/scummvm.spec.in scummvm-1.4.1/dists/redhat/scummvm.spec.in --- scummvm-1.4.0/dists/redhat/scummvm.spec.in 2011-09-30 11:04:24.000000000 +0000 +++ scummvm-1.4.1/dists/redhat/scummvm.spec.in 2012-01-14 09:28:25.000000000 +0000 @@ -17,6 +17,7 @@ Source : %{name}-%{version}.tar.bz2 Source1 : libmad-0.15.1b.tar.bz2 +Source2 : faad2-2.7.tar.bz2 BuildRoot : %{_tmppath}/%{name}-%{version}-root BuildRequires: desktop-file-utils @@ -44,12 +45,13 @@ # install scripts #------------------------------------------------------------------------------ %prep -%setup -q -a 1 -n scummvm-%{version} +%setup -q -a 1 -a 2 -n scummvm-%{version} mkdir tmp %build (cd libmad-0.15.1b; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make; make install) -./configure --with-mad-prefix=%{_builddir}/scummvm-%{version}/tmp --prefix=%{_prefix} --enable-release +(cd faad2-2.7; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make; make install) +./configure --with-mad-prefix=%{_builddir}/scummvm-%{version}/tmp --with-faad-prefix=%{_builddir}/scummvm-%{version}/tmp --prefix=%{_prefix} --enable-release make %install @@ -115,6 +117,8 @@ # Change Log #------------------------------------------------------------------------------ %changelog +* Thu Dec 29 2011 (1.4.0-2) + - include libfaad2 * Fri Sep 17 2010 (1.2.0) - include png/svg icons - remove libmpeg2 diff -Nru scummvm-1.4.0/dists/redhat/scummvm-tools.spec scummvm-1.4.1/dists/redhat/scummvm-tools.spec --- scummvm-1.4.0/dists/redhat/scummvm-tools.spec 2011-11-03 18:06:46.000000000 +0000 +++ scummvm-1.4.1/dists/redhat/scummvm-tools.spec 2012-01-14 09:28:43.000000000 +0000 @@ -7,7 +7,7 @@ # Prologue information #------------------------------------------------------------------------------ Name : scummvm-tools -Version : 1.4.0 +Version : 1.4.1 Release : 1 Summary : ScummVM-related tools Group : Interpreters diff -Nru scummvm-1.4.0/dists/scummvm.rc scummvm-1.4.1/dists/scummvm.rc --- scummvm-1.4.0/dists/scummvm.rc 2011-11-03 18:06:46.000000000 +0000 +++ scummvm-1.4.1/dists/scummvm.rc 2012-01-14 09:28:43.000000000 +0000 @@ -51,8 +51,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,4,0,0 - PRODUCTVERSION 1,4,0,0 + FILEVERSION 1,4,1,0 + PRODUCTVERSION 1,4,1,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -69,13 +69,13 @@ BEGIN VALUE "Comments", "Look! A three headed monkey (TM)! .. Nice use of the TM!\0" VALUE "FileDescription", "http://www.scummvm.org/\0" - VALUE "FileVersion", "1.4.0\0" + VALUE "FileVersion", "1.4.1\0" VALUE "InternalName", "scummvm\0" - VALUE "LegalCopyright", "Copyright © 2001-2011 The ScummVM Team\0" + VALUE "LegalCopyright", "Copyright © 2001-2012 The ScummVM Team\0" VALUE "LegalTrademarks", "'SCUMM', and all SCUMM games are a TM of LucasArts. Simon The Sorcerer is a TM of AdventureSoft. Beneath a Steel Sky and Broken Sword are a TM of Revolution. Flight of the Amazon Queen is a TM of John Passfield and Steve Stamatiadis. \0" VALUE "OriginalFilename", "scummvm.exe\0" VALUE "ProductName", "ScummVM\0" - VALUE "ProductVersion", "1.4.0\0" + VALUE "ProductVersion", "1.4.1\0" END END diff -Nru scummvm-1.4.0/dists/scummvm.rc.in scummvm-1.4.1/dists/scummvm.rc.in --- scummvm-1.4.0/dists/scummvm.rc.in 2011-07-27 13:40:23.000000000 +0000 +++ scummvm-1.4.1/dists/scummvm.rc.in 2012-01-14 09:28:43.000000000 +0000 @@ -71,7 +71,7 @@ VALUE "FileDescription", "http://www.scummvm.org/\0" VALUE "FileVersion", "@VERSION@\0" VALUE "InternalName", "scummvm\0" - VALUE "LegalCopyright", "Copyright © 2001-2011 The ScummVM Team\0" + VALUE "LegalCopyright", "Copyright © 2001-2012 The ScummVM Team\0" VALUE "LegalTrademarks", "'SCUMM', and all SCUMM games are a TM of LucasArts. Simon The Sorcerer is a TM of AdventureSoft. Beneath a Steel Sky and Broken Sword are a TM of Revolution. Flight of the Amazon Queen is a TM of John Passfield and Steve Stamatiadis. \0" VALUE "OriginalFilename", "scummvm.exe\0" VALUE "ProductName", "ScummVM\0" diff -Nru scummvm-1.4.0/dists/slackware/scummvm.SlackBuild scummvm-1.4.1/dists/slackware/scummvm.SlackBuild --- scummvm-1.4.0/dists/slackware/scummvm.SlackBuild 2011-11-03 18:06:46.000000000 +0000 +++ scummvm-1.4.1/dists/slackware/scummvm.SlackBuild 2012-01-14 09:28:43.000000000 +0000 @@ -9,7 +9,7 @@ fi PKG=$TMP/package-scummvm -VERSION=1.4.0 +VERSION=1.4.1 ARCH=i486 BUILD=1 diff -Nru scummvm-1.4.0/dists/wii/meta.xml scummvm-1.4.1/dists/wii/meta.xml --- scummvm-1.4.0/dists/wii/meta.xml 2011-11-03 18:06:46.000000000 +0000 +++ scummvm-1.4.1/dists/wii/meta.xml 2012-01-14 09:28:43.000000000 +0000 @@ -2,7 +2,7 @@ ScummVM The ScummVM Team - 1.4.0@REVISION@ + 1.4.1@REVISION@ @TIMESTAMP@ Point & Click Adventures ScummVM is a program which allows you to run certain classic graphical point-and-click adventure games, provided you already have their data files. The clever part about this: ScummVM just replaces the executables shipped with the games, allowing you to play them on systems for which they were never designed! diff -Nru scummvm-1.4.0/dists/win32/scummvm.gdf.xml scummvm-1.4.1/dists/win32/scummvm.gdf.xml --- scummvm-1.4.0/dists/win32/scummvm.gdf.xml 2011-09-30 11:04:24.000000000 +0000 +++ scummvm-1.4.1/dists/win32/scummvm.gdf.xml 2012-01-14 09:28:43.000000000 +0000 @@ -3,7 +3,7 @@ ScummVM ScummVM is a program which allows you to run certain classic graphical point-and-click adventure games, provided you already have their data files. The clever part about this: ScummVM just replaces the executables shipped with the games, allowing you to play them on systems for which they were never designed! - 2011-09-30 + 2012-01-27 Adventure diff -Nru scummvm-1.4.0/dists/win32/ScummVM.iss scummvm-1.4.1/dists/win32/ScummVM.iss --- scummvm-1.4.0/dists/win32/ScummVM.iss 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/dists/win32/ScummVM.iss 2012-01-14 09:28:43.000000000 +0000 @@ -1,5 +1,5 @@ [Setup] -AppCopyright=2011 +AppCopyright=2012 AppName=ScummVM AppVerName=ScummVM Git AppPublisher=The ScummVM Team @@ -37,6 +37,7 @@ Name: pl; MessagesFile: compiler:Languages\Polish.isl Name: ru; MessagesFile: compiler:Languages\Russian.isl Name: es; MessagesFile: compiler:Languages\Spanish.isl +Name: se; MessagesFile: compiler:Languages\Swedish.isl [Icons] Name: {group}\{cm:UninstallProgram, ScummVM}; Filename: {uninstallexe} @@ -50,16 +51,18 @@ Name: {group}\News; Filename: {app}\NEWS.txt; WorkingDir: {app}; Comment: NEWS; Flags: createonlyiffileexists; Languages: not de Name: {group}\Neues; Filename: {app}\Neues.txt; WorkingDir: {app}; Comment: Neues; Flags: createonlyiffileexists; Languages: de ;QUICKSTART -Name: {group}\QuickStart; Filename: {app}\QUICKSTART.txt; WorkingDir: {app}; Comment: QUICKSTART; Flags: createonlyiffileexists; Languages: not (de or es or fr or it or nb) +Name: {group}\QuickStart; Filename: {app}\QUICKSTART.txt; WorkingDir: {app}; Comment: QUICKSTART; Flags: createonlyiffileexists; Languages: not (de or es or fr or it or nb or se) Name: {group}\Schnellstart; Filename: {app}\Schnellstart.txt; WorkingDir: {app}; Comment: Schnellstart; Flags: createonlyiffileexists; Languages: de Name: {group}\InicioRapido; Filename: {app}\InicioRapido.txt; WorkingDir: {app}; Comment: InicioRapido; Flags: createonlyiffileexists; Languages: es Name: {group}\DemarrageRapide; Filename: {app}\DemarrageRapide.txt; WorkingDir: {app}; Comment: DemarrageRapide; Flags: createonlyiffileexists; Languages: fr Name: {group}\GuidaRapida; Filename: {app}\GuidaRapida.txt; WorkingDir: {app}; Comment: GuidaRapida; Flags: createonlyiffileexists; Languages: it Name: {group}\HurtigStart; Filename: {app}\HurtigStart.txt; WorkingDir: {app}; Comment: HurtigStart; Flags: createonlyiffileexists; Languages: nb +Name: {group}\Snabbstart; Filename: {app}\Snabbstart.txt; WorkingDir: {app}; Comment: Snabbstart; Flags: createonlyiffileexists; Languages: se ;README -Name: {group}\Readme; Filename: {app}\README.txt; WorkingDir: {app}; Comment: README; Flags: createonlyiffileexists; Languages: not (cz or de) +Name: {group}\Readme; Filename: {app}\README.txt; WorkingDir: {app}; Comment: README; Flags: createonlyiffileexists; Languages: not (cz or de or se) Name: {group}\PrectiMe; Filename: {app}\PrectiMe.txt; WorkingDir: {app}; Comment: PrectiMe; Flags: createonlyiffileexists; Languages: cz Name: {group}\Liesmich; Filename: {app}\Liesmich.txt; WorkingDir: {app}; Comment: Liesmich; Flags: createonlyiffileexists; Languages: de +Name: {group}\LasMig; Filename: {app}\LasMig.txt; WorkingDir: {app}; Comment: LasMig; Flags: createonlyiffileexists; Languages: se [Run] Filename: {app}\ScummVM.exe; Flags: nowait skipifdoesntexist postinstall skipifsilent @@ -76,16 +79,18 @@ Source: NEWS.txt; DestDir: {app}; Flags: ignoreversion; Languages: not de Source: doc/de/Neues.txt; DestDir: {app}; Flags: ignoreversion; Languages: de ;QUICKSTART -Source: doc/QUICKSTART.txt; DestDir: {app}; Flags: ignoreversion isreadme; Languages: not (de or es or fr or it or nb) +Source: doc/QUICKSTART.txt; DestDir: {app}; Flags: ignoreversion isreadme; Languages: not (de or es or fr or it or nb or se) Source: doc/de/Schnellstart.txt; DestDir: {app}; Flags: ignoreversion isreadme; Languages: de Source: doc/es/InicioRapido.txt; DestDir: {app}; Flags: ignoreversion isreadme; Languages: es Source: doc/fr/DemarrageRapide.txt; DestDir: {app}; Flags: ignoreversion isreadme; Languages: fr Source: doc/it/GuidaRapida.txt; DestDir: {app}; Flags: ignoreversion isreadme; Languages: it Source: doc/no-nb/HurtigStart.txt; DestDir: {app}; Flags: ignoreversion isreadme; Languages: nb +Source: doc/se/Snabbstart.txt; DestDir: {app}; Flags: ignoreversion isreadme; Languages: se ;README -Source: README.txt; DestDir: {app}; Flags: ignoreversion isreadme; Languages: not (cz or de) +Source: README.txt; DestDir: {app}; Flags: ignoreversion isreadme; Languages: not (cz or de or se) Source: doc/cz/PrectiMe.txt; DestDir: {app}; Flags: ignoreversion isreadme; Languages: cz Source: doc/de/Liesmich.txt; DestDir: {app}; Flags: ignoreversion isreadme; Languages: de +Source: doc/se/LasMig.txt; DestDir: {app}; Flags: ignoreversion isreadme; Languages: se Source: README-SDL.txt; DestDir: {app}; Flags: ignoreversion Source: scummvm.exe; DestDir: {app}; Flags: ignoreversion Source: SDL.dll; DestDir: {app} diff -Nru scummvm-1.4.0/dists/win32/scummvm.nsi scummvm-1.4.1/dists/win32/scummvm.nsi --- scummvm-1.4.0/dists/win32/scummvm.nsi 2011-11-03 18:06:46.000000000 +0000 +++ scummvm-1.4.1/dists/win32/scummvm.nsi 2012-01-14 09:28:43.000000000 +0000 @@ -72,11 +72,11 @@ # General Symbol Definitions ######################################################################################### !define REGKEY "Software\$(^Name)\$(^Name)" -!define VERSION "1.4.0" +!define VERSION "1.4.1" !define COMPANY "ScummVM Team" !define URL "http://scummvm.org/" !define DESCRIPTION "ScummVM Installer. Look! A three headed monkey (TM)!" -!define COPYRIGHT "Copyright © 2001-2011 The ScummVM Team" +!define COPYRIGHT "Copyright © 2001-2012 The ScummVM Team" ######################################################################################### # Installer configuration @@ -92,7 +92,7 @@ #TargetMinimalOS 5.0 ; Minimal version of windows for installer: Windows 2000 or more recent ; (will build unicode installer with NSIS 2.50+) -VIProductVersion 1.4.0.0 +VIProductVersion 1.4.1.0 VIAddVersionKey ProductName $(^Name) VIAddVersionKey ProductVersion "${VERSION}" VIAddVersionKey CompanyName "${COMPANY}" diff -Nru scummvm-1.4.0/dists/win32/scummvm.nsi.in scummvm-1.4.1/dists/win32/scummvm.nsi.in --- scummvm-1.4.0/dists/win32/scummvm.nsi.in 2011-07-27 13:40:23.000000000 +0000 +++ scummvm-1.4.1/dists/win32/scummvm.nsi.in 2012-01-14 09:28:43.000000000 +0000 @@ -76,7 +76,7 @@ !define COMPANY "ScummVM Team" !define URL "http://scummvm.org/" !define DESCRIPTION "ScummVM Installer. Look! A three headed monkey (TM)!" -!define COPYRIGHT "Copyright © 2001-2011 The ScummVM Team" +!define COPYRIGHT "Copyright © 2001-2012 The ScummVM Team" ######################################################################################### # Installer configuration diff -Nru scummvm-1.4.0/doc/de/Liesmich scummvm-1.4.1/doc/de/Liesmich --- scummvm-1.4.0/doc/de/Liesmich 2011-11-03 18:06:06.000000000 +0000 +++ scummvm-1.4.1/doc/de/Liesmich 2012-01-14 09:28:43.000000000 +0000 @@ -1030,6 +1030,7 @@ --list-themes Zeigt Liste aller verwendbaren Oberflächenthemen. -e, --music-driver=MODUS Wählt Musiktreiber (siehe auch Abschnitt 7.0). + --list-audio-devices Listet alle verfügbaren Audiogeräte auf. -q, --language=SPRACHE Wählt Spielsprache (siehe auch Abschnitt 5.2). -m, --music-volume=ZAHL Wählt Musiklautstärke, 0-255 (Standard: 192). -s, --sfx-volume=ZAHL Wählt Effektlautstärke, 0-255 (Standard: 192). @@ -2009,7 +2010,7 @@ ---- -------------------- Standardmäßig wird die Konfigurationsdatei hier gespeichert und geladen: - Windows Vista: + Windows Vista/7: \Users\Benutzername\AppData\Roaming\ScummVM\scummvm.ini Windows 2000/XP: @@ -2190,6 +2191,13 @@ walkspeed Zahl Bewegungsgeschwindigkeit (0-4) +The 7th Guest verfügt zusätzlich über folgendes nicht standardmäßiges +Schlüsselwort: + + t7g_speed Text Videowiedergabe-Geschwindigkeit + (normal, tweaked [optimiert], + im_an_ios [ich bin ein iOS]) + 9.0) Kompilierung: ---- ------------- diff -Nru scummvm-1.4.0/doc/de/Neues scummvm-1.4.1/doc/de/Neues --- scummvm-1.4.0/doc/de/Neues 2011-11-03 18:06:06.000000000 +0000 +++ scummvm-1.4.1/doc/de/Neues 2012-01-14 09:28:43.000000000 +0000 @@ -2,6 +2,34 @@ Sie auf Englisch unter: https://github.com/scummvm/scummvm/commits/ +1.4.1 (27.01.2012) + AGOS: + - Das Laden von Videos direkt aus InstallShield-Archiven in der + Windows-Version von Floyd - Es gibt noch Helden korrigiert. + + BASS: + - Unterstützung für verbesserte Musik von James Woodcock hinzugefügt + (http://www.jameswoodcock.co.uk/?p=7695). + + KYRA: + - Fehler in der originalen Benutzeroberfläche von Lands of Lore beseitigt, + der dazu führte, dass ScummVM abstürzte, wenn der Anwender keine + durchgehend fortlaufenden Speicherplätze verwendete. + - Unterstützung für originale DOS-Speicherstände von Lands of Lore + hinzugefügt (trifft auch auf Speicherstände zu, die mit der GOG-Version + gemacht wurden). + + SCI: + - Abfolgebedingung bei SCI1.1-Palettenänderungen korrigiert. Dies behebt + einen Fehler in QFG1VGA, wenn man in Erana's Peace schläft. + - Die Option, um zwischen digitalisierten und synthetisierten + Soundeffekten auszuwählen, wurde bis auf Weiteres deaktiviert, bis eine + anwenderfreundlichere Benutzeroberflächen-Option möglich ist. + Digitale Soundeffekte werden vorerst immer bevorzugt. + + Sword2: + - Leichte Grafikverbesserung für PSX-Version. + 1.4.0 (11.11.2011) Neue Spiele: - Unterstützung für Lands of Lore: The Throne of Chaos hinzugefügt. diff -Nru scummvm-1.4.0/doc/se/LasMig scummvm-1.4.1/doc/se/LasMig --- scummvm-1.4.0/doc/se/LasMig 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/doc/se/LasMig 2012-01-14 09:28:25.000000000 +0000 @@ -0,0 +1,1652 @@ +ScummVM LÄS MIG +Senast uppdaterad: $Date$ +------------------------------------------------------------------------ + +För ytterligare information, kompatibilitetslistor, donationsdetaljer, den senaste programversionen, utvecklingsrapporter med mera, var god besök ScummVM:s hemsida pÃ¥ http://www.scummvm.org/ + +InnehÃ¥ll: +--------- +1.0) Introduktion + * 1.1 Om ScummVM + * 1.2 Snabbstart +2.0) Kontaktinformation + * 2.1 Att rapportera buggar + * 2.3 Snabbstart +3.0) Stödda spel + * 3.1 Kopieringsskydd + * 3.2 Notiser om Commodore64-spel + * 3.3 Notiser om Maniac Mansion för NES + * 3.4 Notiser om Macintosh-spel + * 3.5 Notiser om spel med flera CD-skivor: + * 3.6 Notiser om The Curse of Monkey Island + * 3.7 Notiser om Broken Sword-spelen + * 3.8 Notiser om Beneath a Steel Sky + * 3.9 Notiser om Flight of the Amazon Queen + * 3.10 Notiser om Gobliiins + * 3.11 Notiser om Inherit the Earth: Quest for the Orb + * 3.12 Notiser om Simon the Sorcerer + * 3.13 Notiser om The Feeble Files + * 3.14 Notiser om The Legend of Kyrandia + * 3.15 Sierra AGI games Predictive Input Dialog notes + * 3.16 Notiser om Mickey’s Space Adventure + * 3.17 Notiser om Winnie the Pooh + * 3.18 Notiser om Troll's Tale + * 3.19 Notiser om Dragon History + * 3.20 Kända problem +4.0) Stödda plattformar +5.0) Att köra ScummVM + * 5.1 Att använda kommandoraden + * 5.2 SprÃ¥kinställningar + * 5.3 Grafikfilter + * 5.4 Den globala menyn + * 5.5 Kortkommandon +6.0) Spardata + * 6.1 Autosparning + * 6.2 Att konvertera speldata + * 6.3 Visa/ladda spardata frÃ¥n kommandoraden +7.0) Musik och ljud + * 7.1 AdLib-emulation + * 7.2 FluidSynth MIDI-emulation + * 7.3 MT-32-emulation + * 7.4 MIDI-emulation + * 7.5 Native MIDI-stöd + * 7.6 Support för UNIX, ALSA och dmedia sequencers + * 7.7 Att använda TiMidity++ MIDI-servern + * 7.8 Att använda komprimerade ljudfiler (MP3, Ogg Vorbis, Flac) + * 7.9 Uppspelningsfrekvens +8.0) Konfigurationsfilen +9.0) Kompilering + + +1.0) Introduktion: +---- ------------- + +1.1) Om ScummVM: +---- ----------- +ScummVM är ett program som gör det möjligt att spela vissa klassiska â€peka-och-klickaâ€-äventyrsspel, förutsatt att du redan har de nödvändiga datafilerna. Det finurliga i det hela är att ScummVM ersätter de ursprungliga programfilerna som följde med spelet, vilket lÃ¥ter dig spela dem pÃ¥ operativsystem de aldrig var designade för! + +FrÃ¥n början var programmet designat för att köra LucasArts SCUMM-spel, till exempel Maniac Mansion, Monkey Island, Day of the Tentacle och Sam and Max. SCUMM stÃ¥r för â€Script Creation Utility for Maniac Mansionâ€, och just Maniac Mansion var det första spelet där LucasArts använde det här spelsystemet. Mycket senare gav det namn till ScummVM (â€VM†stÃ¥r för â€Virtual Machineâ€). + +Med tiden har stöd lagts till för mÃ¥nga spel som inte använder SCUMM-systemet och ScummVM stöder nu även mÃ¥nga av Sierras AGI- och SCI-spel (till exempel King’s Quest 1-6, Space Quest 1-5, ...), Discworld 1 och 2, Simon the Sorcerer 1 och 2, Beneath A Steel Sky, Lure of the Temptress, Broken Sword I och II, Flight of the Amazon Queen, Gobliiins 1-3, Legend of Kyrandia-serien, mÃ¥nga av Humongous Entertainments barnspel (inklusive Freddi Fish och Putt Putt-spelen) med flera. Du kan se en fullständig lista med delaljer om vilka äventyr som stöds och hur väl de fungerar pÃ¥ kompatibilitetssidan. ScummVM förbättras konstant, sÃ¥ hÃ¥ll ett öga pÃ¥ listan. + +Bland systemen du kan använda för att spela dessa spel räknas vanliga persondatorer (Windows, Linux, Mac OS X, ...) spelkonsoler (Dreamcast, Nintendo DS & Wii, PS2, PSP, ...), smartphones (Android, iPhone, PocketPC, Symbian ...) med flera. + +Just nu är ScummVM fortfarande under utveckling. Var medveten om att trots att vi försöker se till att mÃ¥nga spel kan avklaras utan att stöta pÃ¥ allvarliga buggar finns det ändÃ¥ risk för krasher, och vi erbjuder inga garantier. Dock har mÃ¥nga spel varit stödda av programmet väldigt länge och borde fungera utmärkt i vilken som helst av de senaste stabila versionerna. Du kan fÃ¥ en uppfattning om hur väl varje spel fungerar i ScummVM genom att titta pÃ¥ kompatibilitetssidan. Faktum är att ScummVM används kommersiellt för nyutgÃ¥vor av vissa spel pÃ¥ moderna plattformar. AlltsÃ¥ är mÃ¥nga företag nöjda med mjukvarans kvalitet och hur väl programmet stöder spelen. + +Om du gillar ScummVM fÃ¥r du gärna donera till teamet med hjälp av PayPal-knappen pÃ¥ ScummVM:s hemsida. Donationer hjälper oss att köpa nödvändig utrustning för att göra utvecklingen av ScummVM lättare och snabbare. Om du inte kan donera kan du hjälpa till genom att bidra med uppdateringar! + + +1.2) Snabbstart: +---- ----------- +VIKTIGT: Den här korta guiden förutsätter att du använder ScummVM pÃ¥ svenska. ScummVM använder automatiskt samma sprÃ¥k som ditt operativsystem. Om du föredrar att använda ScummVM pÃ¥ engelska kommer du troligtvis föredra att använda guiden i den engelska README-filen. + +För de otÃ¥liga följer här instruktioner för att köra igÃ¥ng ScummVM i fem enkla steg. + +1. Ladda hem ScummVM frÃ¥n http://www.scummvm.org/downloads.php och installera programmet. + +2. Skapa en filkatalog pÃ¥ din hÃ¥rddisk och kopiera spelets datafiler frÃ¥n dess ursprungliga plats till den nya katalogen. Upprepa det här steget för varje spel du vill spela (det är bättre att använda separata kataloger för vaje spel). + +3. Starta ScummVM. + +Om programmet nu visas pÃ¥ engelska istället för svenska, gör sÃ¥här för att byta sprÃ¥k: +- Klicka pÃ¥ â€Optionsâ€. +- Klicka pÃ¥ högerpilen i tab-raden och navigera till “Miscâ€-tabben. +- Välj “Svenska†i “GUI Languageâ€-menyn och klicka pÃ¥ “OKâ€. +- Konfirmera meddelandet som visas, klicka pÃ¥ “Quit†för att avsluta ScummVM och starta sedan om programmet. + +Klicka pÃ¥ “Lägg till spelâ€, välj katalogen som innehÃ¥ller datafilerna (var noga att välja själva filkatalogen - inte datafilerna inuti filkatalogen!) och klicka pÃ¥ â€Väljâ€. + +4. Nu visas en dialogruta där du kan ändra diverse inställningar om du vill (det borde vara nog att lämna inställningarna som de är frÃ¥n början). Konfirmera dialogrutan. + +5. Välj spelet du vill spela frÃ¥n listan och klicka pÃ¥ â€Startaâ€. + +ScummVM kommer ihÃ¥g alla spelen du lägger till, sÃ¥ om du avslutar ScummVM kommer spellistan vid nästa omstart innehÃ¥lla alla spelen du hittills lagt till. Du kan därför hoppa direkt till steg 5, sÃ¥tillvida inte du vill läga till fler spel. + +Tips: Om du vill lägga till flera spel pÃ¥ en gÃ¥ng, pröva att trycka och hÃ¥lla ned skift-tangenten när du klickar pÃ¥ “Lägg till spel†– knappens text ändras nu till “Masstillägg†och om du klickar pÃ¥ den kommer du Ã¥ter igen ombedjas att välja en filkatalog, men den här gÃ¥ngen söker ScummVM automatiskt igenom alla underkataloger efter stödda spel. + + +2.0) Kontakt: +---- -------- +Det enklaste sättet att kontakta ScummVM-teamet är att skicka in bugg-rapporter (se 2.1) eller genom att använda vÃ¥rt forum pÃ¥ http://forums.scummv.org. Du kan även skriva upp dig för och skicka e-post via vÃ¥r sändlista (scummvm-devel) eller chatta med oss pÃ¥ IRC (#scummvm pÃ¥ irc.freenode.net) Vi ber dig att inte skicka önskemÃ¥l pÃ¥ spel som inte stöds av ScummVM – läs avdelningen för vanliga frÃ¥gor (FAQ) pÃ¥ vÃ¥ran hemsida först. Märk även att det officiella sprÃ¥ket för vÃ¥rt forum, vÃ¥r sändlista och chatten är engelska och att inga andra sprÃ¥k borde användas där. + + +2.1) Att rapportera buggar: +---- ---------------------- +För att rapportera en bugg mÃ¥ste du skapa ett konto hos SourceForge och följa “Bug Trackerâ€-länken frÃ¥n vÃ¥ran hemsida. Var god se till att buggen kan reproduceras med säkerhet och att den fortfarande är aktiv i den senaste git/Daily build-versionen. Se även till att kontrollera att felet inte redan rapporterats genom att läsa listan av kända fel för spelet pÃ¥ vÃ¥ran kompatibilitetssida: + + http://www.scummvm.org/compatibility_stable.php + +Var god rapportera inte buggar för spel som inte är möjliga att avklara enligt “Supported Gamesâ€-avdelningen, eller i kompatibilitetslistan. Vi vet redan att dessa spel är buggiga. + +Se till att bifoga följande information: + - ScummVM version (Var god testa med den senaste git/Daily Build-versionen) + - Detaljer om buggen, inklusive instruktioner för reproduktion + - Spelets sprÃ¥k (engelska, tyska, ...) + - Version av spelet (talversionen, diskettversionen, ...) + - Plattform och kompilator (Win32, Linux, FreeBSD, ...) + - Bifoga spardata om möjligt + - Om den här buggen dök upp alldeles nyligen, var god notera den senaste versionen av ScummVM där buggen inte fanns och den första versionen där buggen dök upp. PÃ¥ det här viset kan vi fixa problemet snabbare genom att se vilka förändringar som skedde mellan versionerna. + +Slutligen, var god rapportera varje bugg i enskilda rapporter; skicka inte flera buggar i en och samma rapport (annars blir det svÃ¥rt att hÃ¥lla reda pÃ¥ varje buggs individuella status). + + +3.0) Stödda spel: +---- ------------ +För tillfället har de följande spelen anmälts som funktionella, och borde kunna spelas frÃ¥n början till slut: + +SCUMM-spel frÃ¥n LucasArts: + Maniac Mansion [maniac] + Zak McKracken and the Alien Mindbenders [zak] + Indiana Jones and the Last Crusade [indy3] + Loom [loom] + The Secret of Monkey Island [monkey] + Monkey Island 2: LeChuck's Revenge [monkey2] + Indiana Jones and the Fate of Atlantis [atlantis] + Day of the Tentacle [tentacle] + Sam & Max Hit the Road [samnmax] + Full Throttle [ft] + The Dig [dig] + The Curse of Monkey Island [comi] + +AGI-spel frÃ¥n Sierra: + The Black Cauldron [bc] + Gold Rush! [goldrush] + King's Quest I [kq1] + King's Quest II [kq2] + King's Quest III [kq3] + King's Quest IV [kq4] + Leisure Suit Larry in the Land of the + Lounge Lizards [lsl1] + Mixed-Up Mother Goose [mixedup] + Manhunter 1: New York [mh1] + Manhunter 2: San Francisco [mh2] + Police Quest I: In Pursuit of the Death + Angel [pq1] + Space Quest I: The Sarien Encounter [sq1] + Space Quest II: Vohaul's Revenge [sq2] + Fanmade Games [agi-fanmade] + +AGOS-spel frÃ¥n Adventuresoft/Horrorsoft: + Elvira - Mistress of the Dark [elvira1] + Elvira II - The Jaws of Cerberus [elvira2] + Personal Nightmare [pn] + Waxworks [waxworks] + Simon the Sorcerer 1 [simon1] + Simon the Sorcerer 2 [simon2] + Simon the Sorcerer's Puzzle Pack + - Demon In My Pocket [dimp] + Simon the Sorcerer's Puzzle Pack + - Jumble [jumble] + Simon the Sorcerer's Puzzle Pack + - NoPatience [puzzle] + Simon the Sorcerer's Puzzle Pack + - Swampy Adventures [swampy] + The Feeble Files [feeble] + +GOB-spel frÃ¥n Coktel Vision: + Bargon Attack [bargon] + Gobliiins [gob1] + Gobliins 2 [gob2] + Goblins 3 [gob3] + Lost in Time [lostintime] + The Bizarre Adventures of Woodruff + and the Schnibble [woodruff] + Ween: The Prophecy [ween] + +MADE-spel frÃ¥n Activision: + Leather Goddesses of Phobos 2 [lgop2] + Return to Zork [rtz] + Rodney's Funscreen [rodney] + The Manhole [manhole] + +Övriga spel: + Beneath a Steel Sky [sky] + Broken Sword: The Shadow of the Templars [sword1] + Broken Sword II: The Smoking Mirror [sword2] + Cruise for a Corpse [cruise] + Discworld [dw] + Discworld 2: Missing Presumed ...!? [dw2] + Dragon History [draci] + Drascula: The Vampire Strikes Back [drascula] + Flight of the Amazon Queen [queen] + Future Wars [fw] + Inherit the Earth: Quest for the Orb [ite] + Nippon Safes Inc. [nippon] + The Legend of Kyrandia [kyra1] + The Legend of Kyrandia: The Hand of Fate [kyra2] + The Legend of Kyrandia: Malcolm's Revenge [kyra3] + Touche: The Adventures of the Fifth + Musketeer [touche] + +SCUMM-spel frÃ¥n Humongous Entertainment: + Backyard Baseball [baseball] + Backyard Baseball 2001 [baseball2001] + Backyard Football [football] + Big Thinkers First Grade [thinker1] + Big Thinkers Kindergarten [thinkerk] + Blue's 123 Time Activities [Blues123Time] + Blue's ABC Time Activities [BluesABCTime] + Blue's Art Time Activities [arttime] + Blue's Birthday Adventure [BluesBirthday] + Blue's Reading Time Activities [readtime] + Fatty Bear's Birthday Surprise [fbear] + Fatty Bear's Fun Pack [fbpack] + Freddi Fish 1: The Case of the Missing + Kelp Seeds [freddi] + Freddi Fish 2: The Case of the Haunted + Schoolhouse [freddi2] + Freddi Fish 3: The Case of the Stolen + Conch Shell [freddi3] + Freddi Fish 4: The Case of the Hogfish + Rustlers of Briny Gulch [freddi4] + Freddi Fish 5: The Case of the Creature + of Coral Cove [freddicove] + Freddi Fish and Luther's Maze Madness [maze] + Freddi Fish and Luther's Water Worries [water] + Let's Explore the Airport with Buzzy [airport] + Let's Explore the Farm with Buzzy [farm] + Let's Explore the Jungle with Buzzy [jungle] + Pajama Sam 1: No Need to Hide When It's + Dark Outside [pajama] + Pajama Sam 2: Thunder and Lightning + Aren't so Frightening [pajama2] + Pajama Sam 3: You Are What You Eat + From Your Head to Your Feet [pajama3] + Pajama Sam's Lost & Found [lost] + Pajama Sam's Sock Works [socks] + Putt-Putt Joins the Parade [puttputt] + Putt-Putt Goes to the Moon [puttmoon] + Putt-Putt Saves the Zoo [puttzoo] + Putt-Putt Travels Through Time [putttime] + Putt-Putt Enters the Race [puttrace] + Putt-Putt Joins the Circus [puttcircus] + Putt-Putt and Pep's Balloon-O-Rama [balloon] + Putt-Putt and Pep's Dog on a Stick [dog] + Putt-Putt & Fatty Bear's Activity Pack [activity] + Putt-Putt's Fun Pack [funpack] + SPY Fox 1: Dry Cereal [spyfox] + SPY Fox 2: Some Assembly Required [spyfox2] + SPY Fox 3: Operation Ozone [spyozon] + SPY Fox in Cheese Chase [chase] + SPY Fox in Hold the Mustard [mustard] + +Living Books-spel: + Aesop's Fables: The Tortoise and the Hare [tortoise] + Arthur's Birthday [arthurbday] + Arthur's Teacher Trouble [arthur] + Dr. Seuss's ABC [seussabc] + Green Eggs and Ham [greeneggs] + Harry and the Haunted House [harryhh] + Just Grandma and Me [grandma] + Little Monster at School [lilmonster] + Ruff's Bone [ruff] + Sheila Rae, the Brave [sheila] + Stellaluna [stellaluna] + The Berenstain Bears Get in a Fight [bearfight] + The Berenstain Bears in the Dark [beardark] + The New Kid on the Block [newkid] + +De följande spelen borde starta, men är ännu ej helt spelbara. Spela dem pÃ¥ egen risk och var god skicka inga buggrapporter angÃ¥ende dem. För senaste nytt angÃ¥ende spelkompatibilitet kan du besöka vÃ¥r hemsida och läsa kompatibilitetslistan. + + Backyard Baseball 2003 [baseball2003] + Backyard Football 2002 [football2002] + Backyard Soccer [soccer] + Backyard Soccer MLS [soccermls] + Backyard Soccer 2004 [soccer2004] + Blue's Treasure Hunt [BluesTreasureHunt] + Pajama Sam: Games to Play on Any Day [pjgames] + +De följande spelen är baserade pÃ¥ SCUMM-motorn men stöds INTE (ännu) av ScummVM: + + Övriga Humongous Entertainment-spel + +Tänk pÃ¥ att spelmotorerna kan inehÃ¥lla buggar och funktioner som inte implementerats vilket kan göra det omöjligt att klara spelet. Spara ofta och skicka en buggrapport om du stöter pÃ¥ en sÃ¥dan bugg i ett â€stött†spel (se ovan för instruktioner om hur man skickar buggrapporter). + + +3.1) Kopieringsskydd: +---- ---------------- +ScummVM-teamet föresprÃ¥kar inte piratkopiering. Dock finns det fall där spelföretag (t.ex. LucasArts) pÃ¥ egen hand har bifogat â€crackade†programfiler med sina spel. I dessa fall inehÃ¥ller datafilerna fortfarande koden för kopieringsskydd, men programfilen överskrider den (pÃ¥ samma sätt som en illegalt â€crackad†version tar sig förbi skyddskoden, med skillnaden att speltillverkarna här själva stod för överskridningen). DÃ¥ vi omöjligen kan se skillnad pÃ¥ legitima och piratkopierade datafiler mÃ¥ste vi lÃ¥ta ScummVM överskrida kopieringsskyddet för alla spel som nÃ¥gon gÃ¥ng sÃ¥lts i original med â€crackade†programfiler. + +I vissa fall visar ScummVM fortfarande skärmen för kopieringsskydd. Försök att ge vilket svar som helst. Troligtvis fungerar det. + +ScummVM skippar kopieringsskyddet för följande spel: + + * Maniac Mansion + * Zak McKracken and the Alien Mindbenders + * Loom (EGA) + * The Secret of Monkey Island (VGA) + * Monkey Island 2: LeChuck's Revenge + * Beneath a Steel Sky + -- överskridit med tillstÃ¥nd frÃ¥n Revolution Software. + * Inherit the Earth: Quest for the Orb (Diskettversionen) + -- överskridit med tillstÃ¥nd frÃ¥n Wyrmkeep Entertainment, + dÃ¥ det överskridits pÃ¥ alla CD-utgÃ¥vor av spelet. + * Simon the Sorcerer 1 (Diskettversionen) + * Simon the Sorcerer 2 (Diskettversionen) + -- överskridit med tillstÃ¥nd frÃ¥n Adventure Soft, + dÃ¥ det överskridits pÃ¥ alla CD-utgÃ¥vor av spelet. + * Waxworks + + +3.2) Notiser om Commodore64-spel: +---- ---------------------------- +BÃ¥de Maniac Mansion och Zak McKracken startar men Maniac Mansion är ännu inte spelbart. Namnge D64 disketterna â€maniac1.d64†och â€maniac2.d64†(för Maniac Mansion) och â€zak1.d64†och â€zak2.d64†(för Zak McKracken) sÃ¥ kommer ScummVM automatiskt hitta spelen om du hänvisar till rätt katalog. + +Annars kan du använda â€extract_mm_c64†frÃ¥n tools-paketet för att extrahera datafilerna. Tyvärr kan inte spelet identifieras korrekt av ScummVM med den här metoden sÃ¥ du mÃ¥ste se till att plattformen ställts in till Commodore64. Vi rekommenderar att använda den lättare metoden frÃ¥n paragrafen ovan. + + +3.3) Notiser om Maniac Mansion för NES: +---- ---------------------------------- +Versionerna av spelet som stöds av ScummVM är engelska (E), franska (F), tyska (G) italienska (I), svenska (SW) och amerikanska (U). ScummVM kräver endast PRG-delen av ROM-filen för att köra spelet. + +För att fÃ¥ igÃ¥ng spelet mÃ¥ste du radera de första 16 byten frÃ¥n ROM-filen du vill använda. Du kan använda vilken hex-redigerare du vill sÃ¥ länge du har möjlighet att kopiera/klistra in. När du öppnat ROM-filen med hex-redigeraren, markera allt frÃ¥n den andra raden (17:e byten) till och med slutet av filen. Kopiera och klistra in i en ny hex-fil. Namnge den nya filen “Maniac Mansion (XX).prg†där XX stÃ¥r för vilken version av spelet du jobbar med (E, F, G, I, SW eller U). Den slutliga filstorleken borde vara exakt 262144 bytes. +Om du lägger till spelet manuellt, se till att plattformen är inställd för NES. + +De vanligaste misstagen som förhindrar att spelet fungerar: + + * DÃ¥lig fil + * ROM extraherades med 0.7.0-verktygen + * Försökte mata in hela ROM-filen istället för PRG-delen. + +Det är även möjligt att extrahera LFL-filerna frÃ¥n PRG-delen. För att göra detta kan du använda verktyget â€extract_mm_nes†frÃ¥n tools-paketet. + + +3.4) Notiser om Macintosh-spel: +---- -------------------------- +Alla SCUMM-baserade LucasArts spel (utom COMI) finns även i Macintosh-versioner. ScummVM kan använda de flesta (eller alla?) av dem, men i vissa fall krävs det lite extra fiffel. Till att börja med, om du inte använder en Macintosh kan det vara knepigt att använda spelets CD/diskett-data. Anledningen är att mac använder ett speciellt skivformat kallat HFS vilket övriga system i regel inte stöder. Dock finns det gratis verktyg som gör det möjligt att läsa dessa HFS-enheter, t.ex. â€HFVExplorer†för Windows och â€hfutils†för Linux och andra Unix-liknande operativsystem. + +De flesta av de nyare spelen för Macintosh gavs ut med endast en datafil (märk att i vissa fall gjordes den här filen osynlig, sÃ¥ det kan krävas speciella verktyg för att kopiera den). ScummVM kan använda sÃ¥dana datafiler direkt; hänvisa ScummVM till katalogen som innehÃ¥ller datafilen sÃ¥ borde det fungera (precis som med alla andra stödda spel). + +Vi har även ett verktyg som heter â€extract_scumm_mac†i tools-paketet för att extrahera datan frÃ¥n dessa filer, men det är varken nödvändigt eller rekommenderat. + +För ytterligare information om hur man kopierar spelfiler för Macintosh till hÃ¥rddisken, besök: + + http://wiki.scummvm.org/index.php/HOWTO-Mac_Games + + +3.5) Notiser om spel med flera CD-skivor: +---- ------------------------------------ +I regel hanterar ScummVM inte spel spridda över flera CD-skivor vidare bra. Anledningen är att ScummVM utgÃ¥r ifrÃ¥n att spelets fullständiga resurser är samlade i en enda katalog. Även dÃ¥ ScummVM ber användaren byta skiva vid tillfälle kan originalversionen av spelet fungerat genom att installera ett antal filer pÃ¥ hÃ¥rddisken. Om dessa filer inte kan hittas pÃ¥ samtliga CD-skivor fÃ¥r ScummVM problem. + +Som tur är har ScummVM inga problem med att köra spelen helt frÃ¥n hÃ¥rddisken sÃ¥ länge du skapar en filkatalog som innehÃ¥ller rätt kombination av filer. När en fil existerar pÃ¥ fler än en CD kan du i regel välja vilken av dem du vill. + + +3.6) Notiser om The Curse of Monkey Island: +---- -------------------------------------- +För det här spelet behöver du filerna comi.la0, comi.la1 och comi.la2. En fil med namnet Comi.la0 existerar pÃ¥ bÃ¥da CD-skivorna, men dÃ¥ filerna är identiska spelar det ingen roll vilken av dem du använder. + +Du behöver dessutom skapa en â€resource†katalog som innehÃ¥ller alla filer frÃ¥n BÃ…DA â€resourceâ€-katalogera pÃ¥ de tvÃ¥ CD-skivorna. Vissa av filerna existerar pÃ¥ bÃ¥da CD-skivorna, men även dessa är identiska. + + +3.7) Notiser om Broken Sword-spelen: +---- ------------------------------- +Instruktionerna för Broken Sword-spelen är för Sold-Out Software-versionerna där varje spel kom pÃ¥ tvÃ¥ CD-skivor eftersom dessa versioner var mest tillgängliga när ScummVM lade till stöd för dem. Förhoppningsvis fungerar dessa konfigurationer även med andra versioner. + + +3.7.1) Filmscener i Broken Sword-spelen: +------ --------------------------------- +Filmscenerna i Broken Sword-spelen har varit med om en hel del (se nästa avdelning om du är intresserad) men i regel behöver du bara kopiera .SMK-filerna frÃ¥n â€SMACKS†eller â€SMACKSHIâ€-katalogerna pÃ¥ CD-skivorna till samma katalog där de andra datafilerna ligger. (Broken Sword har även en â€SMACKSLO†katalog med samma filmscener, men dessa har lägre kvalitet.) Du kan även lägga dem i en underkatalog med namnet â€videoâ€, om du vill. + +Vissa nyutgÃ¥vor av spelen, tillika PlayStation-versionen, har inga Smacker videos. Revolution Software har varit goda nog att skapa nykodade filmscener som kan laddas hem frÃ¥n vÃ¥ran hemsida: + + http://www.scummvm.org/downloads.php + +Dessa filmscener är tillgängliga i DXA-format med FLAC-ljud. Kvaliteten är densamma som i originalversionerna av spelet tack vare ickedestruktiv komprimering. För att se dessa filmscener krävs en version av ScummVM som kompilerats med stöd för bÃ¥de FLAC och zlib. + +För de system som är för lÃ¥ngsamma för att hantera FLAC-ljud finns ljudet för dessa filmscener att ladda hem separat som OGG Vorbis-ljud. För att se dessa filmscener med OGG Vorbis-ljud krävs en version av ScummVM som kompilerats med stöd för bÃ¥de libVorbis och zlib. + +Vi erbjuder även ett tillägg för undertexter i Broken Sword. Packa upp tillägget och följ instruktionerna i readme.txt-filen. (Broken Sword II har redan undertexter; inga modifikationer krävs för dem). + + +3.7.2) Broken Sword-spelens filmscener – en Ã¥terblick: +------ ----------------------------------------------- +OriginalutgÃ¥vorna av Broken Sword-spelen använde sig av RAD Game Tools Smacker(tm)-format. DÃ¥ RAD inte ville lÃ¥ta oss använda källkoden för deras äldre versioner av det här formatet, och bad oss att inte dekonstruera formatet, var vi tvugna att hitta en alternativ lösning. + +I Broken Sword II var det möjligt att spela upp röstspÃ¥ret utan att spela videospÃ¥ret. Detta var en nödlösning fram till ScummVM 1.0.0 men var aldrig den enda lösningen för en stabil version. + +I ScummVM 0.6.0 använde vi MPEG vilket möjliggjorde en rimlig kompromiss mellan filstorlek och kvalitet. I ScummVM 0.10.0 ersattes formatet av DXA (frÃ¥n början tillagt för AdventureSofts â€The Feeble Filesâ€). Detta gjorde det möjligt att Ã¥terge filmscenerna i exakt samma kvalitet som originalen, med nackdelen att filstorleken var större. + +Slutligen i början av 2006 dekonstruerades Smacker-formatet av FFMpeg-teamet. Tack vare deras hÃ¥rda arbete stöder nu ScummVM frÃ¥n och med version 1.0.0 originalfilmscenerna. Stöd för MPEG har indragits. FrÃ¥n en teknisk synvinkel var detta en god sak dÃ¥ kodning av MPEG-filmer var en komplex process. Dessutom sÃ¥g de inte lika bra ut som Smacker- och DXA-versionerna. + + +3.7.3) Broken Sword: +------ ------------- +För det här spelet behöver du alla filer frÃ¥n clusters-katalogerna pÃ¥ bÃ¥da CD-skivorna. För Windows- och Macintosh-versionerna behöver du även speech.clu filerna frÃ¥n speech-katalogerna, men dÃ¥ de inte är identiska mÃ¥ste du döpa om dem till speec1.clu (för CD 1) och speech2.clu (för CD 2). PlayStation-versionen kräver speech.tab, speech.dat, speech.lis och speech.inf. + +Windows- och Macintosh-versionerna kräver även en underkatalog för musik med alla filerna frÃ¥n musik-katalogerna pÃ¥ bÃ¥da CD-skivorna. Vissa av de här filerna existerar pÃ¥ bÃ¥da skivorna, men i det här fallet är de antingen identiska eller, i ett fall, identiska till den grad att det inte gör nÃ¥gon skillnad. PlayStation-versionen kräver tunes.dat och tunes.tab. + + +3.7.4) Broken Sword II: +------ ---------------- +För det här spelet behöver du alla filer frÃ¥n clusters-katalogerna pÃ¥ bÃ¥da CD-skivorna. (Vissa av dem kanske inte är helt nödvändiga, men de vi är osäkra pÃ¥ är ganska smÃ¥.) Du mÃ¥ste döpa om speech.clu och music.clu-filerna till speech1.clu, speech2.clu, music1.clu och music2.clu sÃ¥ ScummVM kan se vilka av dem som kommer frÃ¥n CD 1 och vilka som kommer frÃ¥n CD 2. Övriga filer som existerar i bÃ¥da clusters-katalogerna är identiska. Använd vilka exemplar du vill. + +Du behöver även cd.inf och (om du vill) startup.inf filerna frÃ¥n sword2-katalogen pÃ¥ CD 1. + + +3.8) Notiser om Beneath a Steel Sky: +---- ------------------------------- +FrÃ¥n och med ScummVM 0.8.0 behöver du â€SKY.CPTâ€-filen för att spela Beneath a Steel Sky. + +Den här filen är tillgänglig frÃ¥n â€Downloadsâ€-avdelningen pÃ¥ ScummVM:s hemsida. Du kan lägga den antingen i katalogen som innehÃ¥ller de andra datafilerna (SKY.DNR, SKY.DSK), i din â€extraâ€-sökväg, eller i katalogen där programfilen för ScummVM befinner sig. + + +3.9) Notiser om Flight of the Amazon Queen: +---- -------------------------------------- +För att kunna använda en icke-freeware version av Flight of the Amazon Queen (frÃ¥n original-CD:n) mÃ¥ste du placera “queen.tbl†filen (tillgänglig frÃ¥n “Downloadsâ€-avdelningen pÃ¥ vÃ¥ran hemsida) antingen i katalogen som innehÃ¥ller “queen.1†datafilen, i din “extraâ€-sökväg eller i katalogen där programfilen för ScummVM befinner sig. + +Alternativt kan du använda verktyget “compress_queen†frÃ¥n tools-paketet för att “bygga om†din FOTAQ-datafil sÃ¥ den inkluderar tabellen för din version, och pÃ¥ sÃ¥ vis göra programmet oberoende av â€queen.tblâ€-filen. Det här verktyget lÃ¥ter dig även komprimera tal- och ljudeffekterna till MP3, OGG eller FLAC. + + +3.10) Notiser om Gobliiins: +----- --------------------- +CD-versionerna av Gobliiins-spelen innehÃ¥ller ett stort ljudspÃ¥r som du mÃ¥ste extrahera (se avdelningen för användning av komprimerade ljudfiler; 7.8) och kopiera till spelkatalogen om du vill ha musik när du spelar utan att ha CD:n inmatad. Taleffekterna ligger pÃ¥ samma ljudspÃ¥r och sÃ¥lunda ändras även deras volym när du justerar musikvolymen. + + +3.11) Notiser om Inherit the Earth: Quest for the Orb: +----- ------------------------------------------------ +För att spela nyutgÃ¥van frÃ¥n Wyrmkeep för Mac OS X mÃ¥ste du kopiera datafilerna frÃ¥n CD:n till din hÃ¥rddisk. Om du är PC-användare, hänvisa sedan till: + + http://wiki.scummvm.org/index.php/HOWTO-Mac_Games + +Länken handlar i huvudsak om SCUMM-spel men nämner även verktyget “HFVExplorer†som du behöver för att extrahera filerna. Märk att du mÃ¥ste lägga tal-datafilerna â€Inherit the Earth Voices†i samma katalog som speldatan som förvaras i: + + Inherit the Earth.app/Contents/Resources + +För den gamla Mac OS 9-utgÃ¥van behöver du kopiera filerna i MacBinary format dÃ¥ de borde innehÃ¥lla bÃ¥de spelets resource- och data fork. Kopiera alla â€ITE*â€-filer. + + +3.12) Notiser om Simon the Sorcerer 1 och 2: +----- -------------------------------------- +Om du har dubbel-versionen av Simon the Sorcerer 1 eller 2 pÃ¥ CD kan du finna Windows-versionen i huvudkatalogen pÃ¥ CD:n och DOS-versionen i DOS-katalogen pÃ¥ CD:n. + + +3.13) Notiser om The Feeble Files: +----- ---------------------------- +Om du har Windows-versionen av The Feeble Files finns det ett flertal saker att tänka pÃ¥. + +MÃ¥nga av de nödvändiga filerna är förvarade i en InstallShield-fil med namnet data1.cab, vilken ScummVM inte kan packa up. Du mÃ¥ste använda originalinstallationsprogrammet eller i5comp för att packa upp innehÃ¥llet ur den här filen. Extraktionsprogrammet i5comp kan du hitta med en enkel internetsökning. + +För att använda talfilerna med ScummVM mÃ¥ste de döpas om enligt följande: +Döp om voices.wav pÃ¥ CD1 till voices1.wav +Döp om voices.wav pÃ¥ CD2 till voices2.wav +Döp om voices.wav pÃ¥ CD3 till voices3.wav +Döp om voices.wav pÃ¥ CD4 till voices4.wav + + +3.14) Notiser om The Legend of Kyrandia: +----- ---------------------------------- +För att spela The Legend of Kyrandia i ScummVM behöver du “kyra.datâ€-filen som är tillgänglig frÃ¥n â€Downloadsâ€-avdelningen pÃ¥ ScummVM:s hemsida. + + +3.15) Notiser om Sierra AGI-spel med textinmatningshjälp: +----- --------------------------------------------------- +Textinmatningshjälpen är ett hjälpmedel i ScummVM för att spela AGI-spel (som är ökända för kommandoradsinmatning) pÃ¥ enheter med begränsat stöd för tangentbord. I dessa situationer (dÃ¥ det lätt kan bli lÃ¥ngtrÃ¥kigt att skriva med emulerade tangentbord) kan kommandon matas in snabbt och enkelt via textinmatningshjälpen. + +För att använda textinmatningshjälp i AGI-spel mÃ¥ste du kopiera pred.dic-filen till â€ScummVM extrasâ€-katalogen eller till katalogen för spelet du vill spela. Den här ordboken har skapats genom att söka igenom alla kända AGI-spel och innehÃ¥ller det maximala antalet vanliga ord. + +Om ScummVM känner igen ordboken visas textinmatningshjälpen antingen när du klickar pÃ¥ kommandoraden (när helst tangetbordsinmatning krävs, även i dialogrutor), eller i vissa konversioner genom att trycka pÃ¥ en angiven tangent. + +Textinmatningshjälpen fungerar i tre lägen som du kan växla mellan med (*)Pre/123/Abc-knappen. Det första inmatningsläget är förutsägelse-läget, och fungerar pÃ¥ samma sätt som snabbinmatning pÃ¥ telefoner. Alfabetet är indelat i 9 uppsättningar som pÃ¥ uppenbart vis fördelats mellan de nio nummerknapparna (0 är mellanslag). För att skriva ett ord trycker du en gÃ¥ng pÃ¥ numret för uppsättningen som innehÃ¥ller bokstaven för det ord du vill skriva, sedan tar du dig vidare till nästa bokstav. Till exempel: för att skriva ordet â€look†trycker du 5665. Allteftersom du skriver in ordets numeriska kod tillfrÃ¥gas ordboken efter ord som matchar vad du skrivit hittills. Ju fler knappar du trycker desto mer exakt blir det föreslagna ordet. Av den här anledningen kan det skrivna ordet ändras snabbt mellan tangenttryckningar. Dock finns det situationer där fler än ett ord delar samma numeriska representation. Till exempel har order â€quit†och â€suit†samma nummer – 7847. I sÃ¥dana fall lyser (#)nästa-knappen upp. Genom att trycka pÃ¥ den kan du växla mellan orden som delar samma kod och till slut acceptera det korrekta ordet genom att trycka (0)mellanslag eller OK-knappen. + +Det andra inmatningsläget (123) är den numeriska inmatningsmetoden: Varje knapp du trycker pÃ¥ matas in som sitt angivna nummer. + +Det tredje inmatningsläget (Abc) är Multi-tap Alpha inmatningsläget. Det här läget är menat för inmatning av fri text utan assistans frÃ¥n ordboken eller förutsägelseläget (Pre). Texten matas in en bokstav i taget. För varje bokstav trycker du först pÃ¥ nummerknappen för uppsättningen du vill Ã¥t, sedan använder du (#)nästa-knappen för att växla mellan bokstäverna. Repetera sedan proceduren med nästa bokstav. Till exempel: för att skriva ordet â€look†mÃ¥ste du trycka följande: 5##6##6##5 + +Dialogrutan kan användas med musen, men visa provisioner i ScummVM-konversioner har gjort det mer bekvämligt genom att kartlägga funktionerna till nummertangenterna. Dialogrutornas knappar kan även navigeras med hjälp av piltangenterna och enter-tangenten. + + +3.16) Notiser om Mickey’s Space Adventure: +----- ------------------------------------ +För att spela Mickey’s Space Adventure i ScummVM behöver du originalprogramfilen (mickey.exe) tillsammans med spelets datafiler. + +Användning av musen stöds för spelet i ScummVM även dÃ¥ det inte fanns stöd för mus i originalspelet. Menyer kan användas med musen och den gÃ¥r även att använda till att förflytta sig i spelet. När muspekaren hÃ¥lls nära kanten av skärmen färgas den röd om det är möjligt att gÃ¥ i den riktningen. Spelaren kan sedan klicka pÃ¥ spelets skärmkant för att byta plats pÃ¥ samma sätt som i andra äventyrsspel, vilket är lättare än att byta plats med hjälp av menyn. + + +3.17) Notiser om Winnie the Pooh: +----- --------------------------- +Det är möjligt att importera spardata frÃ¥n originalprogrammet i ScummVM. + +Användning av musen stöds för spelet i ScummVM även dÃ¥ det inte fanns stöd för mus i originalspelet. Menyer kan användas med musen och den gÃ¥r även att använda till att förflytta sig i spelet. När muspekaren hÃ¥lls nära kanten av skärmen färgas den röd om det är möjligt att gÃ¥ i den riktningen. Spelaren kan sedan klicka pÃ¥ spelets skärmkant för att byta plats pÃ¥ samma sätt som i andra äventyrsspel, vilket är lättare än att byta plats med hjälp av menyn. + + +3.18) Notiser om Troll’s Tale: +----- ------------------------ +Originalspelet gavs ut pÃ¥ en PC booter-diskett. Därför mÃ¥ste du extrahera innehÃ¥llet frÃ¥n disketten till en image-fil och döpa den till â€troll.img†för att kunna spela spelet i ScummVM. + + +3.19) Notiser om Dragon History: +----- -------------------------- +Det finns fyra olika sprÃ¥kversioner av spelet: tjeckiska, engelska, polska och tyska. Var och en av dem finns utgivna i separata arkiv. Den enda officiella versionen är den tjeckiska – de engelska, polska och tyska konversionerna har alltid varit under utveckling och släpptes aldrig officiellt. Emedan all text är översatt kan man i dessa versioner stöta pÃ¥ en del stavfel. + +Det finns en alternativ tjeckisk dubbning av spelet. Av utrymmesskäl kan du ladda hem denna separat och packa upp den till spelkatalogen. Du kan lyssna pÃ¥ den tjeckiska dubbningen med alla sprÃ¥kversioner medan du läser undertexterna. + +Alla spelfiler och spelguiden kan laddas hem frÃ¥n +http://www.ucw.cz/draci-historie/index-en.html + + +3.20) Kända problem: +----- -------------- +Den här versionen har följande kända problem. Du behöver inte rapportera dem, men om du kan erbjuda uppdateringar för att fixa problemen vore det välkommet. Om du upptäcker en bugg som inte finns i listan nedan eller i kompatibilitetslistan pÃ¥ hemsidan, var god hänvisa till avdelningen för hur man rapporterar buggar; 2.1. + + Spel med CD-ljud: + - När du spelar spel som använder CD-ljud (FM-TOWNS-spel, Loom CD, etc.) + kan Microsoft Windows 2000/XP-användare stöta pÃ¥ slumpmässiga krasher. + Anledningen är en lÃ¥nglivad Windows-bugg som gör att korrupta spelfiler + läses in frÃ¥n CD:n. Kopiera speldatan till din hÃ¥rddisk för att undvika + detta. + + FM-TOWNS-versioner av spel: + - Kanji-versioner kräver en FM-TOWNS Font ROM + - ScummVM krashar slumpmässigt när FM-TOWNS Font Rom används för + kanji-versionerna av de följande spelen: + The Secret of Monkey Island, Monkey Island 2: LeChuck's Revenge + och Indiana Jones and the Fate of Atlantis + + Loom: + - Att stänga av undertexterna via konfigurationsfilen är inte pÃ¥litligt dÃ¥ + Loom-koden automatiskt aktiverar dem igen. + - MIDI stöd i EGA-versionen kräver Roland-uppdateringen frÃ¥n LucasArts + - PC-Engine kanji-versionen kräver en ROM för systemkortet + + The Secret of Monkey Island: + - MIDI stöd i EGA-versionen kräver Roland-uppdateringen frÃ¥n LucasArts + + Beneath a Steel Sky: + - Amiga-versionerna stöds ej + - Diskett-demon stöds ej + - Inte en bugg: CD-versionen saknar tal för viss dialog. Det här är + normalt. + + Elvira - Mistress of the Dark + - Ingen musik i Atari ST-versionen + + Elvira II - The Jaws of Cerberus + - Ingen musik i Atari ST-versionen + - Inga ljudeffekter i PC-versionen + - Problem med färgpaletten i Atari ST-versionen + + Inherit the Earth: Quest for the Orb + - Amigaversionerna stöds ej + + Simon the Sorcerer 1: + - Undertexter är inte tillgängliga i de engelska och tyska + CD-versionerna eftersom en majoritet av undertexterna fattas. + + Simon the Sorcerer 2: + - Kombinerade tal och undertexter kan ofta orsaka att talljudet + klipps av för tidigt. Det här är en begränsning frÃ¥n originalspelet. + - Endast standardsprÃ¥ket (engelska) för datafilerna stöds i Amiga- + och Macintosh-versionerna. + + Simon the Sorcerer's Puzzle Pack: + - Inget stöd för att visa, mata in, ladda eller spara topplistor. + - Inget stöd för att visa namnen pÃ¥ föremÃ¥l när man pekar pÃ¥ dem + i Swampy Adventures. + + The Feeble Files: + - Undertexterna är ofta ofullständiga – de var alltid avstängda + i originalspelet. + + The Legend of Kyrandia: + - Varken musik eller ljudeffekter i Macintosh diskett-versioner. + - Macintosh-CD använder DOS-musik och ljudeffekter. + - PC-9821-versionen saknar stöd för ljudeffekter. + + Humongous Entertainment-spel: + - Endast originalgränssnittet för att ladda och spara kan användas. + - Inget stöd för multiplayer eller utskrift av bilder. + + +4.0) Stödda plattformar: +---- ------------------- +ScummVM har konverterats för mÃ¥nga olika plattformar och operativsystem. Länkar till dessa konversioner kan du hitta antingen pÃ¥ ScummVM:s hemsida eller via en Google-sökning. Tack till vÃ¥ra konversionsprogrammerare för deras arbete. Om du har en konversion av ScummVM och vill lägga till den i vÃ¥r master git, kontakta oss gärna! + +Stödda plattformar inkluderar bl.a. följande: + + UNIX (Linux, Solaris, IRIX, *BSD, ...) + Windows + Windows CE och Windows Mobile (inklusive Smartphones och PocketPCs) + Mac OS X + AmigaOS + Android + BeOS + Dreamcast + GP2x + iPhone (även iPod Touch och iPad) + Maemo (Nokia Internet tablet N810) + Nintendo 64 + Nintendo DS + Nintendo GameCube + Nintendo Wii + OS/2 + PlayStation 2 + PlayStation Portable + Symbian + WebOS + +Dreamcast-konversionen stöder inte The Curse of Monkey Island eller The Dig. Nintendo DS-konversionen stöder inte Full Throttle, The Dig eller The Curse of Monkey Island. +För fler plattform-specifika begränsningar, se vÃ¥r Wiki: + http://wiki.scummvm.org/index.php/Platforms + +För Macintosh-konversionen emuleras höger musknapp med Cmd-klickning (klicka med vänster musknapp medan du hÃ¥ller ned Command/Apple/Propeller-knappen). + +Det finns inofficiella konversioner för ett antal plattformar inklusive PlayStation 3, Xbox och Xbox 360. Märk att dessa inte är skapade av oss, sÃ¥ vi varken föresprÃ¥kar eller stöder användning av dem. Använd pÃ¥ egen risk! + + +5.0) Att använda ScummVM: +---- -------------------- +Märk att ScummVM som standard sparar data i samma katalog som programmet används ifrÃ¥n, sÃ¥ undvik att köra programmet frÃ¥n fler än en katalog. För ytterligare information, inklusive instruktioner för hur du inrättar en egen katalog för spardata för att undvika det här problemet, se avdelning 6.0. + +ScummVM kan öppnas direkt genom att öppna programfilen. I sÃ¥dana fall aktiveras den inbyggda launchern. FrÃ¥n launchern kan du lägga till spel (klicka pÃ¥ â€Lägg till spelâ€) eller spela spel som redan konfigurerats. Spel kan även läggas till i större antal. Genom att hÃ¥lla ned skift-tangenten och trycka pÃ¥ â€Lägg till spel†(lägg märke till att knappen byter namn till â€Masstilläggâ€) kan du specificera en katalog att starta i, varvid ScummVM sedan försöker hitta spel i alla underkataloger. + +ScummVM kan även öppna spel via kommandoraden – se nästa avdelning. + + +5.1) Att använda kommandoraden: +---- -------------------------- + +Ordning: scummvm [INSTÄLLNINGAR]... [SPEL] + + [SPEL] Kortnamnet för spelet du vill ladda, t.ex. 'monkey' + för Monkey Island. Det kan vara det inbyggda kortnamnet + eller ett kortnamn bestämt av användaren. + + -v, --version Visar information om ScummVM-versionen + -h, --help Visar kortfattad hjälptext + -z, --list-games Visar lista med stödda spel + -t, --list-targets Visar lista med konfigurerade targets + --list-saves=TARGET Visar en lista med sparade data för det specificerade + spelet (TARGET) + --console Öppnar konsolfönstret (standard: pÃ¥) (endast Windows) + -c, --config=CONFIG Använd alternativ konfigurationsfil (CONFIG) + -p, --path=PATH Sökväg dit spelet är installerat (PATH) + -x, --save-slot[=NUM] Spardata-nummer att ladda (standard: autosparning) + -f, --fullscreen Fullskärmsläge + -F, --no-fullscreen Fönsterläge + -g, --gfx-mode=MODE Välj grafikskalning (se även avdelning 5.3) + --gui-theme=THEME Välj GUI-tema (standard, modern, klassisk) + --themepath=PATH Sökväg dit GUI-teman lagras + --list-themes Visa full lista med alla användbara GUI-teman + -e, --music-driver=MODE Välj musik-driver (se även avdelning 7.0) + -q, --language=LANG Välj spelets sprÃ¥k (se även avdelning 5.2) + -m, --music-volume=NUM Ställ in musikvolym, 0-255 (standard: 192) + -s, --sfx-volume=NUM Ställ in ljudeffektsvolym, 0-255 (standard: 192) + -r, --speech-volume=NUM Ställ in röstvolym, 0-255 (standard: 192) + --midi-gain=NUM Ställ in gain för MIDI-uppspelning, + 0-1000 (standard: 100) + (stöds endast av vissa MIDI-drivers) + -n, --subtitles Aktivera undertexter (för spel med röster) + -b, --boot-param=NUM Skicka nummer till boot script (boot param) + -d, --debuglevel=NUM Ställ in debug-ordmängd + --debugflags=FLAGS Aktivera motorspecifika debugflaggor + (separera med kommatecken) + -u, --dump-scripts Aktivera kod-dumpning om en katalog med namnet â€dumps†+ existerar i den aktiva katalogen + + --cdrom=NUM CD-enheten spelar automatiskt CD-ljud frÃ¥n (NUM) + (standard: 0 = första enheten) + --joystick[=NUM] Aktivera joystick (standard: 0 = första joystick) + --platform=WORD Bestäm plattform för spel (tillÃ¥tna värden: 2gs, 3do, + acorn, amiga, atari, c64, fmtowns, mac, nes, pc, + pce, segacd, windows) + --savepath=PATH Sökväg dit spardata lagras + --extrapath=PATH â€Extraâ€-sökväg för ytterligare speldata + --soundfont=FILE Välj SoundFont för MIDI-uppspelning (Stöds endast + av vissa MIDI-drivers) + --multi-midi Aktivera kombination av AdLib och Native MIDI + --native-mt32 True Roland MT-32 (deaktivera GM-emulation) + --enable-gs Aktivera Roland GS-läge för MIDI-uppspelning + --output-rate=RATE Välj ljudfrekvens i Hz (t.ex. 22050) + --opl-driver=DRIVER Välj AdLib (OPL)-emulator (db, mame) + --aspect-ratio Aktivera korrektion av bildförhÃ¥llande + --render-mode=MODE Aktivera ytterligare renderingslägen (cga, ega, + hercGreen, hercAmber, amiga) + + --alt-intro Använd alternativt intro för CD-versionerna av Beneath a + Steel Sky och Flight of the Amazon Queen + --copy-protection Aktiverar kopieringsskyddet för vissa spel + där ScummVM automatiskt överskrider det. + --talkspeed=NUM Ställ in textfördröjning i SCUMM-spel, eller + texthastighet i andra spel. (standard: 60) + --demo-mode Öppna demon i Maniac Mansion (klassisk version) + --tempo=NUM Ställ in musiktempo (i procent, 50-200) för SCUMM games + (standard: 100) + + +Betydelsen för de flesta lÃ¥nga funktionerna (det vill säga de funktioner som börjar med dubbla bindestreck) kan inverteras genom att sätta “no-“ framför dem. Till exmpel, --no-aspect-ratio stänger av korrektion av bildförhÃ¥llande. Detta är användbart om du vill överskrida en inställning i konfigurationsfilen. + +Det korta spelnamnet (“game targetâ€) vid slutet av kommandoraden bestämmer vilket spel som startas. Det matchar antingen en användardefinerad target (frÃ¥n konfigurationsfilen) eller ett inbyggd gameid. En kort lista med de senare finns i avdelning 3.0. + +Exempel: + * Win32: + För att spela Monkey Island i fullskärm frÃ¥n hÃ¥rddisk: + C:\Games\LucasArts\scummvm.exe -f -pC:\Games\LucasArts\monkey\ monkey + För att spela Full Throttle frÃ¥n CD i fullskärm med undertexter: + C:\Games\LucasArts\scummvm.exe -f -n -pD:\resource\ ft + + * Unix: + För att spela Monkey Island i fullskärm frÃ¥n hÃ¥rddisk: + /path/to/scummvm -f -p/games/LucasArts/monkey/ monkey + För att spela Full Throttle frÃ¥n CD i fullskärm med undertexter: + /path/to/scummvm -f -n -p/cdrom/resource/ ft + + +5.2) SprÃ¥kinställningar: +------------------------ +ScummVM stöder vissa sprÃ¥kinställningar för Maniac Mansion, Zak McKracken, The Dig, The Curse of Monkey Island, Beneath a Steel Sky och Broken Sword. + +Märk att med undantag för Beneath a Steel Sky, Broken Sword, flersprÃ¥ksversioner av Goblins-spelen och Nippon Safes Inc. byter INTE den här funktionen sprÃ¥k pÃ¥ spelet (vilket ofta är bestämt i källkoden). Inställningarna lÃ¥ter dig endast byta till ett lämligare typsnitt (t.ex. typsnitt med diakritiska tecken för en tysk version av spelet). + +Undantagen här är The Dig och The Curse of Monkey Island – icke-engelsksprÃ¥kiga versioner kan ställas in till “engelskaâ€. Detta pÃ¥verkar dock endast undertexterna; spelets röster förblir de samma. + +Maniac Mansion och Zak McKracken + en - Engelska (standard) + de - Tyska + fr - Franska + it - Italienska + es - Spanska + +The Dig + jp - Japanska + zh - Kinesiska + kr - Koreanska + +The Curse of Monkey Island + en - Engelska (standard) + de - Tyska + fr - Franska + it - Italienska + pt - Portugisiska + es - Spanska + jp - Japanska + zh - Kinesiska + kr - Koreanska + +Beneath a Steel Sky + gb - Engelska (Storbritannien) (standard) + en - Engelska (USA) + de - Tyska + fr - Franska + it - Italienska + pt - Portugisiska + es - Spanska + se - Svenska + +Broken Sword + en - Engelska (standard) + de - Tyska + fr - Franska + it - Italienska + es - Spanska + pt - Portugisiska + cz - Tjeckiska + + +5.3.) Grafikfilter: +----- ------------- +ScummVM erbjuder ett antal anti-aliasfilter för att förbättra bildkvaliteten. Dessa filter används i mÃ¥nga andra emulatorer, t.ex. MAME. De kan ta ett spels originalgrafik och förstora den enligt förbestämda faktorer (vanligtvis 2x eller 3x). Till exempel: om spelet frÃ¥n början endast kunde spelas i 320x200 upplösning (typiskt för de flesta SCUMM-spelen) ger dig ett filter med skalningsfaktor 2x istället 640x400 upplösning. PÃ¥ samma sett ger dig ett 3x filter 960x600. + +Tillgängliga filter: + 1x - Inget filter, ingen skalning. Snabbast. + 2x - Inget filter, faktor 2x (standard för spel utan 640x480). + 3x - Inget filter, faktor 3x. + 2xsai - 2xSAI filter, faktor 2x. + super2xsai - Förbättrat 2xSAI filter, faktor 2x. + supereagle – Mindre suddigt än 2xSAI, men lÃ¥ngsammare. Faktor 2x. + advmame2x - Använder inte suddighet som 2xSAI, snabbt. Faktor 2x. + advmame3x - Använder inte suddighet som 2xSAI, snabbt. Faktor 3x. + hq2x - Fint filter av hög kvalitet, men lÃ¥ngsamt. Faktor 2x. + hq3x - Fint filter av hög kvalitet, men lÃ¥ngsamt. Faktor 3x. + tv2x - Interlace-filter, försöker emulera TV-skärmen. Faktor 2x. + dotmatrix - Dot matrix-effekt. Faktor 2x. + +För att använda ett grafiskfilter, välj det i Launchern eller skicka dess namn via “-g†funktionen till scummvm, till exempel: + + scummvm -gadvmame2x monkey2 + +Notis #1: Vissa back-ends stöder inte alla (eller ens nÃ¥gra) av filterna ovan; vissa kan stöda övriga filter. Filterna ovan är de som stöds av standard SDL-back-end. + +Notis #2: Filter kan bli väldigt lÃ¥ngsamma när ScummVM kompileras i en debug-konfiguration utan optimering och hastigheten pÃ¥verkas alltid när man använder en form av anti-alias/linjär filtrering. + +Notis #3: FM-TOWNS-versionen av Zak McKracken använder en upplösning pÃ¥ 320x240. Konsekvent sker skalning för det här spelet till 640x480 eller 960x720. PÃ¥ samma sätt skalas spel som frÃ¥n början använder 640x480 (t.ex. Curse of Monkey Island eller Broken Sword) upp till 1280x960 och 1920x1440. + + +5.4) Den globala menyn: +---- ------------------ +Den globala menyn är en generisk meny som kan användas i alla spelmotorer genom att trycka Ctrl-F5. I den här menyn finns följande knappar: Fortsätt, Inställningar, Om, Ã…tervänd till launcher, och Avsluta. Väljer du â€Inställningar†öppnas en dialogruta där grundläggande ljudinställningar, t.ex. volymnivÃ¥n, kan justeras. Väljer du â€Ã…tervänd till launcher†stängs spelfönstret och du skickas tillbaka till ScummVM-launchern där du kan välja andra spel att spela. + +Notis: Att Ã¥tervända till launchern stöds inte av alla spelmotorer och knappen kommer deaktiveras i den globala menyn för spel där funktionen inte stöds. + +Motorer som för närvarande stöder Ã¥tervändo till launchern: + + AGI + AGOS + CINE + DRACI + GOB + GROOVIE + KYRA + LURE + PARALLACTION + QUEEN + SAGA + SCUMM + SKY + SWORD1 + SWORD2 + TOUCHE + TUCKER + + +5.5) Kortkommandon: +---- -------------- +ScummVM stöder ett antal kortkommandon medan du spelar. De är olika för SCUMM-spel och andra spel. + + Gemensamma: + Ctrl-F5 - Öppnar menyn + Cmd-q - Avsluta (Mac OS X) + Ctrl-q - Avsluta (andra system inklusive Linux) + Ctrl-z ELLER Alt-x - Avsluta (andra plattformar) + Ctrl-u - Stäng av allt ljud + Ctrl-m - Aktivera musrestriktion + Ctrl-Alt 1-8 - Växla grafikfilter + Ctrl-Alt + och - - Höj/sänk skalningsfaktor + Ctrl-Alt a - Aktivera/deaktivera korrigering av bild- + förhÃ¥llanden. De flesta spelen använder en + upplösning pÃ¥ 320x200 pixlar, vilket kan + se förvrängt ut pÃ¥ moderna skärmar. + Korrigering av bildförhÃ¥llanden sträcker + bilden proportionellt till 320x240. + + Alt-Enter - Växlar mellan fullskärm och fönster + Alt-s - Skärmdump (endast med SDL-back-end) + + SCUMM: + Ctrl 0-9 och Alt 0-9 - Ladda och spara speldata + Ctrl-d - Öppnar debug-fönstret + Ctrl-f - Aktivera snabbläge + Ctrl-g - Aktivera EXTRA snabbt läge + Ctrl-t - Växla mellan “Endast talâ€, + “Tal och undertexter†och â€Endast undertexter†+ Tilde (~) - Visa/dölj debug-konsolen + [ och ] - Musikvolym höj/sänk + - och + - Texthastighet lÃ¥ngsammare/snabbare + F5 - Visar en ladda/spara-ruta + Alt-F5 - Visar spelets originalruta för att ladda/spara, + förutsatt att det finns en. Du kan ladda och spara + pÃ¥ det här viset, men det rekommenderas ej dÃ¥ det + kan orsaka krascher. + i - Visar IQ-poäng (Indiana Jones and the Last + Crusade och Indiana Jones and the Fate of + Atlantis) + Space - Paus + Punkt (.) - Hoppar över en textrad i vissa spel + Enter - Simulerar vänster musklick + Tab - Simulerar höger musklick + + Beneath a Steel Sky: + Ctrl-d - Öppnar debug-fönstret + Ctrl-f - Aktivera snabbläge + Ctrl-g - Aktivera EXTRA snabbt läge + F5 - Visar en ladda/spara-ruta + Escape - Hoppar över spelets intro + Punkt (.) - Hoppar över en textrad + + Broken Sword: + F5 eller Escape - Visar en ladda/spara-ruta + + Broken Sword II: + Ctrl-d - Öppnar debug-fönstret + Ctrl-f - Aktivera snabbläge + p - Paus + + Dragon History: + F5 - Visar globala menyn + vänsterklick - GÃ¥, utforska + högerklick - Use, talk + rör mus uppÃ¥t, i - Inventarie + rör mus nedÃ¥t, m - Karta + Escape - Hoppa över intro, lämna karta/inventarie + musklick - Hoppar över pÃ¥gÃ¥ende filmscen + q - Snabb gÃ¥ng pÃ¥/av + + Flight of the Amazon Queen: + Ctrl-d - Öppnar debug-fönstret + Ctrl-f - Aktivera snabbläge + F1 - Använd dagbok (spara/ladda) + F11 - Snabbspara + F12 - Snabbladda + Escape - Hoppa över filmscen + Mellanslag - Hoppa över textrad + + Future Wars + F1 - Undersök + F2 - Ta + F3 - Inventarie + F4 - Använd + F5 - Aktivera + F6 - Tala + F9 - "Aktivera"-meny + F10 - "Använd"-meny + Escape - Öppna kommandomeny + + Nippon Safes + Ctrl-d - Öppnar debug-fönstret + l - Ladda data + s - Spara data + + Simon the Sorcerer 1 och 2: + Ctrl 0-9 och Alt 0-9 - Ladda och spara data + Ctrl-d - Öppnar debug-fönstret + Ctrl-f - Aktivera snabbläge + F1 - F3 - Texthastighet snabbare - lÃ¥ngsammare + F10 - Visar alla karaktärer och föremÃ¥l du kan + interagera med + Escape - Hoppa över filmscen + - och + - Musikvolym sänk/höj + m - Musik av/pÃ¥ + s - Ljudeffekter av/pÃ¥ + b - Bakgrundsljud av/pÃ¥ + [endast Simon the Sorcerer 2] + Pause - Paus + t - Växla mellan endast tal och kombinerade + tal och undertexter + [Simon the Sorcerer 1 CD (förutom + engelska och tyska) och Simon the + Sorcerer 2 CD (alla sprÃ¥k)] + v - Växla mellan endast undertexter och kombinerade + tal och undertexter + [endast Simon the Sorcerer 2 CD] + + Simon the Sorcerer's Puzzle Pack + Ctrl-d - Öppnar debug-fönstret + Ctrl-f - Aktivera snabbläge + F12 - Snabbläge av/pÃ¥ i Swampy Adventures + - och + - Musikvolym sänk/höj + m - Musik av/pÃ¥ + s - Ljudeffekter av/pÃ¥ + Pause - Paus + + The Feeble Files + Ctrl-d - Öppnar debug-fönstret + Ctrl-f - Aktivera snabbläge + F7 - Byt karaktär + F9 - Hitbox-namn av/pÃ¥ + s - Ljudeffekter av/pÃ¥ + Pause - Paus + t - Växla mellan endast tal och kombinerade + tal och undertexter + v - Växla mellan endast undertexter och kombinerade + tal och undertexter + + The Legend of Kyrandia: + Ctrl 0-9 och Alt 0-9 - Ladda och spara speldata + Ctrl-d - Öppnar debug-fönstret + + TeenAgent + F5 - Visar den globala menyn + + Touche: The Adventures of the Fifth Musketeer: + Ctrl-f - Aktivera snabbläge + F5 - Visa inställningar + F9 - Snabbt gÃ¥ngläge pÃ¥ + F10 - Snabbt gÃ¥ngläge av + Escape - Avsluta + Space - Hoppa över textrad + t - Växla mellan “Endast talâ€, + “Tal och undertexter†och â€Endast undertexter†+ +Märk att trycka Ctrl-f och Ctrl-g inte rekommenderas: spel kan krasha när de spelas snabbare än normalt, dÃ¥ koden kan desynkroniseras. + +Notis för WinCE-användare: PÃ¥ grund av de begränsade tangentborden pÃ¥ de flesta enheter stöds ett litet antal av de här tangenterna via tangentinställning och/eller kontrollpanelen. Var god se READ-WinCE.txt filen. + + +6.0) Spardata: +---- --------- +Spardata lagras som standard i den aktiva katalogen pÃ¥ vissa plattformar och i förbestämda kataloger pÃ¥ andra plattformar. Du kan ställa in katalogen i konfigurationsfilen genom att ändra savepath-parametern. Se exempel för konfigurationsfilen senare i detta dokument. + +Plattformar som för närvarande har annorlunda standardkataloger: + Mac OS X: $HOME/Documents/ScummVM Savegames/ + Övriga unix-system: $HOME/.scummvm/ + + +6.1) Autosparning: +---- ------------- +I vissa spel (nämligen “Beneath a Steel Skyâ€, “Flight of the Amazon Queenâ€, alla AGI-spel och alla SCUMM-spel) autosparar som standard ScummVM var femte minut (detta kan justeras via “autosave_period†inställningen i konfigurationsfilen). För AGI- och SCUMM-motorerna sparas data i position 0. För SCUMM-motorn kan den här positionen laddas igen via Ctrl-0 eller F5-menyn. + + +6.2) Att konvertera speldata: +---- ------------------------ +Att använda spardata frÃ¥n originalversioner av spel stöds inte av alla spelmotorer. Endast följande spel kan använda spardata frÃ¥n sina originalversioner. + + Elvira 1 + - Lägg till 8 byte (namn för spardata) i början av spardata-filen + - Döp om spardatan till â€elvira1.xxx†+ + Elvira 2 + - Lägg till 8 byte (namn för spardata) i början av spardata-filen + - Döp om spardatan till â€elvira2-pc.xxx†(DOS-versionen) eller + â€elvira2.xxx†(övriga versioner) + + Waxworks + - Lägg till 8 byte (namn för spardata) i början av spardata-filen + - Döp om spardatan till â€waxworks-pc.xxx†(DOS-versionen) eller + â€waxworks.xxx†(övriga versioner) + + Simon the Sorcerer 1 + - Döp om spardatan till â€simon1.xxx†+ + Simon the Sorcerer 2 + - Döp om spardatan till â€simon2.xxx†+ + The Feeble Files + - Döp om spardatan till â€feeble.xxx†+ +Där “xxx†stÃ¥r för positionsnumret (t.ex. 001) i ScummVM. + + +6.3) Visa/ladda spardata frÃ¥n kommandoraden: +---- --------------------------------------- + +--list-saves: + + Den här funktionen kan användas för att visa en lista med befintliga speldata + frÃ¥n det specificerade spelet och dess respektive spar-positioner. + + Användning: --list-saves=[TARGET], där [TARGET] är spelets kortnamn. + + Motorer som för tillfället stöder --list-saves: + + AGI + AGOS + CINE + DRACI + GROOVIE + KYRA + LURE + PARALLACTION + QUEEN + SAGA + SCUMM + SKY + SWORD1 + SWORD2 + TINSEL + TOUCHE + TUCKER + +--save-slot/-x: + + Den här funktionen kan användas för att ladda spardata direkt frÃ¥n + kommandoraden. + + Användning: --save-slot[SLOT] eller -x[SLOT], där [SLOT] är spardatans + positionsnummer. + + Motorer som för tillfället stöder --save-slot/-x: + + AGI + CINE + DRACI + GROOVIE + KYRA + LURE + PARALLACTION + QUEEN + SAGA + SCUMM + SKY + SWORD1 + SWORD2 + TINSEL + TOUCHE + + +7.0) Musik och ljud: +---- --------------- +För de flesta operativsystemen och spelen använder ScummVM som standard MT-32 eller AdLib-emulation för musikuppspelning. MIDI kan vara otillgängligt pÃ¥ vissa operativsystem eller i behov av manuell inställning. Om du vill använda MIDI har du flera val för uppspelning beroende pÃ¥ ditt operativsystem och dina inställningar. + + null - Ingen musikuppspelning. + + adlib - Intern AdLib-emulation + fluidsynth - FluidSynth MIDI-emulation + mt32 - Intern MT-32-emulation + pcjr - Intern PCjr-emulation (fungerar endast i SCUMM-spel) + pcspk - Intern PC Speaker-emulation + towns - Intern FM-TOWNS YM2612 emulation + (fungerar endast i SCUMM FM-TOWNS-spel) + + alsa - Uppspelning med ALSA sequencer-enhet. Se nedan. + core - CoreAudio ljud, för Mac OS X användare. + coremidi - CoreMIDI ljud, för Mac OS X användare. Använd endast om du har + en MIDI-synthesizer i hÃ¥rdvaruform. + seq - Använd /dev/sequencer för MIDI, *nix användare. Se nedan. + timidity - Anslut till TiMidity++ MIDI-servern. Se nedan. + windows - Windows MIDI. Använd inbyggd sequencer, för Windows användare + +För att använda en musik-driver, välj den i launchern eller skicka dess namn via â€-e†funktionen till scummvm, till exempel: + + scummvm -eadlib monkey2 + + +7.1) Spela ljud med AdLib emulation: +---- ------------------------------- +Som standard emuleras ett AdLib-kort och ScummVM spelar upp musiken efter samplade ljudvÃ¥gor. Det här är standardläget för mÃ¥nga spel och erbjuder bäst kompatibilitet mellan maskin och spel. + + +7.2) Ljud med FluidSynth MIDI-emulation: +---- ----------------------------------- +Om ScummVM byggts med stöd för libfluidsynth kommer programmet kunna spela MIDI-musik via FluidSynth-drivern. Dock mÃ¥ste du specificera vilket SoundFont som ska användas. + +DÃ¥ standardvolymen frÃ¥n FluidSynth kan vara ganska lÃ¥g ställer ScummVM in gain för att fÃ¥ en bättre signal som standard. Denna kan justeras ytterligare via –midi-gain funktinonen i kommandoraden, eller inställningen â€midi_gain†i konfigurationsfilen. + +Du kan justera med ett värde frÃ¥n 0 till 1000, där standardvärdet är 100. (Detta matchar FluidSynths gain-inställningar frÃ¥n 0.0 till 10.0, troligtvis räknade i decibel.) + +NOTERA: Processorkraven för FluidSynth kan vara höga – en snabb processor rekommenderas. + + +7.3) Ljud med MT-32-emulation: +---- ------------------------- +Somliga spel som innehÃ¥ller MIDI-musikdata har även förbättrade ljudspÃ¥r designade för MT-32 ljudmodulen. ScummVM kan nu emulera den här enheten, men du mÃ¥ste dock använda MT-32 original-ROM:s för att det ska fungera: + +MT32_PCM.ROM - IC21 (512KB) +MT32_CONTROL.ROM - IC26 (32KB) och IC27 (32KB), sammanflätade byte + +Placera dessa ROM-filer i spelkatalogen, i din â€Extraâ€-sökväg, eller i katalogen där ScummVM-programfilen befinner sig. + +Du behöver inte specificera –-native-mt32 med den här drivern, dÃ¥ den aktiveras automatiskt. + +NOTERA: Processorkraven för emulatorn är mycket höga – en snabb processor rekommenderas. + + +7.4) Ljud med MIDI-emulation: +---- ------------------------ +Vissa spel (t.ex. Sam & Max) innehÃ¥ller endast musikdata i MIDI-form. En gÃ¥ng i tiden förhindrade detta musiken frÃ¥n att fungera i dessa spel pÃ¥ plattformar som inte stödde MIDI samt ljudkort som inte hade MIDI-drivers (t.ex. spelar mÃ¥nga ljudkort inte MIDI under Linux). ScummVM kan nu emulera MIDI-läget med hjälp av samplade ljudvÃ¥gor och AdLib, FluidSynth MIDI-emulation eller MT-32-emulation genom att använda –eadlib, -efluidsynth eller –emt32 funktionerna. Om du har möjlighet att använda Native MIDI rekommenderar vi ett av MIDI-lägena för bästa ljudkvalitet. + + +7.5) Ljud med Native MIDI: +---- --------------------- +Använd den lämpliga –e funktionen i kommandoraden frÃ¥n listan ovan för att välja din föredragna MIDI-enhet. Till exempel, om du vill använda Windows MIDI-drivern, använd –ewindows funktionen. + + +7.5.1) MIDI-inställningar för Native MIDI-uppspelning: +------ ----------------------------------------------- +ScummVM stöder ett antal MIDI-lägen, beroende pÃ¥ din MIDI-enhets egenskaper. + +Om –-native-mt32 specificerats kommer ScummVM behandla din enhet som en verklig MT-32. DÃ¥ instrumentkartan och systemkommandon hos MT-32:an är annorlunda frÃ¥n andra generiska MIDI-enheter borde du endast använda den här funktionen om du verkligen använder en riktig Roland MT-32, LAPC-I, CM-64, CM-32L, CM-500 eller GS-enhet med en MT-32 karta. + +Om –-enable-gs specificerats kommer ScummVM ställa in din GS-kompatibla enhet med inställningar som härmar MT-32:ans reverb, (brist pÃ¥) chorus, pitch bend-känslighet, etc. Om det specificerats tillsammans med –-native-mt32 kommer ScummVM välja den MT-32-kompatibla kartan och trumsetet pÃ¥ din GS-enhet. Den här inställningen fungerar bättre än standard GM- eller GS-emulation i spel som saknar speciella instrumentkartor (Loom och Monkey1). Du borde endast specificera bÃ¥da funktionerna om du använder en GS-enhet som har en MT-32 karta, till exempel en SC-55, SC-88, SC-88 Pro, SC-8820, SC-8850, etc. Märk att –-enable-gs är automatiskt deaktiverad i bÃ¥de DOTT och Samnmax, dÃ¥ de använder General MIDI. + +Om ingendera av de ovanstÃ¥ende inställningarna aktiverats kommer ScummVM ställa in din enhet i General MIDI-läge och använda GM-emulation i spel med MT-32 musik. + +Vissa spel innehÃ¥ller ljudeffekter som är exklusiva för AdLib-musik. För dessa spel kan du specificera --multi-midi för att kombinera MIDI-musik med AdLib-ljudeffekter. + + +7.6) Ljud med Sequencer MIDI: [ENDAST UNIX] +---- ------------------------ +Om ditt ljudkort stöder en sequencer kan du ställa in environment-variabeln “SCUMMVM_MIDI†till din sequencer-enhet – till exempel till /dev/sequencer. + +Om du inte kan höra ljudet med den här konfigurationen kan du behöva ställa in environment-variabeln â€SCUMMVM_MIDIPORT†till 1 eller 2. PÃ¥ det här viset väljer du vilken port som används pÃ¥ den valda sequencern. Starta sedan scummvm med –eseq parametern. Det här borde fungera pÃ¥ flera ljudkort och kan erbjuda bättre prestanda och kvalitet än AdLib-emulation. För de system som inte stöder sequencer MIDI kan du alltid använda AdLib-emulation istället. + + +7.6.1) Ljud med ALSA sequencer: [ENDAST UNIX] +------ ------------------------ +Om du installerat ALSA-drivern med stöd för sequencer kan du ställa in environment-variabeln “SCUMMVM_PORT†eller konfigurationsfilsvariabeln “also_port†för att specificera sequencer-porten. Om ingendera är inställd är standardprocessen att försöka bÃ¥de â€65:0†och â€17:0â€. + +Här är en kort guide för hur du använder ALSA sequencern med ditt ljudkort. För att fÃ¥ en lista pÃ¥ alla sequencer-portar du har, försök kommandot â€aconnect –o -lâ€. Det borde ge dig en output i stil med följande: + +client 14: 'Midi Through' [type=kernel] + 0 'Midi Through Port-0' +client 16: 'SBLive! Value [CT4832]' [type=kernel] + 0 'EMU10K1 MPU-401 (UART)' +client 17: 'Emu10k1 WaveTable' [type=kernel] + 0 'Emu10k1 Port 0 ' + 1 'Emu10k1 Port 1 ' + 2 'Emu10k1 Port 2 ' + 3 'Emu10k1 Port 3 ' +client 128: 'TiMidity' [type=user] + 0 'TiMidity port 0 ' + 1 'TiMidity port 1 ' + 2 'TiMidity port 2 ' + 3 'TiMidity port 3 ' + +Viktigst här är att det finns fyra WaveTable MIDI-outputs pÃ¥ 17:0, 17:1, 17:2 och 17:3, samt fyra TiMidity-portar pÃ¥ 128:0, 128:1, 128:2 och 128:3. + +Om du har ett FM-chip pÃ¥ ditt kort, som pÃ¥ SB16, kan du ladda SoundFonts med hjälp av sbiload-mjukvaran. Exempel: + + sbiload -p 17:0 /etc/std.o3 /etc/drums.o3 + +Om du har ett WaveTable-kapabelt ljudkort mÃ¥ste du ladda ett sbk- eller sf2-SoundFont med hjälp av sfxload eller asfxload-mjukvaran. Exempel: + + sfxload /path/to/8mbgmsfx.sf2 + +Om du inte har ett MIDI-kapabelt ljudkort finns det tvÃ¥ möjligheter: +FluidSynth och TiMidity. Vi rekommenderar FluidSynth, dÃ¥ TiMidity kan orsaka musikfördröjning pÃ¥ mÃ¥nga system. Detta är väldigt märkbart i iMUSE-spel, vilka använder snabba och dynamiska musikskiften. Att köra TiMidity som root lÃ¥ter det sätta upp aktiv tidsprioritering, vilket kan reducera musikfördröjningen. + +För att göra TiMidity till en ALSA sequencer: + + timidity -iAqqq -B2,8 -Os1S -s 44100 & + +(Om du fÃ¥r förvrängd uppspelning med den här inställningen försök samma kommando utan –B2,8, eller ändra värdet.) + +För att göra FluidSynth till en ALSA sequencer (med SoundFonts): + + fluidsynth -m alsa_seq /path/to/8mbgmsfx.sf2 + +När antingen TiMidity eller FluidSynth väl är igÃ¥ng kan du använda “aconnect –o –lâ€-kommandot enligt ovan. + + +7.6.2) Ljud med IRIX dmedia sequencer: [ENDAST UNIX] +---- --------------------------------- +Om du använder IRIX och dmedia-drivern med sequencer-stöd kan du ställa in environment-variabeln “SCUMMVM_MIDIPORT†eller konfigurationsfilsvariabeln “dmedia_port†för att specificera din sequencer-port. Standardprocessen är att använda den första porten. + +För att fÃ¥ en lista med konfigurerade midi-interface pÃ¥ ditt system, kör +â€startmidi†utan parametrar. Exempel pÃ¥ output: + + 2 konfigurerade MIDI interface: + Serial Port 2 + Software Synth + +I exemplet ovan kan du konfigurera ScummVM att använda “Software Synth†istället för den standardförvalda “Serial Port 2†genom att lägga till följande rad + + dmedia_port=Software Synth + +i din konfigurationsfil i avdelningen [scummvm] eller ställa in SCUMMVM_PORT=Software Synth i ditt environment. + + +7.7) Att använda TiMidity++ MIDI-servern: +---- ------------------------------------ +Om ditt system saknar en MIDI-sequencer men du fortfarande vill ha bättre MIDI-kvalitet än standard AdLib-emulation har att erbjuda kan du prova TiMidity++ MIDI-servern. Se http://timidity.sourceforge.net/ för instruktioner för nedladdning och installation. + + +Först mÃ¥ste du starta en daemon: + + timidity -ir 7777 + +Nu kan du starta ScummVM och prova att välja TiMidity musikuppspelning. Som standard ansluter sig programmet till localhost:7777 men du kan ändra värd/port via â€TIMIDITY_HOST†environment-variabeln. Du kan även specificera ett enhetsnummer (device number) via environment-variabeln i â€SCUMMVM_MIDIPORTâ€. + + +7.8) Att använda komprimerade ljudfiler +---- ---------------------------------- + +7.8.0) Att använda MP3 filer som CD-ljud: +------ ---------------------------------- +Använd LAME eller en annan MP3-kodare för att extrahera ljudspÃ¥ren frÃ¥n CD som filer. Namnge filerna track1.mp3, track2.mp3, etc. ScummVM mÃ¥ste ha kompilerats med MAD-stöd för att använda den här metoden. Om du behöver extrahera filerna frÃ¥n CD:n som WAV-filer, se till att koda MP3-filerna med konstant bit-ratio. Det kan du göra med följande kommandorad för LAME: + + lame -t -q 0 -b 96 track1.wav track1.mp3 + + +7.8.1) Att använda Ogg Vorbis-filer som CD-ljud: +------ ----------------------------------------- +Använd oggenc eller en annan vorbis-kompressor för att komprimera ljudspÃ¥ren till filer. Namnge filerna track1.ogg, track2.ogg, etc. ScummVM mÃ¥ste kompileras med vorbis-stöd för att kunna använda den här funktionen. Du mÃ¥ste extrahera filerna frÃ¥n CD:n som WAV-filer, sedan komprimera vorbis-filerna. Detta kan göras via följande oggenc kommandorad. Värdet efter q specificerar önskad kvalitet frÃ¥n 0 till 10: + + oggenc -q 5 track1.wav + + +7.8.2) Att använda Flac-filer som CD-ljud: +------ ----------------------------------- +Använd flac eller en annan flac-kompressor för att komprimera ljudspÃ¥ren till filer. Namnge filerna track1.flac, track2.flac, etc. Om ditt filsystem endast tillÃ¥ter tre bokstäver i filändelser, namnge filerna track1.fla, track2.fla, etc. ScummVM mÃ¥ste kompileras med flac-stöd för att använda den här funktionen. Du mÃ¥ste extrahera filerna frÃ¥n CD:n som WAV-filer, sedan komprimera flac-filerna. Detta kan göras med följande flac kommandorad: + + flac --best track1.wav + +Kom ihÃ¥g att kvaliteten alltid är densamma; att ändra komprimeringsinställningarna pÃ¥verkar endast komprimeringstiden och den slutgiltiga filstorleken. + + +7.8.3) Att komprimera MONSTER.SOU med MP3: +------ ----------------------------------- +Du behöver LAME och â€compress_scumm_souâ€-verktyget frÃ¥n scummvm-tools paketet för att göra det här, och ScummVM mÃ¥ste kompileras med MAD-stöd. + + compress_scumm_sou monster.sou + +Till slut kommer du ha en mycket mindre monster.so3-fil. Kopiera den här filen till din spelkatalog. Du kan med säkerhet radera monster.sou-filen. + + +7.8.4) Att komprimera MONSTER.SOU med Ogg Vorbis: +------ ------------------------------------------ +Som ovan, men ScummVM mÃ¥ste kompileras med OGG-stöd. Kör + + compress_scumm_sou --vorbis monster.sou + +Detta borde skapa en mindre monster.sog-fil som du bör kopiera till din spelkatalog. Ogg-kompression kan ta betydligt längre än MP3, sÃ¥ se till att ha en god bok tillhanda. + + +7.8.5) Att komprimera MONSTER.SOU med Flac: +------ ------------------------------------ +Som ovan, men ScummVM mÃ¥ste kompileras med Flac-stöd. Kör: + + compress_scumm_sou --flac monster.sou + +Detta borde skapa en mindre monster.sof-fil som du bör kopiera till din spelkatalog. Kom ihÃ¥g att kvaliteten alltid är den samma; att ändra komprimeringsinställningarna pÃ¥verkar endast komprimeringstiden och den slutgiltiga filstorleken. Att leka med blockstorleken (-b ) har störst inverkan pÃ¥ den slutliga filstorleken – 1152 verkar vara ett bra värde för dessa typer av ljudfiler. Se till att läsa instruktionerna för kompressorn innan du använder andra värden. + +7.8.6) Att komprimera musik/ljudeffekter/tal i AGOS-spel: +------ -------------------------------------------------- +Använd “compress_agosâ€-verktyget frÃ¥n scummvm-tools paketet för att göra det här. Du kan välja mellan ett flertal komprimeringsformat, men märk att du endast kan använda dem om ScummVM kompilerats med stöd för respektive dekoder. + + compress_agos effects (För Acorn CD-versionen av Simon 1) + compress_agos simon (För Acorn CD-versionen av Simon 1) + compress_agos effects.voc (För DOS CD-versionen av Simon 1) + compress_agos simon.voc (För DOS CD-versionen av Simon 1) + compress_agos simon.wav (För Windows CD-versionen av Simon 1) + compress_agos simon2.voc (För DOS CD-versionen av Simon 2) + compress_agos simon2.wav (För Windows CD-versionen av Simon 2) + compress_agos mac (För Macintosh-versionen av Simon 2) + + compress_agos voices1.wav (För Windows 2CD/4CD-versionen av Feeble) + compress_agos voices2.wav (För Windows 2CD/4CD-versionen av Feeble) + compress_agos voices3.wav (För Windows 4CD-versionen av Feeble) + compress_agos voices4.wav (För Windows 4CD-versionen av Feeble) + + compress_agos Music (För Windows-versionen av Puzzle Pack) + +För Ogg Vorbis, lägg till --vorbis till inställningarna, t.ex. + + compress_agos --vorbis + +För Flac, lägg till --flac och valfria parametrar, t.ex. + + compress_agos –flac + +Till slut kommer du ha en mycket mindre *.mp3, *.ogg eller *.fla-fil. Kopiera den här filen till din spelkatalog. Du kan med säkerhet radera den gamla filen. + + +7.8.7) Att komprimera tal/musik i Broken Sword: +------ ----------------------------------------- +“Compress_sword1â€-verktyget frÃ¥n scummvm-tools paketet kan komprimera musik och tal till MP3, Ogg Vorbis eller Flac. Det enklaste sättet att komprimera filerna är att kopiera programfilen till din BS1-katalog (tillsammans med lame-kompressorn) och köra den därifrÃ¥n. PÃ¥ det här viset kommer den automatiskt komprimera allting till MP3. EfterÃ¥t kan du för hand radera SPEECH?.CLU-filerna och wave musik-filerna. + +Att köra "compress_sword1 --vorbis" komprimerar filerna med Ogg +Vorbis istället för MP3. + +Att köra "compress_sword1 --flac" komprimerar filerna med Flac istället för MP3. + +Använd “compress_sword1 –-help†för att fÃ¥ en full lista med inställningar. + + +7.8.8) Att komprimera tal/musik i Broken Sword II: +------ ------------------------------------------- +Använd “compress_sword2â€-verktyget frÃ¥n scummvm-tools paketet för att göra det här. Du kan välja mellan ett flertal komprimeringsformat, men märk att du endast kan använda dem om ScummVM kompilerats med stöd för respektive dekoder. + + compress_sword2 speech1.clu + compress_sword2 music1.clu + +För Ogg Vorbis, lägg till --vorbis till inställningarna, t.ex. + + compress_sword2 --vorbis + +Till slut kommer du ha en mycket mindre *.cl3 eller *.clg-fil. Kopiera den här filen till din spelkatalog. Du kan med säkerhet radera den gamla filen. + +Det är möjligt att använda Flac-komprimering genom att lägga till –-flac inställningen. Den resulterande *.clf-filen blir dock faktiskt större än originalfilen. + +Tänk pÃ¥ att compress_sword2 endast fungerar med de fyra tal/musikfilerna i Broken Sword II. Det fungerar inte för de andra *.clu-filerna, och inte heller med talfilerna frÃ¥n Broken Sword. + + +7.9) Uppspelningsfrekvens: +---- --------------------- +Uppspelningsfrekvensen bestämmer hur mÃ¥nga ljudsamplingar som spelas per kanal per sekund. Det finns mycket att säga om det här ämnet, men det mesta vore irrelevant här. Kortfattat är 22050 Hz gott nog för de flesta spelen, men i vissa fall är 44100 Hz att föredra. PÃ¥ extremt lÃ¥gpresterande system kanske du vill använda 11025 Hz, men det är inte troligt att du behöver oroa dig för detta. + +De flesta ljuden ScummVM mÃ¥ste spela upp samplades med antingen 22050 Hz eller 11025 Hz. En högre uppspelningsfrekvens kommer alltsÃ¥ inte som av trolleri förbättra ljudkvaliten för dessa ljud. SÃ¥lunda räcker 22050 Hz gott och väl. + +Vissa spel använder CD-ljud. Om du vill använda komprimerade filer för CD-ljudspÃ¥ren kan du utgÃ¥ ifrÃ¥n att de samplades med 44100 Hz, sÃ¥ för dessa spel är detta ett bättre val av uppspelningsfrekvens. + +När du använder AdLib, FM Towns, PC Speaker eller IBM PCjr musikdrivers är ScummVM ansvarigt för att generera samplingarna. Vanligtvis är 22050 Hz mer än nog för dessa, men det finns minst ett stycke AdLib musik i Beneath a Steel Sky som lÃ¥ter mycket bättre i 44100 Hz. + +Att använda frekvenser mellan de ovansagda rekommenderas ej. Till att börja med finns risken att ditt ljudkort inte stöder dem. I teorin borde ScummVM växla till en mer resonlig frekvens i sÃ¥dana fall, men räkna inte med det. Vad värre är mÃ¥ste ScummVM Ã¥tersampla alla ljud till den nya uppspelningsfrekvensen. Detta är mycket lättare att göra ordentligt om ljudfrekvensen är en multipel av originalfrekvensen. + + +8.0) Konfigurationsfilen: +---- -------------------- +Som standard sparas och laddas konfigrationsfilen i: + + Windows Vista: + \Users\username\AppData\Roaming\ScummVM\scummvm.ini, + + Windows 2000/XP: + \Documents and Settings\username\Application Data\ScummVM\scummvm.ini, + + Windows NT4: + \Profiles\username\Application Data\ScummVM\scummvm.ini, + + Windows 95/98/ME: + \scummvm.ini, + + Om en tidigare version av ScummVM installerats i Windows behÃ¥lls + den tidigare standardsökvägen â€\scummvm.iniâ€. + + Unix: + ~/.scummvmrc + + Mac OS X: + ~/Library/Preferences/ScummVM Preferences + (här hänvisar ~ till din hemkatalog) + + Övriga: + scummvm.ini i den nuvarande katalogen + +Ett exempel pÃ¥ en konfigurationsfil ser ut sÃ¥ här: + + [scummvm] + gfx_mode=supereagle + fullscreen=true + savepath=C:\saves\ + + [sky] + path=C:\games\SteelSky\ + + [germansky] + gameid=sky + language=de + path=C:\games\SteelSky\ + description=Beneath a Steel Sky w/ German subtitles + + [germandott] + gameid=tentacle + path=C:\german\tentacle\ + description=German version of DOTT + + [tentacle] + path=C:\tentacle\ + subtitles=true + music_volume=40 + sfx_volume=255 + + [loomcd] + cdrom=1 + path=C:\loom\ + talkspeed=5 + savepath=C:\loom\saves\ + + [monkey2] + path=C:\amiga_mi2\ + music_driver=windows + +Följande nyckelord kan användas: + + path string Sökvägen dit spelets datafiler ligger + autosave_period number Antal sekunder mellan autosparningar (standard: 300) + save_slot number Positionsnumret för spardata att ladda vid + uppstart. + savepath string Sökvägen där spelet lagrar sina spardata. + versioninfo string Versionen av ScummVM som användes för att + skapa konfigurationsfilen. + + gameid string ID:n för ett spel. Användbart om du har + flera olika versioner av samma spel och vill + ha olika alias för dem. Se exempel. + + description string Beskrivningen av spelet enligt launchern. + + language string Bestäm sprÃ¥k (en, us, de, fr, it, pt, es, + jp, zh, kr, se, gb, hb, cz, ru) + speech_mute bool Ställ in till “true†för att stänga av röster + subtitles bool Ställ in till “true†för att visa undertexter + talkspeed number Textfördröjning i SCUMM-spel, eller texthastighet + i andra spel. + + fullscreen bool Fullskärmsläge + aspect_ratio bool Aktivera korrektion av bildförhÃ¥llande + disable_dithering bool Anti-gitter för EGA-spel + gfx_mode string Grafikläge (normalt, 2x, 3x, 2xsai, + super2xsai, supereagle, advmame2x, advmame3x, + hq2x, hq3x, tv2x, dotmatrix) + + confirm_exit bool Be om bekräftelse frÃ¥n användaren innan avslutnig + (endast SDL-back-end). + console bool Öppna konsolfönstret (standard: pÃ¥) (endast Windows) + cdrom number Nummer pÃ¥ CD-ROM enhet för använding av ljud. + Försök inte använda CD-ROM enheten om detta numret + är negativt. + joystick_num number Nummer pÃ¥ joystick-enhet att använda för input + music_driver string Musikenheten att använda. + opl_driver string AdLib (OPL)-emulatorn att använda. + output_rate number Uppspelningsvärdet i Hz. Lämpliga värden är + 11025, 22050 och 44100. + alsa_port string Port att använda för utmatning för ALSA- + musikdrivern. + music_volume number Musikvolym (0-255) + multi_midi bool Ställ in till “true†för att kombinera AdLib + och Native MIDI. + soundfont string SoundFont att använda för MIDI-uppspelning. (Stöds + endast av vissa MIDI-drivers.) + native_mt32 bool Ställ in till “true†för att deaktivera GM- + emulation och utgÃ¥ ifrÃ¥n att en verklig Roland + MT-32 finns tillhanda. + enable_gs bool Ställ in till “true†för att aktivera Roland GS- + specifika funktioner för att förbättra GM- + emulation. Om native_mt32 även ställts till â€true†+ kommer GS-enheten att välja en MT-32 karta för att + spela rätt instrument. + sfx_volume number Ljudeffektsvolym (0-255) + tempo number Musiktempo (50-200) (standard: 100) + speech_volume number Röstvolym (0-255) + midi_gain number MIDI gain (0-1000) (standard: 100) (Stöds endast + av vissa MIDI-drivers.) + + copy_protection bool Aktiverar kopieringsskyddet för vissa spel i fall + där ScummVM automatiskt deaktiverar det. + demo_mode bool Öppna demon i Maniac Mansion + alt_intro bool Använd alternativt intro för CD-versionerna av + Beneath a Steel Sky och Flight of the Amazon + Queen + + boot_param number Skicka det här numret till boot script + +Broken Sword II lägger till följande nyckelord: + + gfx_details number Grafisk detalj (0-3) + music_mute bool Ställ in till “true†för att deaktivera musik + object_labels bool Ställ in till “true†för att aktivera etiketter för + föremÃ¥l + reverse_stereo bool Ställ in till “true†för att ivertera + stereokanalerna + sfx_mute bool Ställ in till “true†för att deaktivera + ljudeffekter + +Flight of the Amazon Queen lägger till följande nyckelord: + + music_mute bool Ställ in till “true†för att deaktivera musik + sfx_mute bool Ställ in till “true†för att deaktivera + ljudeffekter + +King's Quest VI Windows lägger till följande nyckelord: + + windows_cursors bool Ställ in till “true†för att använda de svartvita + Windows-muspekarna istället för DOS-muspekarna. + Ställ in till â€false†för att använda de uppskalade + muspekarna som matchar resten av grafiken. + +Simon the Sorcerer 1 och 2 lägger till följande nyckelord: + + music_mute bool Ställ in till “true†för att deaktivera musik + sfx_mute bool Ställ in till “true†för att deaktivera + ljudeffekter + + +The Legend of Kyrandia lägger till följande nyckelord: + + walkspeed int GÃ¥nghastighet (0-4) + + +9.0) Kompilering: +---- ------------ +För en uppdaterad överblick för hur man kompilerar ScummVM pÃ¥ diverse plattformar var god se vÃ¥r Wiki, speciellt den här här sidan: + http://wiki.scummvm.org/index.php/Compiling_ScummVM + +Om du kompilerar för Windows, Linux eller Mac OS X behöver du SDL-1.2.2 eller senare (äldre versioner kan fungera, men stöds inte) och ett stött kompileringsprogram. Flera kompileringsprogram inklusive GCC, mingw och senare versioner av Microsoft Visual C++ stöds. Om du vill använda MP3-komprimerade CD-spÃ¥r eller .SOU-filer mÃ¥ste du installera MAD-biblioteket; pÃ¥ samma sätt behöver du de nödvändiga biblioteken för Ogg Vorbis och FLAC-komprimerat ljud. För komprimerade spardata krävs zlib. + +Vissa delar av ScummVM, speciellt skalningsfilter, har optimerade versioner skrivna i assembler-kod. Om du vill använda dem mÃ¥ste du installera nasm-assemblern (se http://nasm.sf.net). Märk att vi för tillfället endast har optimerade versioner för x86 MMX och att de inte kan kompileras med andra processorer. + +PÃ¥ Win9x/NT/XP kan du definiera USE_WINDBG och lägga till WinDbg för att visa debug-meddelanden (se http://www.sysinternals.com/ntw2k/freeware/debugview.shtml). + + GCC och MinGW32: + * Skriv "./configure" + * Skriv "make" (eller "gmake", eller "gnumake", beroende pÃ¥ vilken GNU + används av ditt system) sÃ¥ kompilerar ScummVM förhoppningsvis allt Ã¥t dig. + * För ytterligare information se: + http://wiki.scummvm.org/index.php/Compiling_ScummVM/GCC + eller + http://wiki.scummvm.org/index.php/Compiling_ScummVM/MinGW + + Microsoft Visual C++ 8/9/10: + * Läs pÃ¥ hur man skapar projekt-filerna i "dists\msvc8", + "dists\msvc9" eller "dists\msvc10". + * Öppna den resulterade lösningsfilen. + * Ange sökvägen till de nödvändiga biblioteken och include-resurserna i + Tools|Options|Projects and Solutions|VC++ Directories. + * Programmet borde nu kompileras utan problem. + * För mer information se: + http://wiki.scummvm.org/index.php/Compiling_ScummVM/VS2005 + + Windows Mobile: + * Var god se: + http://wiki.scummvm.org/index.php/Compiling_ScummVM/Windows_CE + + Debian GNU/Linux: + * Installera paketen 'build-essential', 'fakeroot', 'debhelper', + och 'libsdl1.2-dev' pÃ¥ ditt system. + * Installera de här paketen (valfria): 'libvorbis-dev' (för Ogg + Vorbis stöd), 'libasound2-dev' (för ALSA sequencer stöd), + 'libmad0-dev' (för MAD MP3 stöd), 'zlib1g-dev' (för stöd av kompresserad spardata). + * Kör 'make deb'. + * Kör sedan 'dpkg -i ../scummvm-cvs*deb', sÃ¥ är du klar. + + Mac OS X: + * Se till att du har utvecklingsverktygen istallerade. + * SDL-utvecklingspaketet för OS X som finns tillgängligt pÃ¥ SLD:s hemsida + är INTE lämpligt. Du behöver istället en unix-artad kompilation av SDL. + Ett sätt att fÃ¥ tag i en sÃ¥dan är att installera SDL via Fink + (http://fink.sf.net). Annars kan du kompilera SDL manuellt frÃ¥n källkoden + med unix build-systemet (configure && make). + * Skriv "./configure" i ScummVM-katalogen. + * Du kan nu skriva â€make†för att skapa en kommandorad-binary. + * För att fÃ¥ en version du kan köra frÃ¥n Finder, skriv “make bundle†vilket + skapar ScummVM.app (det här fungerar endast om du installerade SDL i /sw + (vilket sker om du använder Fink). Om du installerade SDL pÃ¥ annat vis mÃ¥ste + du redigera ports.mk). + * För ytterligare information se: + http://wiki.scummvm.org/index.php/Compiling_ScummVM/MacOS_X_Crosscompiling + + AmigaOS 4 (Kors-kompilering med Cygwin): + * Se till att du har SDL installerad. Du kan även behöva + libogg, libvorbis, libvorbisfile, zlib, libmad. + * Skriv ./configure --host=ppc-amigaos + * Om du fÃ¥r ett felmeddelande om sdl-config, använd --with-sdl-prefix + parametern för att ställa in sökvägen. + * Kolla â€config.mk†filen och om allt ser ut att vara som det ska: + * Kör â€makeâ€. + * Att kors-kompilera med Linux kan vara lika enkelt. + + iPhone: + * Var god se: + http://wiki.scummvm.org/index.php/Compiling_ScummVM/iPhone + + Maemo: + * Installera Maemo SDK med 4.1.2 rootstrap + * Installera libmad, Tremor, FLAC frÃ¥n källkoden + * Kör â€ln -s backends/platform/maemo/debian†+ * Uppdatera debian/changelog + * Kör â€sb2 dpkg-buildpackage –b†+ +------------------------------------------------------------------------ +Lycka till och glada äventyr! +ScummVM-teamet. +http://www.scummvm.org/ +------------------------------------------------------------------------ \ No newline at end of file diff -Nru scummvm-1.4.0/doc/se/Snabbstart scummvm-1.4.1/doc/se/Snabbstart --- scummvm-1.4.0/doc/se/Snabbstart 1970-01-01 00:00:00.000000000 +0000 +++ scummvm-1.4.1/doc/se/Snabbstart 2012-01-14 09:28:25.000000000 +0000 @@ -0,0 +1,79 @@ +Det här dokumentet är en ofullständig översättning av den engelska README-filen. Det sistnämnda dokumentet innehÃ¥ller mer information sÃ¥ om du inte kan hitta vad du behöver här (och pratar lite engelska), ta en titt i den engelska README-filen. + +För ytterligare information, kompatibilitetslistor, donationsdetaljer, den senaste programversionen, utvecklingsrapporter med mera, var god besök ScummVM:s hemsida pÃ¥ http://www.scummvm.org/ + +InnehÃ¥ll: +--------- +1.0) Introduktion + * 1.1 Om ScummVM + * 1.2 Snabbstart +2.0) Kontaktinformation + * 2.1 Att rapportera buggar + +1.0) Introduktion: +---- ------------- + +1.1) Om ScummVM: +---- ----------- +ScummVM är ett program som gör det möjligt att spela vissa klassiska ”peka-och-klicka”-äventyrsspel, förutsatt att du redan har de nödvändiga datafilerna. Det finurliga i det hela är att ScummVM ersätter de ursprungliga programfilerna som följde med spelet, vilket lÃ¥ter dig spela dem pÃ¥ operativsystem de aldrig var designade för! + +FrÃ¥n början var programmet designat för att köra LucasArts SCUMM-spel, till exempel Maniac Mansion, Monkey Island, Day of the Tentacle och Sam and Max. SCUMM stÃ¥r för ”Script Creation Utility for Maniac Mansion”, och just Maniac Mansion var det första spelet där LucasArts använde det här spelsystemet. Mycket senare gav det namn till ScummVM (”VM” stÃ¥r för ”Virtual Machine”). + +Med tiden har stöd lagts till för mÃ¥nga spel som inte använder SCUMM-systemet och ScummVM stöder nu även mÃ¥nga av Sierras AGI- och SCI-spel (till exempel KingÂ’s Quest 1-6, Space Quest 1-5, ...), Discworld 1 och 2, Simon the Sorcerer 1 och 2, Beneath A Steel Sky, Lure of the Temptress, Broken Sword I och II, Flight of the Amazon Queen, Gobliiins 1-3, Legend of Kyrandia-serien, mÃ¥nga av Humongous Entertainments barnspel (inklusive Freddi Fish och Putt Putt-spelen) med flera. Du kan se en fullständig lista med delaljer om vilka äventyr som stöds och hur väl de fungerar pÃ¥ kompatibilitetssidan. ScummVM förbättras konstant, sÃ¥ hÃ¥ll ett öga pÃ¥ listan. + +Bland systemen du kan använda för att spela dessa spel räknas vanliga persondatorer (Windows, Linux, Mac OS X, ...) spelkonsoler (Dreamcast, Nintendo DS & Wii, PS2, PSP, ...), smartphones (Android, iPhone, PocketPC, Symbian ...) med flera. + +Just nu är ScummVM fortfarande under utveckling. Var medveten om att trots att vi försöker se till att mÃ¥nga spel kan avklaras utan att stöta pÃ¥ allvarliga buggar finns det ändÃ¥ risk för krasher, och vi erbjuder inga garantier. Dock har mÃ¥nga spel varit stödda av programmet väldigt länge och borde fungera utmärkt i vilken som helst av de senaste stabila versionerna. Du kan fÃ¥ en uppfattning om hur väl varje spel fungerar i ScummVM genom att titta pÃ¥ kompatibilitetssidan. Faktum är att ScummVM används kommersiellt för nyutgÃ¥vor av vissa spel pÃ¥ moderna plattformer. AlltsÃ¥ är mÃ¥nga företag nöjda med mjukvarans kvalitet och hur väl programmet stöder spelen. + +Om du gillar ScummVM fÃ¥r du gärna donera till teamet med hjälp av PayPal-knappen pÃ¥ ScummVM:s hemsida. Donationer hjälper oss att köpa nödvändig utrustning för att göra utvecklingen av ScummVM lättare och snabbare. Om du inte kan donera kan du hjälpa till genom att bidra med uppdateringar! + +1.2) Snabbstart: +---- ----------- +VIKTIGT: Den här korta guiden förutsätter att du använder ScummVM pÃ¥ svenska. ScummVM använder automatiskt samma sprÃ¥k som ditt operativsystem. Om du föredrar att använda ScummVM pÃ¥ engelska kommer du troligtvis föredra att använda guiden i den engelska README-filen. + +För de otÃ¥liga följer här instruktioner för att köra igÃ¥ng ScummVM i fem enkla steg. + +1. Ladda hem ScummVM frÃ¥n http://www.scummvm.org/downloads.php och installera programmet. + +2. Skapa en filkatalog pÃ¥ din hÃ¥rddisk och kopiera spelets datafiler frÃ¥n dess ursprungliga plats till den nya katalogen. Upprepa det här steget för varje spel du vill spela (det är bättre att använda separata kataloger för vaje spel). + +3. Starta ScummVM. + +Om programmet nu visas pÃ¥ engelska istället för svenska, gör sÃ¥här för att byta sprÃ¥k: +- Klicka pÃ¥ ”Options”. +- Klicka pÃ¥ högerpilen i tab-raden och navigera till “Misc”-tabben. +- Välj “Svenska” i “GUI Language”-menyn och klicka pÃ¥ “OK”. +- Konfirmera meddelandet som visas, klicka pÃ¥ “Quit” för att avsluta ScummVM och starta sedan om programmet. + +Klicka pÃ¥ “Lägg till spel”, välj katalogen som innehÃ¥ller datafilerna (var noga att välja själva filkatalogen - inte datafilerna inuti filkatalogen!) och klicka pÃ¥ ”Välj”. + +4. Nu visas en dialogruta där du kan ändra diverse inställningar om du vill (det borde vara nog att lämna inställningarna som de är frÃ¥n början). Konfirmera dialogrutan. + +5. Välj spelet du vill spela frÃ¥n listan och klicka pÃ¥ ”Starta”. + +ScummVM kommer ihÃ¥g alla spelen du lägger till, sÃ¥ om du avslutar ScummVM kommer spellistan vid nästa omstart innehÃ¥lla alla spelen du hittills lagt till. Du kan därför hoppa direkt till steg 5, sÃ¥tillvida inte du vill läga till fler spel. + +Tips: Om du vill lägga till flera spel pÃ¥ en gÃ¥ng, pröva att trycka och hÃ¥lla ned skift-tangenten när du klickar pÃ¥ “Lägg till spel” – knappens text ändras nu till “Masstillägg” och om du klickar pÃ¥ den kommer du Ã¥ter igen ombedjas att välja en filkatalog, men den här gÃ¥ngen söker ScummVM automatiskt igenom alla underkataloger efter stödda spel. + +2.0) Kontakt: +---- -------- +Det enklaste sättet att kontakta ScummVM-teamet är att skicka in bugg-rapporter (se 2.1) eller genom att använda vÃ¥rt forum pÃ¥ http://forums.scummv.org. Du kan även skriva upp dig för och skicka e-post via vÃ¥r sändlista (scummvm-devel) eller chatta med oss pÃ¥ IRC (#scummvm pÃ¥ irc.freenode.net) Vi ber dig att inte skicka önskemÃ¥l pÃ¥ spel som inte stöds av ScummVM – läs avdelningen för vanliga frÃ¥gor (FAQ) pÃ¥ vÃ¥ran hemsida först. Märk även att det officiella sprÃ¥ket för vÃ¥rt forum, vÃ¥r sändlista och chatten är engelska och att inga andra sprÃ¥k borde användas där. + +2.1) Att rapportera buggar: +---- ---------------------- +För att rapportera en bugg mÃ¥ste du skapa ett konto hos SourceForge och följa “Bug Tracker”-länken frÃ¥n vÃ¥ran hemsida. Var god se till att buggen kan reproduceras med säkerhet och att den fortfarande är aktiv i den senaste git/Daily build-versionen. Se även till att kontrollera att felet inte redan rapporterats genom att läsa listan av kända fel för spelet pÃ¥ vÃ¥ran kompatibilitetssida: + + http://www.scummvm.org/compatibility_stable.php + +Var god rapportera inte buggar för spel som inte är möjliga att avklara enligt “Supported Games”-avdelningen, eller i kompatibilitetslistan. Vi vet redan att dessa spel är buggiga. + +Se till att bifoga följande information: + - ScummVM version (Var god testa med den senaste git/Daily Build-versionen) + - Detaljer om buggen, inklusive instruktioner för reproduktion + - Spelets sprÃ¥k (engelska, tyska, ...) + - Version av spelet (talversionen, diskettversionen, ...) + - Plattform och kompilator (Win32, Linux, FreeBSD, ...) + - Bifoga spardata om möjligt + - Om den här buggen dök upp alldeles nyligen, var god notera den senaste versionen av ScummVM där buggen inte fanns och den första versionen där buggen dök upp. PÃ¥ det här viset kan vi fixa problemet snabbare genom att se vilka förändringar som skedde mellan versionerna. + +Slutligen, var god rapportera varje bugg i enskilda rapporter; skicka inte flera buggar i en och samma rapport (annars blir det svÃ¥rt att hÃ¥lla reda pÃ¥ varje buggs individuella status). Tänk även pÃ¥ att alla buggrapporter mÃ¥ste vara skrivna pÃ¥ engelska. diff -Nru scummvm-1.4.0/engines/agi/agi.h scummvm-1.4.1/engines/agi/agi.h --- scummvm-1.4.0/engines/agi/agi.h 2011-09-30 11:04:24.000000000 +0000 +++ scummvm-1.4.1/engines/agi/agi.h 2012-01-14 09:28:43.000000000 +0000 @@ -1087,7 +1087,7 @@ void blitTextbox(const char *p, int y, int x, int len); void eraseTextbox(); void loadDict(); - bool matchWord(); + bool matchWord(bool onlyExact = false); // Predictive dialog // TODO: Move this to a separate class diff -Nru scummvm-1.4.0/engines/agi/predictive.cpp scummvm-1.4.1/engines/agi/predictive.cpp --- scummvm-1.4.0/engines/agi/predictive.cpp 2011-07-27 13:40:23.000000000 +0000 +++ scummvm-1.4.1/engines/agi/predictive.cpp 2012-01-14 09:28:43.000000000 +0000 @@ -552,7 +552,7 @@ debug("Time to parse pred.dic: %d, total: %d", time3-time2, time3-time1); } -bool AgiEngine::matchWord() { +bool AgiEngine::matchWord(bool onlyExact) { // If no text has been entered, then there is no match. if (_currentCode.empty()) return false; @@ -561,14 +561,29 @@ if (_currentCode.size() > MAXWORDLEN) return false; - // Perform a binary search on the dictionary to find the first - // entry that has _currentCode as a prefix. + if (!onlyExact) { + // First always try an exact match. + bool ret = matchWord(true); + if (ret) + return true; + } + + // The entries in the dictionary consist of a code, a space, and then + // a space-separated list of words matching this code. + // To exactly match a code, we therefore match the code plus the trailing + // space in the dictionary. + Common::String code = _currentCode; + if (onlyExact) + code += " "; + + // Perform a binary search on the dictionary to find an entry that has + // _currentCode as a prefix. int hi = _predictiveDictLineCount - 1; int lo = 0; int line = 0; - while (lo < hi) { + while (lo <= hi) { line = (lo + hi) / 2; - int cmpVal = strncmp(_predictiveDictLine[line], _currentCode.c_str(), _currentCode.size()); + int cmpVal = strncmp(_predictiveDictLine[line], code.c_str(), code.size()); if (cmpVal > 0) hi = line - 1; else if (cmpVal < 0) @@ -581,7 +596,7 @@ _currentWord.clear(); _wordNumber = 0; - if (0 == strncmp(_predictiveDictLine[line], _currentCode.c_str(), _currentCode.size())) { + if (0 == strncmp(_predictiveDictLine[line], code.c_str(), code.size())) { _predictiveDictActLine = _predictiveDictLine[line]; char tmp[MAXLINELEN]; strncpy(tmp, _predictiveDictActLine, MAXLINELEN); diff -Nru scummvm-1.4.0/engines/agos/agos.h scummvm-1.4.1/engines/agos/agos.h --- scummvm-1.4.0/engines/agos/agos.h 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/engines/agos/agos.h 2011-11-19 14:02:55.000000000 +0000 @@ -197,6 +197,7 @@ void registerArchive(const Common::String &filename, int priority); #endif + bool hasFile(const Common::String &name); Common::SeekableReadStream *open(const Common::String &filename); private: diff -Nru scummvm-1.4.0/engines/agos/animation.cpp scummvm-1.4.1/engines/agos/animation.cpp --- scummvm-1.4.0/engines/agos/animation.cpp 2011-09-30 11:04:24.000000000 +0000 +++ scummvm-1.4.1/engines/agos/animation.cpp 2011-11-19 14:02:55.000000000 +0000 @@ -525,25 +525,25 @@ memcpy(shortName, baseName, 6); sprintf(filename, "%s~1.dxa", shortName); - if (Common::File::exists(filename)) { + if (vm->_archives.hasFile(filename)) { memset(baseName, 0, sizeof(baseName)); memcpy(baseName, filename, 8); } sprintf(filename, "%s~1.smk", shortName); - if (Common::File::exists(filename)) { + if (vm->_archives.hasFile(filename)) { memset(baseName, 0, sizeof(baseName)); memcpy(baseName, filename, 8); } } sprintf(filename, "%s.dxa", baseName); - if (Common::File::exists(filename)) { + if (vm->_archives.hasFile(filename)) { return new MoviePlayerDXA(vm, baseName); } sprintf(filename, "%s.smk", baseName); - if (Common::File::exists(filename)) { + if (vm->_archives.hasFile(filename)) { return new MoviePlayerSMK(vm, baseName); } diff -Nru scummvm-1.4.0/engines/agos/installshield_cab.cpp scummvm-1.4.1/engines/agos/installshield_cab.cpp --- scummvm-1.4.0/engines/agos/installshield_cab.cpp 2011-09-30 11:04:24.000000000 +0000 +++ scummvm-1.4.1/engines/agos/installshield_cab.cpp 2012-01-14 09:28:43.000000000 +0000 @@ -162,7 +162,6 @@ } bool InstallShieldCabinet::hasFile(const Common::String &name) { - warning("hasFile: Filename %s", name.c_str()); return _map.contains(name); } diff -Nru scummvm-1.4.0/engines/agos/res.cpp scummvm-1.4.1/engines/agos/res.cpp --- scummvm-1.4.0/engines/agos/res.cpp 2011-09-30 11:04:24.000000000 +0000 +++ scummvm-1.4.1/engines/agos/res.cpp 2011-11-19 14:02:55.000000000 +0000 @@ -47,6 +47,13 @@ } #endif +bool ArchiveMan::hasFile(const Common::String &name) { + if (_fallBack && SearchMan.hasFile(name)) + return true; + + return Common::SearchSet::hasFile(name); +} + Common::SeekableReadStream *ArchiveMan::open(const Common::String &filename) { if (_fallBack && SearchMan.hasFile(filename)) { return SearchMan.createReadStreamForMember(filename); diff -Nru scummvm-1.4.0/engines/kyra/gui_lol.cpp scummvm-1.4.1/engines/kyra/gui_lol.cpp --- scummvm-1.4.0/engines/kyra/gui_lol.cpp 2011-09-30 11:04:24.000000000 +0000 +++ scummvm-1.4.1/engines/kyra/gui_lol.cpp 2012-01-14 09:28:43.000000000 +0000 @@ -2575,8 +2575,8 @@ int saveSlotMaxLen = ((_screen->getScreenDim(8))->w << 3) - _screen->getCharWidth('W'); for (int i = startSlot; i < num && _savegameOffset + i - slotOffs < _savegameListSize; ++i) { - if (_savegameList[_saveSlots[i + _savegameOffset - slotOffs]]) { - Common::strlcpy(s, _savegameList[_saveSlots[i + _savegameOffset - slotOffs]], 80); + if (_savegameList[i + _savegameOffset - slotOffs]) { + Common::strlcpy(s, _savegameList[i + _savegameOffset - slotOffs], 80); // Trim long GMM save descriptions to fit our save slots int fC = _screen->getTextWidth(s); @@ -2626,7 +2626,7 @@ _savegameList = new char *[_savegameListSize]; for (int i = 0; i < _savegameListSize; i++) { - in = _vm->openSaveForReading(_vm->getSavegameFilename(i), header); + in = _vm->openSaveForReading(_vm->getSavegameFilename(_saveSlots[i]), header); if (in) { _savegameList[i] = new char[header.description.size() + 1]; Common::strlcpy(_savegameList[i], header.description.c_str(), header.description.size() + 1); @@ -2634,10 +2634,9 @@ delete in; } else { _savegameList[i] = 0; - error("GUI_LoL::updateSavegameList(): Unexpected missing save file for slot: %d.", i); + warning("GUI_LoL::updateSavegameList(): Unexpected missing save file for slot: %d.", _saveSlots[i]); } } - } else { _savegameList = 0; } diff -Nru scummvm-1.4.0/engines/kyra/items_lol.cpp scummvm-1.4.1/engines/kyra/items_lol.cpp --- scummvm-1.4.0/engines/kyra/items_lol.cpp 2011-09-30 11:04:24.000000000 +0000 +++ scummvm-1.4.1/engines/kyra/items_lol.cpp 2012-01-14 09:28:43.000000000 +0000 @@ -127,14 +127,8 @@ continue; bool t = false; - Item ii = i; - while (ii && !t) { - t = testUnkItemFlags(ii); - if (t) - break; - else - ii = _itemsInPlay[ii - 1].nextAssignedObject; - } + for (Item ii = i; ii && !t; ii = _itemsInPlay[ii].nextAssignedObject) + t = isItemMoveable(ii); if (t) { cnt = diff; @@ -144,24 +138,20 @@ Item slot = i; if (cnt) { - slot = r; - if (testUnkItemFlags(r)) { + slot = 0; + if (isItemMoveable(r)) { if (_itemsInPlay[r].nextAssignedObject) _itemsInPlay[_itemsInPlay[r].nextAssignedObject].level = _itemsInPlay[r].level; deleteItem(r); slot = r; } else { - uint16 ii = _itemsInPlay[slot].nextAssignedObject; - while (ii) { - if (testUnkItemFlags(ii)) { - _itemsInPlay[slot].nextAssignedObject = _itemsInPlay[ii].nextAssignedObject; - deleteItem(ii); - slot = ii; - break; - } else { - slot = ii; - } - ii = _itemsInPlay[slot].nextAssignedObject; + for (uint16 ii = _itemsInPlay[r].nextAssignedObject; ii; ii = _itemsInPlay[ii].nextAssignedObject) { + if (!isItemMoveable(ii)) + continue; + _itemsInPlay[r].nextAssignedObject = _itemsInPlay[ii].nextAssignedObject; + deleteItem(ii); + slot = ii; + break; } } } @@ -219,7 +209,7 @@ return true; } -bool LoLEngine::testUnkItemFlags(Item itemIndex) { +bool LoLEngine::isItemMoveable(Item itemIndex) { if (!(_itemsInPlay[itemIndex].shpCurFrame_flg & 0x4000)) return false; @@ -304,7 +294,7 @@ return false; } -void LoLEngine::setItemPosition(Item item, uint16 x, uint16 y, int flyingHeight, int b) { +void LoLEngine::setItemPosition(Item item, uint16 x, uint16 y, int flyingHeight, int moveable) { if (!flyingHeight) { x = (x & 0xffc0) | 0x40; y = (y & 0xffc0) | 0x40; @@ -316,7 +306,7 @@ _itemsInPlay[item].block = block; _itemsInPlay[item].flyingHeight = flyingHeight; - if (b) + if (moveable) _itemsInPlay[item].shpCurFrame_flg |= 0x4000; else _itemsInPlay[item].shpCurFrame_flg &= 0xbfff; @@ -325,7 +315,7 @@ assignItemToBlock(&_levelBlockProperties[block].assignedObjects, item); reassignDrawObjects(_currentDirection, item, &_levelBlockProperties[block], false); - if (b) + if (moveable) runLevelScriptCustom(block, 0x80, -1, item, 0, 0); checkSceneUpdateNeed(block); diff -Nru scummvm-1.4.0/engines/kyra/lol.cpp scummvm-1.4.1/engines/kyra/lol.cpp --- scummvm-1.4.0/engines/kyra/lol.cpp 2011-09-30 11:04:24.000000000 +0000 +++ scummvm-1.4.1/engines/kyra/lol.cpp 2012-01-14 09:28:43.000000000 +0000 @@ -896,7 +896,7 @@ _availableSpells[0] = 0; setupScreenDims(); - memset(_globalScriptVars2, 0x100, 8); + Common::set_to(_globalScriptVars2, ARRAYEND(_globalScriptVars2), 0x100); static const int selectIds[] = { -9, -1, -8, -5 }; assert(_charSelection >= 0); @@ -993,6 +993,10 @@ void LoLEngine::readSettings() { _monsterDifficulty = ConfMan.getInt("monster_difficulty"); + if (_monsterDifficulty < 0 || _monsterDifficulty > 2) { + _monsterDifficulty = CLIP(_monsterDifficulty, 0, 2); + warning("LoLEngine: Config file contains invalid difficulty setting."); + } _smoothScrollingEnabled = ConfMan.getBool("smooth_scrolling"); _floatingCursorsEnabled = ConfMan.getBool("floating_cursors"); @@ -1922,8 +1926,7 @@ stopPortraitSpeechAnim(); if (charId < 0) { - charId = ch = (_rnd.getRandomNumber(0x7fff) * countActiveCharacters()) / 0x8000; - ch = _rnd.getRandomNumber(countActiveCharacters() - 1); + charId = ch = _rnd.getRandomNumber(countActiveCharacters() - 1); } else if (charId > 0) { int i = 0; diff -Nru scummvm-1.4.0/engines/kyra/lol.h scummvm-1.4.1/engines/kyra/lol.h --- scummvm-1.4.0/engines/kyra/lol.h 2011-09-30 11:04:24.000000000 +0000 +++ scummvm-1.4.1/engines/kyra/lol.h 2012-01-14 09:28:43.000000000 +0000 @@ -1206,14 +1206,14 @@ Item makeItem(int itemType, int curFrame, int flags); void placeMoveLevelItem(Item itemIndex, int level, int block, int xOffs, int yOffs, int flyingHeight); bool addItemToInventory(Item itemIndex); - bool testUnkItemFlags(Item itemIndex); + bool isItemMoveable(Item itemIndex); void deleteItem(Item itemIndex); ItemInPlay *findObject(uint16 index); void runItemScript(int charNum, Item item, int flags, int next, int reg4); void setHandItem(Item itemIndex); bool itemEquipped(int charNum, uint16 itemType); - void setItemPosition(Item item, uint16 x, uint16 y, int flyingHeight, int b); + void setItemPosition(Item item, uint16 x, uint16 y, int flyingHeight, int moveable); void removeLevelItem(Item item, int block); bool launchObject(int objectType, Item item, int startX, int startY, int flyingHeight, int direction, int, int attackerId, int c); void endObjectFlight(FlyingObject *t, int x, int y, int collisionObject); diff -Nru scummvm-1.4.0/engines/kyra/saveload.cpp scummvm-1.4.1/engines/kyra/saveload.cpp --- scummvm-1.4.0/engines/kyra/saveload.cpp 2011-09-30 11:04:24.000000000 +0000 +++ scummvm-1.4.1/engines/kyra/saveload.cpp 2012-01-14 09:28:43.000000000 +0000 @@ -54,7 +54,7 @@ header.gameID = in->readByte(); } else { // try checking for original save header - const int descriptionSize[2] = { 30, 80 }; + const int descriptionSize[3] = { 30, 80, 60 }; char descriptionBuffer[81]; bool saveOk = false; @@ -78,6 +78,16 @@ header.description = descriptionBuffer; header.gameID = GI_KYRA3; break; + } else if (type == MKTAG('C','D','0','4')) { + header.version = in->readUint32BE(); + // We don't check the minor version, since the original doesn't do that either and it isn't required. + if (header.version != MKTAG(' ','C','D','1')) + continue; + saveOk = true; + header.description = descriptionBuffer; + header.gameID = GI_LOL; + in->seek(6, SEEK_CUR); + break; } } diff -Nru scummvm-1.4.0/engines/kyra/saveload_lol.cpp scummvm-1.4.1/engines/kyra/saveload_lol.cpp --- scummvm-1.4.0/engines/kyra/saveload_lol.cpp 2011-09-30 11:04:24.000000000 +0000 +++ scummvm-1.4.1/engines/kyra/saveload_lol.cpp 2012-01-14 09:28:43.000000000 +0000 @@ -27,6 +27,7 @@ #include "common/savefile.h" #include "common/substream.h" +#include "common/memstream.h" #include "graphics/scaler.h" @@ -44,6 +45,9 @@ return Common::kNoError; } + if (header.originalSave) + warning("Trying to load savegame from original interpreter, while this is possible, it is not officially supported"); + _screen->fadeClearSceneWindow(10); completeDoorOperations(); _screen->fillRect(112, 0, 287, 119, 0, 0); @@ -53,38 +57,40 @@ for (int i = 0; i < 4; i++) { LoLCharacter *c = &_characters[i]; - c->flags = in.readUint16BE(); + c->flags = in.readUint16(); in.read(c->name, 11); c->raceClassSex = in.readByte(); - c->id = in.readSint16BE(); + c->id = in.readSint16(); c->curFaceFrame = in.readByte(); c->tempFaceFrame = in.readByte(); c->screamSfx = in.readByte(); + if (header.originalSave) + in.skip(4); for (int ii = 0; ii < 8; ii++) - c->itemsMight[ii] = in.readUint16BE(); + c->itemsMight[ii] = in.readUint16(); for (int ii = 0; ii < 8; ii++) - c->protectionAgainstItems[ii] = in.readUint16BE(); - c->itemProtection = in.readUint16BE(); - c->hitPointsCur = in.readSint16BE(); - c->hitPointsMax = in.readUint16BE(); - c->magicPointsCur = in.readSint16BE(); - c->magicPointsMax = in.readUint16BE(); + c->protectionAgainstItems[ii] = in.readUint16(); + c->itemProtection = in.readUint16(); + c->hitPointsCur = in.readSint16(); + c->hitPointsMax = in.readUint16(); + c->magicPointsCur = in.readSint16(); + c->magicPointsMax = in.readUint16(); c->field_41 = in.readByte(); - c->damageSuffered = in.readUint16BE(); - c->weaponHit = in.readUint16BE(); - c->totalMightModifier = in.readUint16BE(); - c->totalProtectionModifier = in.readUint16BE(); - c->might = in.readUint16BE(); - c->protection = in.readUint16BE(); - c->nextAnimUpdateCountdown = in.readSint16BE(); + c->damageSuffered = in.readUint16(); + c->weaponHit = in.readUint16(); + c->totalMightModifier = in.readUint16(); + c->totalProtectionModifier = in.readUint16(); + c->might = in.readUint16(); + c->protection = in.readUint16(); + c->nextAnimUpdateCountdown = in.readSint16(); for (int ii = 0; ii < 11; ii++) - c->items[ii] = in.readUint16BE(); + c->items[ii] = in.readUint16(); for (int ii = 0; ii < 3; ii++) c->skillLevels[ii] = in.readByte(); for (int ii = 0; ii < 3; ii++) c->skillModifiers[ii] = in.readSByte(); for (int ii = 0; ii < 3; ii++) - c->experiencePts[ii] = in.readUint32BE(); + c->experiencePts[ii] = in.readUint32(); for (int ii = 0; ii < 5; ii++) c->characterUpdateEvents[ii] = in.readByte(); for (int ii = 0; ii < 5; ii++) @@ -96,39 +102,48 @@ } } - in.read(_wllBuffer4, 80); + if (!header.originalSave) + in.read(_wllBuffer4, 80); - _currentBlock = in.readUint16BE(); - _partyPosX = in.readUint16BE(); - _partyPosY = in.readUint16BE(); - _updateFlags = in.readUint16BE(); + _currentBlock = in.readUint16(); + _partyPosX = in.readUint16(); + _partyPosY = in.readUint16(); + _updateFlags = in.readUint16(); _scriptDirection = in.readByte(); _selectedSpell = in.readByte(); + + if (header.originalSave) + in.skip(2); + _sceneDefaultUpdate = in.readByte(); _compassBroken = in.readByte(); _drainMagic = in.readByte(); - _currentDirection = in.readUint16BE(); - _compassDirection = in.readUint16BE(); + _currentDirection = in.readUint16(); + _compassDirection = in.readUint16(); _selectedCharacter = in.readSByte(); + + if (header.originalSave) + in.skip(1); + _currentLevel = in.readByte(); for (int i = 0; i < 48; i++) - _inventory[i] = in.readSint16BE(); - _inventoryCurItem = in.readSint16BE(); - _itemInHand = in.readSint16BE(); - _lastMouseRegion = in.readSint16BE(); + _inventory[i] = in.readSint16(); + _inventoryCurItem = in.readSint16(); + _itemInHand = in.readSint16(); + _lastMouseRegion = in.readSint16(); - if (header.version <= 15) { + if (header.originalSave || header.version <= 15) { uint16 flags[40]; memset(flags, 0, sizeof(flags)); if (header.version == 14) { for (int i = 0; i < 16; i++) - flags[i] = in.readUint16BE(); - flags[26] = in.readUint16BE(); - flags[36] = in.readUint16BE(); - } else if (header.version == 15) { + flags[i] = in.readUint16(); + flags[26] = in.readUint16(); + flags[36] = in.readUint16(); + } else if (header.originalSave || header.version == 15) { for (int i = 0; i < 40; i++) - flags[i] = in.readUint16BE(); + flags[i] = in.readUint16(); } memset(_flagsTable, 0, sizeof(_flagsTable)); @@ -139,37 +154,56 @@ } } } else { - uint32 flagsSize = in.readUint32BE(); + uint32 flagsSize = in.readUint32(); assert(flagsSize <= sizeof(_flagsTable)); in.read(_flagsTable, flagsSize); } + if (header.originalSave) + in.skip(120); + for (int i = 0; i < 24; i++) - _globalScriptVars[i] = in.readUint16BE(); + _globalScriptVars[i] = in.readUint16(); + + if (header.originalSave) + in.skip(152); + _brightness = in.readByte(); _lampOilStatus = in.readByte(); _lampEffect = in.readSByte(); - _credits = in.readUint16BE(); + + if (header.originalSave) + in.skip(1); + + _credits = in.readUint16(); for (int i = 0; i < 8; i++) - _globalScriptVars2[i] = in.readUint16BE(); + _globalScriptVars2[i] = in.readUint16(); in.read(_availableSpells, 7); - _hasTempDataFlags = in.readUint32BE(); + _hasTempDataFlags = in.readUint32(); + + uint8 *origCmp = 0; + if (header.originalSave) { + in.skip(6); + origCmp = new uint8[2496]; + } for (int i = 0; i < 400; i++) { ItemInPlay *t = &_itemsInPlay[i]; - t->nextAssignedObject = in.readUint16BE(); - t->nextDrawObject = in.readUint16BE(); + t->nextAssignedObject = in.readUint16(); + t->nextDrawObject = in.readUint16(); t->flyingHeight = in.readByte(); - t->block = in.readUint16BE(); - t->x = in.readUint16BE(); - t->y = in.readUint16BE(); + t->block = in.readUint16(); + t->x = in.readUint16(); + t->y = in.readUint16(); t->level = in.readSByte(); - t->itemPropertyIndex = in.readUint16BE(); - t->shpCurFrame_flg = in.readUint16BE(); - t->destDirection = in.readByte(); - t->hitOffsX = in.readSByte(); - t->hitOffsY = in.readSByte(); - t->currentSubFrame = in.readByte(); + t->itemPropertyIndex = in.readUint16(); + t->shpCurFrame_flg = in.readUint16(); + if (!header.originalSave) { + t->destDirection = in.readByte(); + t->hitOffsX = in.readSByte(); + t->hitOffsY = in.readSByte(); + t->currentSubFrame = in.readByte(); + } } for (int i = 0; i < 1024; i++) { @@ -179,8 +213,13 @@ } for (int i = 0; i < 29; i++) { - if (!(_hasTempDataFlags & (1 << i))) + if (!(_hasTempDataFlags & (1 << i))) { + if (header.originalSave) { + if (in.size() - in.pos() >= 2500) + in.skip(2500); + } continue; + } if (_lvlTempData[i]) { delete[] _lvlTempData[i]->wallsXorData; @@ -196,21 +235,36 @@ _lvlTempData[i]->monsters = new MonsterInPlay[30]; _lvlTempData[i]->flyingObjects = new FlyingObject[8]; LevelTempData *l = _lvlTempData[i]; + + uint32 next = in.pos() + 2500; + + if (header.originalSave) { + in.skip(4); + in.read(origCmp, in.readUint16()); + _screen->decodeFrame4(origCmp, _tempBuffer5120, 5120); + memcpy(l->wallsXorData, _tempBuffer5120, 4096); + for (int ii = 0; ii < 1024; ii++) + l->flags[ii] = _tempBuffer5120[4096 + ii]; + } else { + in.read(l->wallsXorData, 4096); + for (int ii = 0; ii < 1024; ii++) + l->flags[ii] = in.readByte(); + } - in.read(l->wallsXorData, 4096); - in.read(l->flags, 1024); + if (header.originalSave) + l->monsterDifficulty = in.readUint16(); for (int ii = 0; ii < 30; ii++) { MonsterInPlay *m = &l->monsters[ii]; - m->nextAssignedObject = in.readUint16BE(); - m->nextDrawObject = in.readUint16BE(); + m->nextAssignedObject = in.readUint16(); + m->nextDrawObject = in.readUint16(); m->flyingHeight = in.readByte(); - m->block = in.readUint16BE(); - m->x = in.readUint16BE(); - m->y = in.readUint16BE(); + m->block = in.readUint16(); + m->x = in.readUint16(); + m->y = in.readUint16(); m->shiftStep = in.readSByte(); - m->destX = in.readUint16BE(); - m->destY = in.readUint16BE(); + m->destX = in.readUint16(); + m->destY = in.readUint16(); m->destDirection = in.readByte(); m->hitOffsX = in.readSByte(); m->hitOffsY = in.readSByte(); @@ -220,15 +274,19 @@ m->id = in.readByte(); m->direction = in.readByte(); m->facing = in.readByte(); - m->flags = in.readUint16BE(); - m->damageReceived = in.readUint16BE(); - m->hitPoints = in.readSint16BE(); + m->flags = in.readUint16(); + m->damageReceived = in.readUint16(); + m->hitPoints = in.readSint16(); m->speedTick = in.readByte(); m->type = in.readByte(); + + if (header.originalSave) + in.skip(4); + m->numDistAttacks = in.readByte(); m->curDistWeapon = in.readByte(); m->distAttackTick = in.readSByte(); - m->assignedItems = in.readUint16BE(); + m->assignedItems = in.readUint16(); m->properties = &_monsterProperties[m->type]; in.read(m->equipmentShapes, 4); } @@ -237,10 +295,10 @@ FlyingObject *m = &l->flyingObjects[ii]; m->enable = in.readByte(); m->objectType = in.readByte(); - m->attackerId = in.readUint16BE(); - m->item = in.readSint16BE(); - m->x = in.readUint16BE(); - m->y = in.readUint16BE(); + m->attackerId = in.readUint16(); + m->item = in.readSint16(); + m->x = in.readUint16(); + m->y = in.readUint16(); m->flyingHeight = in.readByte(); m->direction = in.readByte(); m->distance = in.readByte(); @@ -249,9 +307,15 @@ m->flags = in.readByte(); m->wallFlags = in.readByte(); } - l->monsterDifficulty = in.readByte(); + + if (header.originalSave) + in.seek(next, SEEK_SET); + else + l->monsterDifficulty = in.readByte(); } + delete[] origCmp; + calcCharPortraitXpos(); memset(_moneyColumnHeight, 0, sizeof(_moneyColumnHeight)); int t = _credits; @@ -365,6 +429,7 @@ out->writeSByte(t->level); out->writeUint16BE(t->itemPropertyIndex); out->writeUint16BE(t->shpCurFrame_flg); + out->writeByte(t->destDirection); out->writeSByte(t->hitOffsX); out->writeSByte(t->hitOffsY); diff -Nru scummvm-1.4.0/engines/kyra/script_hof.cpp scummvm-1.4.1/engines/kyra/script_hof.cpp --- scummvm-1.4.0/engines/kyra/script_hof.cpp 2011-09-30 11:04:24.000000000 +0000 +++ scummvm-1.4.1/engines/kyra/script_hof.cpp 2012-01-14 09:28:43.000000000 +0000 @@ -1397,7 +1397,6 @@ _screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0); _screen->_curPage = 0; - _screen->setFont(Screen::FID_6_FNT); int y = _lang == 1 ? 70 : 65; for (int i = 0; i < 6; i++) _text->printText(strings[i], _text->getCenterStringX(strings[i], 1, 319), y + i * 10, 255, 207, 0); @@ -1406,7 +1405,7 @@ _screen->updateScreen(); _eventList.clear(); - while (!skipFlag()) + while (!skipFlag() && !shouldQuit()) delay(10); _sound->beginFadeOut(); diff -Nru scummvm-1.4.0/engines/kyra/script_lol.cpp scummvm-1.4.1/engines/kyra/script_lol.cpp --- scummvm-1.4.0/engines/kyra/script_lol.cpp 2011-09-30 11:04:24.000000000 +0000 +++ scummvm-1.4.1/engines/kyra/script_lol.cpp 2012-01-14 09:28:43.000000000 +0000 @@ -124,7 +124,7 @@ int LoLEngine::olol_getWallType(EMCState *script) { debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_getWallType(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); - return _levelBlockProperties[stackPos(0)].walls[stackPos(1) & 3]; + return (int8)_levelBlockProperties[stackPos(0)].walls[stackPos(1) & 3]; } int LoLEngine::olol_drawScene(EMCState *script) { @@ -676,6 +676,8 @@ return _drainMagic; case 13: return getVolume(kVolumeSpeech) - 2; + case 14: + return _tim->_abortFlag; default: break; } @@ -842,7 +844,7 @@ l->direction = l->facing << 1; l->hitPoints = (l->properties->hitPoints * _monsterModifiers[_monsterDifficulty]) >> 8; - if (_currentLevel == 12 && l->type == 2) + if (_currentLevel != 12 || l->type != 2) l->hitPoints = (l->hitPoints * (rollDice(1, 128) + 192)) >> 8; l->numDistAttacks = l->properties->numDistAttacks; @@ -859,7 +861,7 @@ l->destDirection = l->direction; for (int ii = 0; ii < 4; ii++) - l->equipmentShapes[ii] = stackPos(7 + ii); + l->equipmentShapes[ii] = stackPos(7 + ii) & 0xff; checkSceneUpdateNeed(l->block); return i; @@ -2056,17 +2058,16 @@ return 0; ItemInPlay *i = &_itemsInPlay[stackPos(0)]; - int r = stackPos(2) & 0x1fff; + int16 val = stackPos(2); - if (stackPos(1) == 4) { - i->itemPropertyIndex = r; - return r; - } else if (stackPos(1) == 15) { - i->shpCurFrame_flg = (i->shpCurFrame_flg & 0xe000) | r; - return r; - } + if (stackPos(1) == 4) + i->itemPropertyIndex = val; + else if (stackPos(1) == 15) + i->shpCurFrame_flg = (i->shpCurFrame_flg & 0xe000) | (val & 0x1fff); + else + val = -1; - return -1; + return val; } int LoLEngine::olol_placeInventoryItemInHand(EMCState *script) { diff -Nru scummvm-1.4.0/engines/kyra/seqplayer.cpp scummvm-1.4.1/engines/kyra/seqplayer.cpp --- scummvm-1.4.0/engines/kyra/seqplayer.cpp 2011-09-30 11:04:24.000000000 +0000 +++ scummvm-1.4.1/engines/kyra/seqplayer.cpp 2012-01-14 09:28:43.000000000 +0000 @@ -624,7 +624,7 @@ if (_vm->gameFlags().lang == Common::JA_JPN) charStr[1] = _vm->seqTextsTable()[_seqDisplayedText][++_seqDisplayedChar]; _screen->printText(charStr, _seqDisplayedTextX, 180, 0xF, 0xC); - _seqDisplayedTextX += _screen->getCharWidth(charStr[0]); + _seqDisplayedTextX += _screen->getCharWidth((uint8)charStr[0]); ++_seqDisplayedChar; if (_vm->seqTextsTable()[_seqDisplayedText][_seqDisplayedChar] == '\0') diff -Nru scummvm-1.4.0/engines/kyra/sequences_hof.cpp scummvm-1.4.1/engines/kyra/sequences_hof.cpp --- scummvm-1.4.0/engines/kyra/sequences_hof.cpp 2011-09-30 11:04:24.000000000 +0000 +++ scummvm-1.4.1/engines/kyra/sequences_hof.cpp 2012-01-14 09:28:43.000000000 +0000 @@ -2622,7 +2622,7 @@ while (*str2) { cChar[0] = *str2; _screen->printText(cChar, x, y, col1++, 0); - x += _screen->getCharWidth(*str2++); + x += _screen->getCharWidth((uint8)*str2++); } palCycle = true; } else if (!strcmp(str, specialData[1])) { @@ -2631,7 +2631,7 @@ while (*str2) { cChar[0] = *str2; _screen->printText(cChar, x, y, col1--, 0); - x += _screen->getCharWidth(*str2++); + x += _screen->getCharWidth((uint8)*str2++); } palCycle = true; } else { diff -Nru scummvm-1.4.0/engines/sci/engine/kernel.cpp scummvm-1.4.1/engines/sci/engine/kernel.cpp --- scummvm-1.4.0/engines/sci/engine/kernel.cpp 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/engines/sci/engine/kernel.cpp 2012-01-14 09:28:25.000000000 +0000 @@ -914,28 +914,32 @@ // TODO: script_adjust_opcode_formats should probably be part of the // constructor (?) of a VirtualMachine or a ScriptManager class. void script_adjust_opcode_formats() { + + g_sci->_opcode_formats = new opcode_format[128][4]; + memcpy(g_sci->_opcode_formats, g_base_opcode_formats, 128*4*sizeof(opcode_format)); + if (g_sci->_features->detectLofsType() != SCI_VERSION_0_EARLY) { - g_opcode_formats[op_lofsa][0] = Script_Offset; - g_opcode_formats[op_lofss][0] = Script_Offset; + g_sci->_opcode_formats[op_lofsa][0] = Script_Offset; + g_sci->_opcode_formats[op_lofss][0] = Script_Offset; } #ifdef ENABLE_SCI32 // In SCI32, some arguments are now words instead of bytes if (getSciVersion() >= SCI_VERSION_2) { - g_opcode_formats[op_calle][2] = Script_Word; - g_opcode_formats[op_callk][1] = Script_Word; - g_opcode_formats[op_super][1] = Script_Word; - g_opcode_formats[op_send][0] = Script_Word; - g_opcode_formats[op_self][0] = Script_Word; - g_opcode_formats[op_call][1] = Script_Word; - g_opcode_formats[op_callb][1] = Script_Word; + g_sci->_opcode_formats[op_calle][2] = Script_Word; + g_sci->_opcode_formats[op_callk][1] = Script_Word; + g_sci->_opcode_formats[op_super][1] = Script_Word; + g_sci->_opcode_formats[op_send][0] = Script_Word; + g_sci->_opcode_formats[op_self][0] = Script_Word; + g_sci->_opcode_formats[op_call][1] = Script_Word; + g_sci->_opcode_formats[op_callb][1] = Script_Word; } if (getSciVersion() >= SCI_VERSION_3) { // TODO: There are also opcodes in // here to get the superclass, and possibly the species too. - g_opcode_formats[0x4d/2][0] = Script_None; - g_opcode_formats[0x4e/2][0] = Script_None; + g_sci->_opcode_formats[0x4d/2][0] = Script_None; + g_sci->_opcode_formats[0x4e/2][0] = Script_None; } #endif } diff -Nru scummvm-1.4.0/engines/sci/engine/kernel_tables.h scummvm-1.4.1/engines/sci/engine/kernel_tables.h --- scummvm-1.4.0/engines/sci/engine/kernel_tables.h 2011-11-03 18:06:06.000000000 +0000 +++ scummvm-1.4.1/engines/sci/engine/kernel_tables.h 2012-01-14 09:28:43.000000000 +0000 @@ -24,7 +24,7 @@ #define SCI_ENGINE_KERNEL_TABLES_H #include "sci/engine/workarounds.h" -#include "sci/engine/vm.h" // for opcode_formats +#include "sci/engine/vm_types.h" // for opcode_formats namespace Sci { @@ -1116,7 +1116,9 @@ #endif -opcode_format g_opcode_formats[128][4] = { +// Base set of opcode formats. They're copied and adjusted slightly in +// script_adjust_opcode_format depending on SCI version. +static const opcode_format g_base_opcode_formats[128][4] = { /*00*/ {Script_None}, {Script_None}, {Script_None}, {Script_None}, /*04*/ diff -Nru scummvm-1.4.0/engines/sci/engine/scriptdebug.cpp scummvm-1.4.1/engines/sci/engine/scriptdebug.cpp --- scummvm-1.4.0/engines/sci/engine/scriptdebug.cpp 2011-09-30 11:04:24.000000000 +0000 +++ scummvm-1.4.1/engines/sci/engine/scriptdebug.cpp 2012-01-14 09:28:43.000000000 +0000 @@ -122,8 +122,8 @@ #endif i = 0; - while (g_opcode_formats[opcode][i]) { - switch (g_opcode_formats[opcode][i++]) { + while (g_sci->_opcode_formats[opcode][i]) { + switch (g_sci->_opcode_formats[opcode][i++]) { case Script_Invalid: warning("-Invalid operation-"); break; diff -Nru scummvm-1.4.0/engines/sci/engine/vm.cpp scummvm-1.4.1/engines/sci/engine/vm.cpp --- scummvm-1.4.0/engines/sci/engine/vm.cpp 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/engines/sci/engine/vm.cpp 2012-01-14 09:28:43.000000000 +0000 @@ -462,10 +462,10 @@ memset(opparams, 0, 4*sizeof(int16)); - for (int i = 0; g_opcode_formats[opcode][i]; ++i) { + for (int i = 0; g_sci->_opcode_formats[opcode][i]; ++i) { //debugN("Opcode: 0x%x, Opnumber: 0x%x, temp: %d\n", opcode, opcode, temp); assert(i < 3); - switch (g_opcode_formats[opcode][i]) { + switch (g_sci->_opcode_formats[opcode][i]) { case Script_Byte: opparams[i] = src[offset++]; diff -Nru scummvm-1.4.0/engines/sci/engine/vm.h scummvm-1.4.1/engines/sci/engine/vm.h --- scummvm-1.4.0/engines/sci/engine/vm.h 2011-07-27 13:40:24.000000000 +0000 +++ scummvm-1.4.1/engines/sci/engine/vm.h 2012-01-14 09:28:25.000000000 +0000 @@ -139,26 +139,6 @@ GC_INTERVAL = 0x8000 }; -// Opcode formats -enum opcode_format { - Script_Invalid = -1, - Script_None = 0, - Script_Byte, - Script_SByte, - Script_Word, - Script_SWord, - Script_Variable, - Script_SVariable, - Script_SRelative, - Script_Property, - Script_Global, - Script_Local, - Script_Temp, - Script_Param, - Script_Offset, - Script_End -}; - enum sci_opcodes { op_bnot = 0x00, // 000 op_add = 0x01, // 001 @@ -290,8 +270,6 @@ op_minusspi = 0x7f // 127 }; -extern opcode_format g_opcode_formats[128][4]; - void script_adjust_opcode_formats(); /** diff -Nru scummvm-1.4.0/engines/sci/engine/vm_types.h scummvm-1.4.1/engines/sci/engine/vm_types.h --- scummvm-1.4.0/engines/sci/engine/vm_types.h 2011-07-27 13:40:24.000000000 +0000 +++ scummvm-1.4.1/engines/sci/engine/vm_types.h 2012-01-14 09:28:25.000000000 +0000 @@ -172,6 +172,26 @@ NULL_SELECTOR = -1 }; +// Opcode formats +enum opcode_format { + Script_Invalid = -1, + Script_None = 0, + Script_Byte, + Script_SByte, + Script_Word, + Script_SWord, + Script_Variable, + Script_SVariable, + Script_SRelative, + Script_Property, + Script_Global, + Script_Local, + Script_Temp, + Script_Param, + Script_Offset, + Script_End +}; + } // End of namespace Sci diff -Nru scummvm-1.4.0/engines/sci/graphics/palette.cpp scummvm-1.4.1/engines/sci/graphics/palette.cpp --- scummvm-1.4.0/engines/sci/graphics/palette.cpp 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/engines/sci/graphics/palette.cpp 2012-01-14 09:28:43.000000000 +0000 @@ -709,6 +709,13 @@ } void GfxPalette::palVaryInstallTimer() { + // Remove any possible leftover palVary timer callbacks. + // This happens for example in QFG1VGA, when sleeping at Erana's place + // (bug #3439240) - the nighttime to daytime effect clashes with the + // scene transition effect, as we load scene images too quickly for + // the SCI scripts in that case (also refer to kernelPalVaryInit). + palVaryRemoveTimer(); + int16 ticks = _palVaryTicks > 0 ? _palVaryTicks : 1; // Call signal increase every [ticks] g_sci->getTimerManager()->installTimerProc(&palVaryCallback, 1000000 / 60 * ticks, this, "sciPalette"); diff -Nru scummvm-1.4.0/engines/sci/sci.cpp scummvm-1.4.1/engines/sci/sci.cpp --- scummvm-1.4.0/engines/sci/sci.cpp 2011-11-03 18:06:06.000000000 +0000 +++ scummvm-1.4.1/engines/sci/sci.cpp 2012-01-14 09:28:43.000000000 +0000 @@ -90,6 +90,7 @@ _vocabularyLanguage = 1; // we load english vocabulary on startup _eventMan = 0; _console = 0; + _opcode_formats = 0; // Set up the engine specific debug levels DebugMan.addDebugChannel(kDebugLevelError, "Error", "Script error debugging"); @@ -176,6 +177,9 @@ delete _eventMan; delete _gamestate->_segMan; delete _gamestate; + + delete[] _opcode_formats; + delete _resMan; // should be deleted last g_sci = 0; } diff -Nru scummvm-1.4.0/engines/sci/sci.h scummvm-1.4.1/engines/sci/sci.h --- scummvm-1.4.0/engines/sci/sci.h 2011-11-03 18:06:06.000000000 +0000 +++ scummvm-1.4.1/engines/sci/sci.h 2012-01-14 09:28:43.000000000 +0000 @@ -327,6 +327,8 @@ SoundCommandParser *_soundCmd; GameFeatures *_features; + opcode_format (*_opcode_formats)[4]; + DebugState _debugState; Common::MacResManager *getMacExecutable() { return &_macExecutable; } diff -Nru scummvm-1.4.0/engines/sci/sound/midiparser_sci.cpp scummvm-1.4.1/engines/sci/sound/midiparser_sci.cpp --- scummvm-1.4.0/engines/sci/sound/midiparser_sci.cpp 2011-09-30 11:04:24.000000000 +0000 +++ scummvm-1.4.1/engines/sci/sound/midiparser_sci.cpp 2012-01-14 09:28:25.000000000 +0000 @@ -355,17 +355,14 @@ } } - // Send a velocity off signal to all channels - for (int i = 0; i < 15; ++i) { - if (_channelUsed[i]) - sendToDriver(0xB0 | i, 0x4E, 0); // Reset velocity - } - - // Center the pitch wheels and hold pedal in preparation for the next piece of music + // Reset all the parameters of the channels used by this song for (int i = 0; i < 16; ++i) { if (_channelUsed[i]) { - sendToDriver(0xE0 | i, 0, 0x40); // Reset pitch wheel - sendToDriver(0xB0 | i, 0x40, 0); // Reset hold pedal + sendToDriver(0xB0 | i, 0x07, 127); // Reset volume to maximum + sendToDriver(0xB0 | i, 0x0A, 64); // Reset panning to center + sendToDriver(0xB0 | i, 0x40, 0); // Reset hold pedal to none + sendToDriver(0xB0 | i, 0x4E, 0); // Reset velocity to none + sendToDriver(0xE0 | i, 0, 64); // Reset pitch wheel to center } } } diff -Nru scummvm-1.4.0/engines/sci/sound/music.cpp scummvm-1.4.1/engines/sci/sound/music.cpp --- scummvm-1.4.0/engines/sci/sound/music.cpp 2011-11-03 18:06:06.000000000 +0000 +++ scummvm-1.4.1/engines/sci/sound/music.cpp 2012-01-14 09:28:43.000000000 +0000 @@ -37,8 +37,8 @@ namespace Sci { -SciMusic::SciMusic(SciVersion soundVersion) - : _soundVersion(soundVersion), _soundOn(true), _masterVolume(0), _globalReverb(0) { +SciMusic::SciMusic(SciVersion soundVersion, bool useDigitalSFX) + : _soundVersion(soundVersion), _soundOn(true), _masterVolume(0), _globalReverb(0), _useDigitalSFX(useDigitalSFX) { // Reserve some space in the playlist, to avoid expensive insertion // operations @@ -110,8 +110,6 @@ error("Failed to initialize sound driver"); } - _bMultiMidi = ConfMan.getBool("multi_midi"); - // Find out what the first possible channel is (used, when doing channel // remapping). _driverFirstChannel = _pMidiDrv->getFirstChannel(); @@ -273,10 +271,10 @@ SoundResource::Track *track = pSnd->soundRes->getTrackByType(_pMidiDrv->getPlayId()); // If MIDI device is selected but there is no digital track in sound - // resource try to use adlib's digital sample if possible. Also, if the + // resource try to use Adlib's digital sample if possible. Also, if the // track couldn't be found, load the digital track, as some games depend on // this (e.g. the Longbow demo). - if (!track || (_bMultiMidi && track->digitalChannelNr == -1)) { + if (!track || (_useDigitalSFX && track->digitalChannelNr == -1)) { SoundResource::Track *digital = pSnd->soundRes->getDigitalTrack(); if (digital) track = digital; diff -Nru scummvm-1.4.0/engines/sci/sound/music.h scummvm-1.4.1/engines/sci/sound/music.h --- scummvm-1.4.0/engines/sci/sound/music.h 2011-11-03 18:06:06.000000000 +0000 +++ scummvm-1.4.1/engines/sci/sound/music.h 2012-01-14 09:28:43.000000000 +0000 @@ -120,7 +120,7 @@ class SciMusic : public Common::Serializable { public: - SciMusic(SciVersion soundVersion); + SciMusic(SciVersion soundVersion, bool useDigitalSFX); ~SciMusic(); void init(); @@ -210,9 +210,8 @@ MidiPlayer *_pMidiDrv; uint32 _dwTempo; - // Mixed AdLib/MIDI mode: when enabled from the ScummVM sound options screen, - // and a sound has a digital track, the sound from the AdLib track is played - bool _bMultiMidi; + // If true and a sound has a digital track, the sound from the AdLib track is played + bool _useDigitalSFX; private: MusicList _playList; diff -Nru scummvm-1.4.0/engines/sci/sound/soundcmd.cpp scummvm-1.4.1/engines/sci/sound/soundcmd.cpp --- scummvm-1.4.0/engines/sci/sound/soundcmd.cpp 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/engines/sci/sound/soundcmd.cpp 2012-01-14 09:28:25.000000000 +0000 @@ -32,20 +32,29 @@ namespace Sci { +//#define ENABLE_SFX_TYPE_SELECTION + SoundCommandParser::SoundCommandParser(ResourceManager *resMan, SegManager *segMan, Kernel *kernel, AudioPlayer *audio, SciVersion soundVersion) : _resMan(resMan), _segMan(segMan), _kernel(kernel), _audio(audio), _soundVersion(soundVersion) { - _music = new SciMusic(_soundVersion); - _music->init(); +#ifdef ENABLE_SFX_TYPE_SELECTION // Check if the user wants synthesized or digital sound effects in SCI1.1 // or later games - _bMultiMidi = ConfMan.getBool("multi_midi"); + _useDigitalSFX = ConfMan.getBool("multi_midi"); + // In SCI2 and later games, this check should always be true - there was // always only one version of each sound effect or digital music track // (e.g. the menu music in GK1 - there is a sound effect with the same // resource number, but it's totally unrelated to the menu music). if (getSciVersion() >= SCI_VERSION_2) - _bMultiMidi = true; + _useDigitalSFX = true; +#else + // Always prefer digital sound effects + _useDigitalSFX = true; +#endif + + _music = new SciMusic(_soundVersion, _useDigitalSFX); + _music->init(); } SoundCommandParser::~SoundCommandParser() { @@ -93,7 +102,7 @@ // Found a relevant audio resource, create an audio stream if there is // no associated sound resource, or if both resources exist and the // user wants the digital version. - if (_bMultiMidi || !newSound->soundRes) { + if (_useDigitalSFX || !newSound->soundRes) { int sampleLen; newSound->pStreamAud = _audio->getAudioStream(newSound->resourceId, 65535, &sampleLen); newSound->soundType = Audio::Mixer::kSpeechSoundType; @@ -485,7 +494,7 @@ } else { // Slot actually has no data (which would mean that a sound-resource w/ // unsupported data is used. - // (example lsl5 - sound resource 744 - it's roland exclusive + // (example lsl5 - sound resource 744 - it's Roland exclusive writeSelectorValue(_segMan, obj, SELECTOR(signal), SIGNAL_OFFSET); // If we don't set signal here, at least the switch to the mud wrestling // room in lsl5 will not work. diff -Nru scummvm-1.4.0/engines/sci/sound/soundcmd.h scummvm-1.4.1/engines/sci/sound/soundcmd.h --- scummvm-1.4.0/engines/sci/sound/soundcmd.h 2011-09-30 11:04:24.000000000 +0000 +++ scummvm-1.4.1/engines/sci/sound/soundcmd.h 2012-01-14 09:28:25.000000000 +0000 @@ -111,7 +111,9 @@ SciMusic *_music; AudioPlayer *_audio; SciVersion _soundVersion; - bool _bMultiMidi; + // If true and an alternative digital sound effect exists, the digital + // sound effect is preferred instead + bool _useDigitalSFX; void processInitSound(reg_t obj); void processDisposeSound(reg_t obj); diff -Nru scummvm-1.4.0/engines/scumm/saveload.cpp scummvm-1.4.1/engines/scumm/saveload.cpp --- scummvm-1.4.0/engines/scumm/saveload.cpp 2011-11-03 18:06:06.000000000 +0000 +++ scummvm-1.4.1/engines/scumm/saveload.cpp 2012-01-14 09:28:25.000000000 +0000 @@ -1286,17 +1286,35 @@ // // Save/load palette data - // - if (_16BitPalette && !(_game.platform == Common::kPlatformFMTowns && s->isLoading() && s->getVersion() < VER(82))) { + // Don't save 16 bit palette in FM-Towns and PCE games, since it gets regenerated afterwards anyway. + if (_16BitPalette && !(_game.platform == Common::kPlatformFMTowns && s->getVersion() < VER(82)) && !((_game.platform == Common::kPlatformFMTowns || _game.platform == Common::kPlatformPCEngine) && s->getVersion() > VER(87))) { s->saveLoadArrayOf(_16BitPalette, 512, sizeof(_16BitPalette[0]), sleUint16); } -#ifndef DISABLE_TOWNS_DUAL_LAYER_MODE + // FM-Towns specific (extra palette data, color cycle data, etc.) // In earlier save game versions (below 87) the FM-Towns specific data would get saved (and loaded) even in non FM-Towns games. // This would cause an unnecessary save file incompatibility between DS (which uses the DISABLE_TOWNS_DUAL_LAYER_MODE setting) // and other ports. - if (((_game.platform == Common::kPlatformFMTowns) && (s->getVersion() >= VER(87))) || ((s->getVersion() >= VER(82)) && (s->getVersion() < VER(87)))) { + // In version 88 and later the save files from FM-Towns targets are compatible between DS and other platforms, too. + +#ifdef DISABLE_TOWNS_DUAL_LAYER_MODE + byte hasTownsData = 0; + if (_game.platform == Common::kPlatformFMTowns && s->getVersion() > VER(87)) + s->saveLoadArrayOf(&hasTownsData, 1, sizeof(byte), sleByte); + + if (hasTownsData) { + // Skip FM-Towns specific data + for (int i = 69 * sizeof(uint8) + 44 * sizeof(int16); i; i--) + s->loadByte(); + } + +#else + byte hasTownsData = ((_game.platform == Common::kPlatformFMTowns && s->getVersion() >= VER(87)) || (s->getVersion() >= VER(82) && s->getVersion() < VER(87))) ? 1 : 0; + if (_game.platform == Common::kPlatformFMTowns && s->getVersion() > VER(87)) + s->saveLoadArrayOf(&hasTownsData, 1, sizeof(byte), sleByte); + + if (hasTownsData) { const SaveLoadEntry townsFields[] = { MKLINE(Common::Rect, left, sleInt16, VER(82)), MKLINE(Common::Rect, top, sleInt16, VER(82)), @@ -1319,6 +1337,8 @@ s->saveLoadArrayOf(&_curStringRect, 1, sizeof(_curStringRect), townsFields); s->saveLoadArrayOf(_townsCharsetColorMap, 16, sizeof(_townsCharsetColorMap[0]), sleUint8); s->saveLoadEntries(this, townsExtraEntries); + } else if (_game.platform == Common::kPlatformFMTowns && s->getVersion() >= VER(82)) { + warning("Save file is missing FM-Towns specific graphic data (game was apparently saved on another platform)"); } #endif diff -Nru scummvm-1.4.0/engines/scumm/saveload.h scummvm-1.4.1/engines/scumm/saveload.h --- scummvm-1.4.0/engines/scumm/saveload.h 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/engines/scumm/saveload.h 2012-01-14 09:28:25.000000000 +0000 @@ -47,7 +47,7 @@ * only saves/loads those which are valid for the version of the savegame * which is being loaded/saved currently. */ -#define CURRENT_VER 87 +#define CURRENT_VER 88 /** * An auxillary macro, used to specify savegame versions. We use this instead diff -Nru scummvm-1.4.0/engines/sky/music/adlibmusic.cpp scummvm-1.4.1/engines/sky/music/adlibmusic.cpp --- scummvm-1.4.0/engines/sky/music/adlibmusic.cpp 2011-07-27 13:40:24.000000000 +0000 +++ scummvm-1.4.1/engines/sky/music/adlibmusic.cpp 2012-01-14 09:28:25.000000000 +0000 @@ -30,9 +30,8 @@ namespace Sky { -AdLibMusic::AdLibMusic(Audio::Mixer *pMixer, Disk *pDisk) : MusicBase(pDisk) { +AdLibMusic::AdLibMusic(Audio::Mixer *pMixer, Disk *pDisk) : MusicBase(pMixer, pDisk) { _driverFileBase = 60202; - _mixer = pMixer; _sampleRate = pMixer->getOutputRate(); _opl = makeAdLibOPL(_sampleRate); diff -Nru scummvm-1.4.0/engines/sky/music/adlibmusic.h scummvm-1.4.1/engines/sky/music/adlibmusic.h --- scummvm-1.4.0/engines/sky/music/adlibmusic.h 2011-07-27 13:40:24.000000000 +0000 +++ scummvm-1.4.1/engines/sky/music/adlibmusic.h 2012-01-14 09:28:25.000000000 +0000 @@ -26,7 +26,6 @@ #include "sky/music/musicbase.h" #include "audio/audiostream.h" #include "audio/fmopl.h" -#include "audio/mixer.h" namespace Sky { @@ -44,7 +43,6 @@ private: FM_OPL *_opl; - Audio::Mixer *_mixer; Audio::SoundHandle _soundHandle; uint8 *_initSequence; uint32 _sampleRate, _nextMusicPoll; diff -Nru scummvm-1.4.0/engines/sky/music/gmmusic.cpp scummvm-1.4.1/engines/sky/music/gmmusic.cpp --- scummvm-1.4.0/engines/sky/music/gmmusic.cpp 2011-07-27 13:40:24.000000000 +0000 +++ scummvm-1.4.1/engines/sky/music/gmmusic.cpp 2012-01-14 09:28:25.000000000 +0000 @@ -34,7 +34,7 @@ ((GmMusic*)param)->timerCall(); } -GmMusic::GmMusic(MidiDriver *pMidiDrv, Disk *pDisk) : MusicBase(pDisk) { +GmMusic::GmMusic(MidiDriver *pMidiDrv, Audio::Mixer *pMixer, Disk *pDisk) : MusicBase(pMixer, pDisk) { _driverFileBase = 60200; _midiDrv = pMidiDrv; int midiRes = _midiDrv->open(); diff -Nru scummvm-1.4.0/engines/sky/music/gmmusic.h scummvm-1.4.1/engines/sky/music/gmmusic.h --- scummvm-1.4.0/engines/sky/music/gmmusic.h 2011-07-27 13:40:24.000000000 +0000 +++ scummvm-1.4.1/engines/sky/music/gmmusic.h 2012-01-14 09:28:25.000000000 +0000 @@ -31,7 +31,7 @@ class GmMusic : public MusicBase { public: - GmMusic(MidiDriver *pMidiDrv, Disk *pDisk); + GmMusic(MidiDriver *pMidiDrv, Audio::Mixer *pMixer, Disk *pDisk); ~GmMusic(); virtual void setVolume(uint16 param); private: diff -Nru scummvm-1.4.0/engines/sky/music/mt32music.cpp scummvm-1.4.1/engines/sky/music/mt32music.cpp --- scummvm-1.4.0/engines/sky/music/mt32music.cpp 2011-07-27 13:40:24.000000000 +0000 +++ scummvm-1.4.1/engines/sky/music/mt32music.cpp 2012-01-14 09:28:25.000000000 +0000 @@ -34,7 +34,7 @@ ((MT32Music*)param)->timerCall(); } -MT32Music::MT32Music(MidiDriver *pMidiDrv, Disk *pDisk) : MusicBase(pDisk) { +MT32Music::MT32Music(MidiDriver *pMidiDrv, Audio::Mixer *pMixer, Disk *pDisk) : MusicBase(pMixer, pDisk) { _driverFileBase = 60200; _midiDrv = pMidiDrv; int midiRes = _midiDrv->open(); diff -Nru scummvm-1.4.0/engines/sky/music/mt32music.h scummvm-1.4.1/engines/sky/music/mt32music.h --- scummvm-1.4.0/engines/sky/music/mt32music.h 2011-07-27 13:40:24.000000000 +0000 +++ scummvm-1.4.1/engines/sky/music/mt32music.h 2012-01-14 09:28:25.000000000 +0000 @@ -31,7 +31,7 @@ class MT32Music : public MusicBase { public: - MT32Music(MidiDriver *pMidiDrv, Disk *pDisk); + MT32Music(MidiDriver *pMidiDrv, Audio::Mixer *pMixer, Disk *pDisk); ~MT32Music(); private: static void passTimerFunc(void *param); diff -Nru scummvm-1.4.0/engines/sky/music/musicbase.cpp scummvm-1.4.1/engines/sky/music/musicbase.cpp --- scummvm-1.4.0/engines/sky/music/musicbase.cpp 2011-07-27 13:40:24.000000000 +0000 +++ scummvm-1.4.1/engines/sky/music/musicbase.cpp 2012-01-14 09:28:25.000000000 +0000 @@ -25,11 +25,13 @@ #include "common/util.h" #include "common/endian.h" #include "common/textconsole.h" +#include "audio/audiostream.h" namespace Sky { -MusicBase::MusicBase(Disk *pDisk) { +MusicBase::MusicBase(Audio::Mixer *pMixer, Disk *pDisk) { _musicData = NULL; + _mixer = pMixer; _skyDisk = pDisk; _currentMusic = 0; _musicVolume = 127; @@ -59,6 +61,8 @@ } bool MusicBase::musicIsPlaying() { + if (_mixer->isSoundHandleActive(_musicHandle)) + return true; for (uint8 cnt = 0; cnt < _numberOfChannels; cnt++) if (_channels[cnt]->isActive()) return true; @@ -71,6 +75,8 @@ } void MusicBase::stopMusicInternal() { + _mixer->stopHandle(_musicHandle); + for (uint8 cnt = 0; cnt < _numberOfChannels; cnt++) delete _channels[cnt]; _numberOfChannels = 0; @@ -94,18 +100,56 @@ _currentMusic = _onNextPoll.musicToProcess; - if (_currentMusic != 0) { - musicPos = READ_LE_UINT16(_musicData + _musicDataLoc + 1); - musicPos += _musicDataLoc + ((_currentMusic - 1) << 1); - musicPos = READ_LE_UINT16(_musicData + musicPos) + _musicDataLoc; + if (_currentMusic == 0) + return; + + // Try playing digital audio first (from the Music Enhancement Project). + // TODO: This always prefers digital music over the MIDI music types! + uint8 section = _currentSection; + uint8 song = _currentMusic; + // handle duplicates + if ((section == 2 && song == 1) || (section == 5 && song == 1)) { + section = 1; + song = 1; + } else if ((section == 2 && song == 4) || (section == 5 && song == 4)) { + section = 1; + song = 4; + } else if (section == 5 && song == 6) { + section = 4; + song = 4; + } else if (section == 0 && song == 1) { + // floppy intro + section = 5; + song = 3; + } + Common::String trackName = Common::String::format("music_%d%02d", section, song); + Audio::SeekableAudioStream *stream = Audio::SeekableAudioStream::openStreamFile(trackName); + if (stream) { + // not all tracks should loop + bool loops = true; + if ((section == 0 && song == 1) + || (section == 1 && song == 1) || (section == 1 && song == 4) + || (section == 2 && song == 1) || (section == 2 && song == 4) + || (section == 4 && song == 2) || (section == 4 && song == 3) + || (section == 4 && song == 5) || (section == 4 && song == 6) + || (section == 4 && song == 11) || (section == 5 && song == 1) + || (section == 5 && song == 3) || (section == 5 && song == 4)) + loops = false; + _mixer->playStream(Audio::Mixer::kMusicSoundType, &_musicHandle, Audio::makeLoopingAudioStream(stream, loops ? 0 : 1)); + return; + } + + // no digital audio, resort to MIDI playback + musicPos = READ_LE_UINT16(_musicData + _musicDataLoc + 1); + musicPos += _musicDataLoc + ((_currentMusic - 1) << 1); + musicPos = READ_LE_UINT16(_musicData + musicPos) + _musicDataLoc; - _musicTempo0 = _musicData[musicPos]; - _musicTempo1 = _musicData[musicPos+1]; + _musicTempo0 = _musicData[musicPos]; + _musicTempo1 = _musicData[musicPos+1]; - setupChannels(_musicData + musicPos + 2); + setupChannels(_musicData + musicPos + 2); - updateTempo(); - } + updateTempo(); } void MusicBase::pollMusic() { diff -Nru scummvm-1.4.0/engines/sky/music/musicbase.h scummvm-1.4.1/engines/sky/music/musicbase.h --- scummvm-1.4.0/engines/sky/music/musicbase.h 2011-07-27 13:40:24.000000000 +0000 +++ scummvm-1.4.1/engines/sky/music/musicbase.h 2012-01-14 09:28:25.000000000 +0000 @@ -27,6 +27,8 @@ #include "common/scummsys.h" #include "common/mutex.h" +#include "audio/mixer.h" + namespace Sky { class Disk; @@ -48,7 +50,7 @@ class MusicBase { public: - MusicBase(Disk *pDisk); + MusicBase(Audio::Mixer *pMixer, Disk *pDisk); virtual ~MusicBase(); void loadSection(uint8 pSection); void startMusic(uint16 param); @@ -60,6 +62,7 @@ protected: + Audio::Mixer *_mixer; Disk *_skyDisk; uint8 *_musicData; @@ -75,6 +78,7 @@ Actions _onNextPoll; ChannelBase *_channels[10]; Common::Mutex _mutex; + Audio::SoundHandle _musicHandle; virtual void setupPointers() = 0; virtual void setupChannels(uint8 *channelData) = 0; diff -Nru scummvm-1.4.0/engines/sky/sky.cpp scummvm-1.4.1/engines/sky/sky.cpp --- scummvm-1.4.0/engines/sky/sky.cpp 2011-07-27 13:40:24.000000000 +0000 +++ scummvm-1.4.1/engines/sky/sky.cpp 2012-01-14 09:28:25.000000000 +0000 @@ -268,9 +268,9 @@ } else { _systemVars.systemFlags |= SF_ROLAND; if ((MidiDriver::getMusicType(dev) == MT_MT32) || ConfMan.getBool("native_mt32")) - _skyMusic = new MT32Music(MidiDriver::createMidi(dev), _skyDisk); + _skyMusic = new MT32Music(MidiDriver::createMidi(dev), _mixer, _skyDisk); else - _skyMusic = new GmMusic(MidiDriver::createMidi(dev), _skyDisk); + _skyMusic = new GmMusic(MidiDriver::createMidi(dev), _mixer, _skyDisk); } if (isCDVersion()) { diff -Nru scummvm-1.4.0/engines/sword2/sprite.cpp scummvm-1.4.1/engines/sword2/sprite.cpp --- scummvm-1.4.0/engines/sword2/sprite.cpp 2011-07-27 13:40:24.000000000 +0000 +++ scummvm-1.4.1/engines/sword2/sprite.cpp 2012-01-14 09:28:44.000000000 +0000 @@ -762,14 +762,18 @@ src = sprite + rs.top * srcPitch + rs.left; dst = _buffer + _screenWide * rd.top + rd.left; - if (s->type & RDSPR_BLEND && !Sword2Engine::isPsx()) { // Blending is unavailable in PSX version + if (s->type & RDSPR_BLEND) { // The original code had two different blending cases. One for // s->blend & 0x01 and one for s->blend & 0x02. However, the // only values that actually appear in the cluster files are // 0, 513 and 1025 so the s->blend & 0x02 case was never used. // Which is just as well since that code made no sense to me. - if (!(_renderCaps & RDBLTFX_SPRITEBLEND)) { + // TODO: In PSX version, blending is done through hardware transparency. + // The only correct way to simulate this would be using 16-bit mode. + // As this is not yet available for this engine, fake transparency is used + // as placeholder. + if (!(_renderCaps & RDBLTFX_SPRITEBLEND) || Sword2Engine::isPsx()) { for (i = 0; i < rs.height(); i++) { for (j = 0; j < rs.width(); j++) { if (src[j] && ((i & 1) == (j & 1))) diff -Nru scummvm-1.4.0/gui/about.cpp scummvm-1.4.1/gui/about.cpp --- scummvm-1.4.0/gui/about.cpp 2011-07-27 13:40:25.000000000 +0000 +++ scummvm-1.4.1/gui/about.cpp 2012-01-14 09:28:25.000000000 +0000 @@ -54,7 +54,7 @@ static const char *copyright_text[] = { "", -"C0""Copyright (C) 2001-2011 The ScummVM project", +"C0""Copyright (C) 2001-2012 The ScummVM project", "C0""http://www.scummvm.org", "", "C0""ScummVM is the legal property of its developers, whose names are too numerous to list here. Please refer to the COPYRIGHT file distributed with this binary.", Binary files /tmp/ypYe3PLsEh/scummvm-1.4.0/gui/themes/translations.dat and /tmp/jSrkwi5uGW/scummvm-1.4.1/gui/themes/translations.dat differ diff -Nru scummvm-1.4.0/NEWS scummvm-1.4.1/NEWS --- scummvm-1.4.0/NEWS 2011-11-03 18:06:06.000000000 +0000 +++ scummvm-1.4.1/NEWS 2012-01-14 09:28:43.000000000 +0000 @@ -1,6 +1,33 @@ For a more comprehensive changelog of the latest experimental code, see: https://github.com/scummvm/scummvm/commits/ +1.4.1 (2012-01-27) + AGOS: + - Fixed loading videos directly from InstallShield cabinets in the Windows + version of the The Feeble Files. + + BASS: + - Added support for Enhanced Music by James Woodcock + (http://www.jameswoodcock.co.uk/?p=7695). + + Broken Sword 2: + - Slight graphics improvement for PSX version. + + KYRA: + - Fixed bug in the original Lands of Lore GUI which made ScummVM error out + in the case the user did not have a contiguous save slot usage. + - Add support for original DOS Lands of Lore save files (also applies to save + files made with the GOG release). + + SCI: + - Fixed race condition in SCI1.1 palette changes. This fixes an error in + QFG1VGA, when sleeping at Erana's place. + - The option to toggle sound effect types between digitized and synthesized + has been disabled until a more user-friendly GUI option is possible. + Digital sound effects are always preferred for now. + - Fixed a case where starting a new song didn't fully reset its channels, + thus some notes sounded wrong. + 1.4.0 (2011-11-11) New Games: - Added support for Lands of Lore: The Throne of Chaos. diff -Nru scummvm-1.4.0/po/ca_ES.po scummvm-1.4.1/po/ca_ES.po --- scummvm-1.4.0/po/ca_ES.po 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/po/ca_ES.po 2012-01-14 09:28:44.000000000 +0000 @@ -1,5 +1,5 @@ # Catalan translation for ScummVM. -# Copyright (C) 2007-2011 ScummVM Team +# Copyright (C) 2007-2012 ScummVM Team # This file is distributed under the same license as the ScummVM package. # Jordi Vilalta Prat , 2007-2011. # diff -Nru scummvm-1.4.0/po/cs_CZ.po scummvm-1.4.1/po/cs_CZ.po --- scummvm-1.4.0/po/cs_CZ.po 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/po/cs_CZ.po 2012-01-14 09:28:44.000000000 +0000 @@ -1,5 +1,5 @@ # Czech translation for ScummVM. -# Copyright (C) 2001-2011 ScummVM Team +# Copyright (C) 2001-2012 ScummVM Team # This file is distributed under the same license as the ScummVM package. # Zbynìk Schwarz , 2011. # diff -Nru scummvm-1.4.0/po/da_DA.po scummvm-1.4.1/po/da_DA.po --- scummvm-1.4.0/po/da_DA.po 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/po/da_DA.po 2012-01-14 09:28:44.000000000 +0000 @@ -1,7 +1,7 @@ -# Copyright (C) 2010 ScummVM Team -# This file is distributed under the same license as the ScummVM package. -# Steffen Nyeland , 2010. -# +# Copyright (C) 2010-2012 ScummVM Team +# This file is distributed under the same license as the ScummVM package. +# Steffen Nyeland , 2010. +# msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" diff -Nru scummvm-1.4.0/po/de_DE.po scummvm-1.4.1/po/de_DE.po --- scummvm-1.4.0/po/de_DE.po 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/po/de_DE.po 2012-01-14 09:28:44.000000000 +0000 @@ -1,8 +1,8 @@ -# German translation for ScummVM. -# Copyright (C) 2010-2011 ScummVM Team -# This file is distributed under the same license as the ScummVM package. -# Simon Sawatzki , Lothar Serra Mari , 2011. -# +# German translation for ScummVM. +# Copyright (C) 2010-2012 ScummVM Team +# This file is distributed under the same license as the ScummVM package. +# Simon Sawatzki , Lothar Serra Mari , 2011. +# msgid "" msgstr "" "Project-Id-Version: ScummVM 1.4.0git\n" diff -Nru scummvm-1.4.0/po/es_ES.po scummvm-1.4.1/po/es_ES.po --- scummvm-1.4.0/po/es_ES.po 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/po/es_ES.po 2012-01-14 09:28:44.000000000 +0000 @@ -1,5 +1,5 @@ # Spanish translation for ScummVM. -# Copyright (C) 2010-2011 ScummVM Team +# Copyright (C) 2010-2012 ScummVM Team # This file is distributed under the same license as the ScummVM package. # Tomás Maidagan, 2011. # @@ -8,7 +8,7 @@ "Project-Id-Version: ScummVM 1.4.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" "POT-Creation-Date: 2011-10-19 13:42+0100\n" -"PO-Revision-Date: 2011-10-23 21:53+0100\n" +"PO-Revision-Date: 2011-11-30 19:16+0100\n" "Last-Translator: Tomás Maidagan\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -682,7 +682,7 @@ #: gui/options.cpp:810 gui/options.cpp:871 msgid "Use first available device" -msgstr "Utilizar el primer dispositivo disponible" +msgstr "Usar el primer dispositivo disponible" #: gui/options.cpp:822 msgid "SoundFont:" @@ -894,7 +894,7 @@ #: gui/options.cpp:1295 msgid "You have to restart ScummVM before your changes will take effect." -msgstr "Tienes que reiniciar ScummVM para que los cambios surjan efecto." +msgstr "Tienes que reiniciar ScummVM para aplicar los cambios." #: gui/options.cpp:1308 msgid "Select directory for savegames" @@ -1241,8 +1241,8 @@ "not work in future versions of ScummVM." msgstr "" "AVISO: El juego que vas a ejecutar aún no es totalmente compatible con " -"ScummVM. Por lo tanto, puede que sea inestable, y que las partidas que " -"guardes no funcionen en versiones futuras de ScummVM." +"ScummVM. Por lo tanto, puede que sea inestable y que las partidas que " +"guardes no funcionen en futuras versiones de ScummVM." #: engines/engine.cpp:436 msgid "Start anyway" @@ -2106,7 +2106,7 @@ #: engines/parallaction/saveload.cpp:326 msgid "ScummVM successfully converted all your savefiles." -msgstr "ScummVM ha convertido todas las partidas guardadas correctamente." +msgstr "ScummVM ha convertido correctamente todas las partidas guardadas." #: engines/parallaction/saveload.cpp:328 msgid "" @@ -2315,7 +2315,7 @@ #: backends/platform/sdl/macosx/appmenu_osx.mm:67 msgid "Hide ScummVM" -msgstr "Oculta ScummVM" +msgstr "Ocultar ScummVM" #: backends/platform/sdl/macosx/appmenu_osx.mm:70 msgid "Hide Others" @@ -2760,7 +2760,7 @@ #: backends/updates/macosx/macosx-updates.mm:65 msgid "Check for Updates..." -msgstr "Comprobando las actualizaciones..." +msgstr "Comprobar las actualizaciones..." #: backends/platform/bada/form.cpp:269 msgid "Right Click Once" diff -Nru scummvm-1.4.0/po/fr_FR.po scummvm-1.4.1/po/fr_FR.po --- scummvm-1.4.0/po/fr_FR.po 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/po/fr_FR.po 2012-01-14 09:28:44.000000000 +0000 @@ -1,5 +1,5 @@ # French translation for ScummVM. -# Copyright (C) 2010-2011 ScummVM Team +# Copyright (C) 2010-2012 ScummVM Team # This file is distributed under the same license as the ScummVM package. # Thierry Crozat , 2011. # diff -Nru scummvm-1.4.0/po/hu_HU.po scummvm-1.4.1/po/hu_HU.po --- scummvm-1.4.0/po/hu_HU.po 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/po/hu_HU.po 2012-01-14 09:28:44.000000000 +0000 @@ -1,5 +1,5 @@ # Hungarian translation for ScummVM. -# Copyright (C) 2010-2011 ScummVM Team +# Copyright (C) 2010-2012 ScummVM Team # This file is distributed under the same license as the ScummVM package. # George Kormendi , 2010. # diff -Nru scummvm-1.4.0/po/it_IT.po scummvm-1.4.1/po/it_IT.po --- scummvm-1.4.0/po/it_IT.po 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/po/it_IT.po 2012-01-14 09:28:44.000000000 +0000 @@ -1,5 +1,5 @@ # Italian translation for ScummVM. -# Copyright (C) 2010-2011 ScummVM Team +# Copyright (C) 2010-2012 ScummVM Team # This file is distributed under the same license as the ScummVM package. # Matteo 'Maff' Angelino , 2010. # diff -Nru scummvm-1.4.0/po/nb_NO.po scummvm-1.4.1/po/nb_NO.po --- scummvm-1.4.0/po/nb_NO.po 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/po/nb_NO.po 2012-01-14 09:28:44.000000000 +0000 @@ -1,8 +1,8 @@ -# Norwegian (Bokmaal) translation for ScummVM. -# Copyright (C) 2010 ScummVM Team -# This file is distributed under the same license as the ScummVM package. -# Einar Johan T. Sømåen , 2010. -# +# Norwegian (Bokmaal) translation for ScummVM. +# Copyright (C) 2010-2012 ScummVM Team +# This file is distributed under the same license as the ScummVM package. +# Einar Johan T. Sømåen , 2010. +# msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" diff -Nru scummvm-1.4.0/po/nn_NO.po scummvm-1.4.1/po/nn_NO.po --- scummvm-1.4.0/po/nn_NO.po 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/po/nn_NO.po 2012-01-14 09:28:44.000000000 +0000 @@ -1,8 +1,8 @@ -# Norwegian (Nynorsk) translation for ScummVM. -# Copyright (C) 2010 ScummVM Team -# This file is distributed under the same license as the ScummVM package. -# Einar Johan T. Sømåen , 2010. -# +# Norwegian (Nynorsk) translation for ScummVM. +# Copyright (C) 2010-2012 ScummVM Team +# This file is distributed under the same license as the ScummVM package. +# Einar Johan T. Sømåen , 2010. +# msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" diff -Nru scummvm-1.4.0/po/pl_PL.po scummvm-1.4.1/po/pl_PL.po --- scummvm-1.4.0/po/pl_PL.po 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/po/pl_PL.po 2012-01-14 09:28:44.000000000 +0000 @@ -1,5 +1,5 @@ # Polish translation for ScummVM. -# Copyright (C) 2010-2011 ScummVM Team +# Copyright (C) 2010-2012 ScummVM Team # This file is distributed under the same license as the ScummVM package. # Grajpopolsku.pl , 2011. # diff -Nru scummvm-1.4.0/po/pt_BR.po scummvm-1.4.1/po/pt_BR.po --- scummvm-1.4.0/po/pt_BR.po 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/po/pt_BR.po 2012-01-14 09:28:44.000000000 +0000 @@ -1,5 +1,5 @@ # Portuguese (Brazilian) translation for ScummVM. -# Copyright (C) 2010-2011 ScummVM Team +# Copyright (C) 2010-2012 ScummVM Team # This file is distributed under the same license as the ScummVM package. # Saulo Benigno , 2010. # diff -Nru scummvm-1.4.0/po/ru_RU.po scummvm-1.4.1/po/ru_RU.po --- scummvm-1.4.0/po/ru_RU.po 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/po/ru_RU.po 2012-01-14 09:28:44.000000000 +0000 @@ -1,8 +1,8 @@ -# Russian translation for ScummVM. -# Copyright (C) 2010-2011 ScummVM Team -# This file is distributed under the same license as the ScummVM package. -# Eugene Sandulenko , 2010. -# +# Russian translation for ScummVM. +# Copyright (C) 2010-2012 ScummVM Team +# This file is distributed under the same license as the ScummVM package. +# Eugene Sandulenko , 2010. +# msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" diff -Nru scummvm-1.4.0/po/se_SE.po scummvm-1.4.1/po/se_SE.po --- scummvm-1.4.0/po/se_SE.po 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/po/se_SE.po 2012-01-14 09:28:44.000000000 +0000 @@ -1,20 +1,20 @@ -# Swedish translation for ScummVM. -# Copyright (C) 2011 ScummVM Team -# This file is distributed under the same license as the ScummVM package. -# Hampus Flink , 2011. -# +# Swedish translation for ScummVM. +# Copyright (C) 2011-2012 ScummVM Team +# This file is distributed under the same license as the ScummVM package. +# Hampus Flink , 2011. +# msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" "POT-Creation-Date: 2011-10-19 13:42+0100\n" -"PO-Revision-Date: 2011-05-02 13:07+0100\n" +"PO-Revision-Date: 2011-11-27 19:00+0100\n" "Last-Translator: Hampus Flink \n" "Language-Team: \n" -"Language: Svenska\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"Language: Svenska\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" "X-Poedit-Language: Swedish\n" "X-Poedit-Country: SWEDEN\n" @@ -23,10 +23,9 @@ #: gui/about.cpp:91 #, c-format msgid "(built on %s)" -msgstr "(byggt på %s)" +msgstr "(byggt %s)" #: gui/about.cpp:98 -#, fuzzy msgid "Features compiled in:" msgstr "Funktioner kompilerade i:" @@ -516,7 +515,7 @@ #: gui/massadd.cpp:261 #, c-format msgid "Discovered %d new games, ignored %d previously added games." -msgstr "" +msgstr "Upptäckte %n nya spel. Ignorerade %d tidigare tillagda spel." #: gui/massadd.cpp:265 #, c-format @@ -524,9 +523,9 @@ msgstr "Kataloger scannade: %d ..." #: gui/massadd.cpp:268 -#, fuzzy, c-format +#, c-format msgid "Discovered %d new games, ignored %d previously added games ..." -msgstr "Nya spel upptäckta: %d ..." +msgstr "Upptäckte %d nya spel, ignorerade %d tidigare tillagda spel ..." #: gui/options.cpp:72 msgid "Never" @@ -576,19 +575,19 @@ #: gui/options.cpp:372 msgid "Failed to apply some of the graphic options changes:" -msgstr "" +msgstr "Kunde inte verkställa några av grafikinställningarna:" #: gui/options.cpp:384 msgid "the video mode could not be changed." -msgstr "" +msgstr "videoläget kunde inte ändras." #: gui/options.cpp:390 msgid "the fullscreen setting could not be changed" -msgstr "" +msgstr "fullskärmsinställningen kunde inte ändras." #: gui/options.cpp:396 msgid "the aspect ratio setting could not be changed" -msgstr "" +msgstr "inställningen för bildförhållandet kunde inte ändras." #: gui/options.cpp:705 msgid "Graphics mode:" @@ -894,7 +893,6 @@ msgstr "Språk för ScummVM:s användargränssnitt" #: gui/options.cpp:1295 -#, fuzzy msgid "You have to restart ScummVM before your changes will take effect." msgstr "Du måste starta om ScummVM för att ändringarna ska få effekt." @@ -1037,7 +1035,6 @@ msgstr "Spel-ID stöds inte" #: common/error.cpp:44 -#, fuzzy msgid "Unsupported color mode" msgstr "Ej stött färgläge" @@ -1066,7 +1063,6 @@ msgstr "Kan inte skapa fil" #: common/error.cpp:61 -#, fuzzy msgid "Reading data failed" msgstr "Inläsning misslyckades" @@ -1079,13 +1075,12 @@ msgstr "Kunde inte hitta lämpligt motortillägg" #: common/error.cpp:68 -#, fuzzy msgid "Engine plugin does not support save states" -msgstr "Motorn stöder inte debug-nivå '%s'" +msgstr "Motortillägget stöder inte spardata" #: common/error.cpp:71 msgid "User canceled" -msgstr "" +msgstr "Avbrutit av användaren" #: common/error.cpp:75 msgid "Unknown error" @@ -1113,15 +1108,16 @@ #: engines/advancedDetector.cpp:296 #, c-format msgid "The game in '%s' seems to be unknown." -msgstr "" +msgstr "Spelet i '%s' verkar vara okänt." #: engines/advancedDetector.cpp:297 msgid "Please, report the following data to the ScummVM team along with name" msgstr "" +"Var god rapportera följande data till ScummVM-teamet tillsammans med namnet" #: engines/advancedDetector.cpp:299 msgid "of the game you tried to add and its version/language/etc.:" -msgstr "" +msgstr "på spelet du försökte lägga till och dess version/språk/etc.:" #: engines/dialogs.cpp:84 msgid "~R~esume" @@ -1177,6 +1173,9 @@ "the README for basic information, and for instructions on how to obtain " "further assistance." msgstr "" +"Tyvärr stöder för tillfället inte den här motorn hjälp-funktionen. Var god " +"hänvisa till README-filen för information och instruktioner för att få " +"ytterligare assistens." #: engines/dialogs.cpp:316 engines/mohawk/dialogs.cpp:109 #: engines/mohawk/dialogs.cpp:174 @@ -1194,21 +1193,19 @@ #: engines/engine.cpp:233 msgid "Could not initialize color format." -msgstr "" +msgstr "Kunde inte initialisera färgformat." #: engines/engine.cpp:241 -#, fuzzy msgid "Could not switch to video mode: '" -msgstr "Aktivt videoläge:" +msgstr "Kunde inte byta till videoläget: '" #: engines/engine.cpp:250 -#, fuzzy msgid "Could not apply aspect ratio setting." -msgstr "Korrektion av bildförhållande på/av" +msgstr "Kunde inte ändra inställningen för bildförhållanden." #: engines/engine.cpp:255 msgid "Could not apply fullscreen setting." -msgstr "" +msgstr "Kunde inte applicera fullskärmsinställning." #: engines/engine.cpp:355 msgid "" @@ -1218,6 +1215,11 @@ "the data files to your hard disk instead.\n" "See the README file for details." msgstr "" +"Det verkar som att du spelar det här spelet direkt\n" +"från CD:n. Detta har en tendens att orsaka problem.\n" +"Det är därför rekommenderat att du kopierar\n" +"datafilerna till din hårddisk istället.\n" +"Se README-filen för detaljer." #: engines/engine.cpp:366 msgid "" @@ -1227,6 +1229,11 @@ "order to listen to the game's music.\n" "See the README file for details." msgstr "" +"Det här spelet har ljudspår på sin skiva. Dessa\n" +"spår måste rippas från skivan med hjälp av\n" +"ett lämpligt program för extraktion av CD-ljud\n" +"för att kunna lyssna på spelets musik.\n" +"Se README-filen för detaljer." #: engines/engine.cpp:433 msgid "" @@ -1234,47 +1241,48 @@ "ScummVM. As such, it is likely to be unstable, and any saves you make might " "not work in future versions of ScummVM." msgstr "" +"VARNING: Spelet du är på väg att starta stöds inte ännu till fullo av " +"ScummVM. Därför är det troligtvis instabilt och om du skapar spardata kan de " +"möjligtvis vara inkompatibla med framtida versioner av ScummVM." #: engines/engine.cpp:436 msgid "Start anyway" -msgstr "" +msgstr "Starta ändå" #: engines/scumm/dialogs.cpp:175 #, c-format msgid "Insert Disk %c and Press Button to Continue." -msgstr "" +msgstr "Mata in skivan %c och tryck på knappen för att fortsätta." #: engines/scumm/dialogs.cpp:176 #, c-format msgid "Unable to Find %s, (%c%d) Press Button." -msgstr "" +msgstr "Kunde inte hitta %s, (%c%d) tryck på knappen." #: engines/scumm/dialogs.cpp:177 #, c-format msgid "Error reading disk %c, (%c%d) Press Button." -msgstr "" +msgstr "Fel vid inläsning av skivan %c, (%c%d) tryck på knappen." #: engines/scumm/dialogs.cpp:178 msgid "Game Paused. Press SPACE to Continue." -msgstr "" +msgstr "Spelet pausat. Tryck MELLANSLAG för att fortsätta." #. I18N: You may specify 'Yes' symbol at the end of the line, like this: #. "Moechten Sie wirklich neu starten? (J/N)J" #. Will react to J as 'Yes' #: engines/scumm/dialogs.cpp:182 -#, fuzzy msgid "Are you sure you want to restart? (Y/N)" -msgstr "Är du säker på att du vill avsluta?" +msgstr "Är du säker på att du vill starta om? (J/N)J" #. I18N: you may specify 'Yes' symbol at the end of the line. See previous comment #: engines/scumm/dialogs.cpp:184 -#, fuzzy msgid "Are you sure you want to quit? (Y/N)" -msgstr "Är du säker på att du vill avsluta?" +msgstr "Är du säker på att du vill avsluta? (J/N)J" #: engines/scumm/dialogs.cpp:189 msgid "Play" -msgstr "" +msgstr "Spela" #: engines/scumm/dialogs.cpp:191 engines/scumm/help.cpp:82 #: engines/scumm/help.cpp:84 @@ -1287,42 +1295,41 @@ #: engines/scumm/dialogs.cpp:193 msgid "Insert save/load game disk" -msgstr "" +msgstr "Mata in skiva för spardata" #: engines/scumm/dialogs.cpp:194 msgid "You must enter a name" -msgstr "" +msgstr "Du måste ange ett namn" #: engines/scumm/dialogs.cpp:195 msgid "The game was NOT saved (disk full?)" -msgstr "" +msgstr "Spelet sprades EJ (skivan full?)" #: engines/scumm/dialogs.cpp:196 msgid "The game was NOT loaded" -msgstr "" +msgstr "Spelet laddades EJ" #: engines/scumm/dialogs.cpp:197 #, c-format msgid "Saving '%s'" -msgstr "" +msgstr "Sparar '%s'" #: engines/scumm/dialogs.cpp:198 #, c-format msgid "Loading '%s'" -msgstr "" +msgstr "Laddar '%s'" #: engines/scumm/dialogs.cpp:199 msgid "Name your SAVE game" -msgstr "" +msgstr "Namnge ditt SPARADE spel" #: engines/scumm/dialogs.cpp:200 -#, fuzzy msgid "Select a game to LOAD" -msgstr "Välj ett tema" +msgstr "Välj ett spel att LADDA" #: engines/scumm/dialogs.cpp:201 msgid "Game title)" -msgstr "" +msgstr "Speltitel)" #. I18N: Previous page button #: engines/scumm/dialogs.cpp:287 @@ -1340,25 +1347,21 @@ msgstr "~S~täng" #: engines/scumm/dialogs.cpp:597 -#, fuzzy msgid "Speech Only" -msgstr "Tal" +msgstr "Endast tal" #: engines/scumm/dialogs.cpp:598 -#, fuzzy msgid "Speech and Subtitles" -msgstr "Undertexter" +msgstr "Tal och undertexter" #: engines/scumm/dialogs.cpp:599 -#, fuzzy msgid "Subtitles Only" -msgstr "Undertexter" +msgstr "Endast undertexter" #: engines/scumm/dialogs.cpp:607 -#, fuzzy msgctxt "lowres" msgid "Speech & Subs" -msgstr "Tal" +msgstr "Tal & text" #: engines/scumm/help.cpp:73 msgid "Common keyboard commands:" @@ -1491,9 +1494,8 @@ msgstr "då detta kan orsaka krascher" #: engines/scumm/help.cpp:110 -#, fuzzy msgid " or incorrect game behavior." -msgstr "eller felaktigt spelbeteende." +msgstr " eller felaktigt spelbeteende." #: engines/scumm/help.cpp:114 msgid "Spinning drafts on the keyboard:" @@ -1880,6 +1882,8 @@ "Native MIDI support requires the Roland Upgrade from LucasArts,\n" "but %s is missing. Using AdLib instead." msgstr "" +"Stöd för Native MIDI kräver Roland-uppdateringen från LucasArts,\n" +"men %s saknas. Använder AdLib istället." #: engines/scumm/scumm.cpp:2264 engines/agos/saveload.cpp:189 #, c-format @@ -1936,16 +1940,15 @@ #. I18N: Drop book page #: engines/mohawk/dialogs.cpp:95 msgid "~D~rop Page" -msgstr "" +msgstr "Släpp si~d~a" #: engines/mohawk/dialogs.cpp:99 msgid "~S~how Map" -msgstr "" +msgstr "~V~isa karta" #: engines/mohawk/dialogs.cpp:105 -#, fuzzy msgid "~M~ain Menu" -msgstr "ScummVM huvudmeny" +msgstr "Huvud~m~eny" #: engines/mohawk/dialogs.cpp:172 msgid "~W~ater Effect Enabled" @@ -1962,40 +1965,24 @@ #: engines/agos/animation.cpp:550 #, c-format msgid "Cutscene file '%s' not found!" -msgstr "" +msgstr "Filmscensfilen '%s' hittades ej!" #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1283 #: engines/tinsel/saveload.cpp:482 -#, fuzzy msgid "Failed to load game state from file." -msgstr "" -"Kunde inte läsa spardata från file:\n" -"\n" -"%s" +msgstr "Kunde inte läsa spardata från filen" #: engines/gob/inter_v2.cpp:1353 engines/tinsel/saveload.cpp:560 -#, fuzzy msgid "Failed to save game state to file." -msgstr "" -"Kunde inte skriva spardata till file:\n" -"\n" -"%s" +msgstr "Kunde inte skriva spardata till filen." #: engines/gob/inter_v5.cpp:107 -#, fuzzy msgid "Failed to delete file." -msgstr "" -"Kunde inte skriva spardata till file:\n" -"\n" -"%s" +msgstr "Kunde inte radera filen." #: engines/groovie/script.cpp:420 -#, fuzzy msgid "Failed to save game" -msgstr "" -"Kunde inte skriva spardata till file:\n" -"\n" -"%s" +msgstr "Kunde inte spara spelet." #: engines/kyra/sound_midi.cpp:475 msgid "" @@ -2005,6 +1992,11 @@ "General MIDI ones. After all it might happen\n" "that a few tracks will not be correctly played." msgstr "" +"Du verkar använda en General MIDI enhet\n" +"men ditt spel stöder endast Roland MT32 MIDI.\n" +"Vi försöker kartlägga Roland MT32 instrument för\n" +"General MIDI instrument. Det kan trots allt hända\n" +"att ett fåtal ljudspår inte spelas korrekt." #: engines/m4/m4_menus.cpp:138 #, fuzzy @@ -2016,25 +2008,29 @@ "Unable to find \"sky.cpt\" file!\n" "Please download it from www.scummvm.org" msgstr "" +"Kunde inte hitta \"sky.cpt\"-filen!\n" +"Var god ladda hem den från www.scummvm.org" #: engines/sky/compact.cpp:141 msgid "" "The \"sky.cpt\" file has an incorrect size.\n" "Please (re)download it from www.scummvm.org" msgstr "" +"Filen \"sky.cpt\" har inkorrekt filstorlek.\n" +"Var god ladda hem den igen från www.scummvm.org" #: engines/sword1/animation.cpp:344 engines/sword2/animation.cpp:379 msgid "DXA cutscenes found but ScummVM has been built without zlib support" -msgstr "" +msgstr "DXA filmscener hittades men ScummVM har byggts utan stöd för zlib" #: engines/sword1/animation.cpp:354 engines/sword2/animation.cpp:389 msgid "MPEG2 cutscenes are no longer supported" -msgstr "" +msgstr "MPEG2 filmscener stöds inte längre" #: engines/sword1/animation.cpp:359 engines/sword2/animation.cpp:397 #, c-format msgid "Cutscene '%s' not found" -msgstr "" +msgstr "Filmscenen '%s' hittades ej" #: engines/sword1/control.cpp:863 msgid "" @@ -2046,6 +2042,13 @@ "Press OK to convert them now, otherwise you will be asked again the next " "time you start the game.\n" msgstr "" +"ScummVM upptäckte att du har gamla spardata för Broken Sword 1 som borde " +"konverteras.\n" +"Det gamla spardataformatet stöds inte längre, så du kommer inte kunna ladda " +"dina data om du inte konverterar dem.\n" +"\n" +"Tryck \"OK\" för att konvertera dem nu, annars kommer du tillfrågas igen " +"nästa gång du startar spelet.\n" #: engines/sword1/control.cpp:1232 #, c-format @@ -2053,18 +2056,20 @@ "Target new save game already exists!\n" "Would you like to keep the old save game (%s) or the new one (%s)?\n" msgstr "" +"Den valda spardatan existerar redan!\n" +"Vill du behålla den gamla spardatan (%s) eller den nya (%s)?\n" #: engines/sword1/control.cpp:1235 msgid "Keep the old one" -msgstr "" +msgstr "Behåll den gamla" #: engines/sword1/control.cpp:1235 msgid "Keep the new one" -msgstr "" +msgstr "Behåll den nya" #: engines/sword1/logic.cpp:1633 msgid "This is the end of the Broken Sword 1 Demo" -msgstr "" +msgstr "Här slutar Broken Sword 1 demon" #: engines/parallaction/saveload.cpp:133 #, c-format @@ -2072,16 +2077,16 @@ "Can't save game in slot %i\n" "\n" msgstr "" +"Kan inte spara data i position %i\n" +"\n" #: engines/parallaction/saveload.cpp:211 -#, fuzzy msgid "Loading game..." -msgstr "Ladda spel:" +msgstr "Laddar speldata..." #: engines/parallaction/saveload.cpp:226 -#, fuzzy msgid "Saving game..." -msgstr "Spara spelet:" +msgstr "Sparar speldata..." #: engines/parallaction/saveload.cpp:279 msgid "" @@ -2092,10 +2097,17 @@ "\n" "Press OK to convert them now, otherwise you will be asked next time.\n" msgstr "" +"ScummVM upptäckte att du har gamla spardata för Nippon Safes som borde byta " +"namn.\n" +"De gamla filnamnen stöds inte längre, så du kommer inte kunna ladda dina " +"data om du inte konverterar dem.\n" +"\n" +"Tryck \"OK\" för att konvertera dem nu, annars kommer du tillfrågas igen " +"nästa gång du startar spelet.\n" #: engines/parallaction/saveload.cpp:326 msgid "ScummVM successfully converted all your savefiles." -msgstr "" +msgstr "ScummVM lyckades konvertera alla dina spardata." #: engines/parallaction/saveload.cpp:328 msgid "" @@ -2104,6 +2116,10 @@ "\n" "Please report to the team." msgstr "" +"ScummVM skrev ut några varningar i ditt konsolfönster och kan inte garantera " +"att alla dina filer har konverterats.\n" +"\n" +"Var god rapportera till teamet." #: audio/fmopl.cpp:49 msgid "MAME OPL emulator" @@ -2119,11 +2135,13 @@ "The selected audio device '%s' was not found (e.g. might be turned off or " "disconnected)." msgstr "" +"Den valda ljudenheten '%s' kunde inte hittas (möjligtvis avstängd eller " +"frånkopplad)." #: audio/mididrv.cpp:205 audio/mididrv.cpp:217 audio/mididrv.cpp:253 #: audio/mididrv.cpp:268 msgid "Attempting to fall back to the next available device..." -msgstr "" +msgstr "Försöker använda nästa tillgängliga ljudenhet..." #: audio/mididrv.cpp:217 #, c-format @@ -2131,6 +2149,8 @@ "The selected audio device '%s' cannot be used. See log file for more " "information." msgstr "" +"Den valda ljudenheten '%s' kan inte användas. Se loggfilen för mer " +"information." #: audio/mididrv.cpp:253 #, c-format @@ -2138,6 +2158,8 @@ "The preferred audio device '%s' was not found (e.g. might be turned off or " "disconnected)." msgstr "" +"Den föredragna ljudenheten '%s' kunde inte hittas (möjligtvis avstängd eller " +"frånkopplad)." #: audio/mididrv.cpp:268 #, c-format @@ -2145,6 +2167,8 @@ "The preferred audio device '%s' cannot be used. See log file for more " "information." msgstr "" +"Den föredragna ljudenheten '%s' kan inte användas. Se loggfilen för mer " +"information." #: audio/null.h:43 msgid "No music" @@ -2167,7 +2191,6 @@ msgstr "C64 ljudemulator" #: audio/softsynth/mt32.cpp:329 -#, fuzzy msgid "Initializing MT-32 Emulator" msgstr "Initialiserar MT-32 emulator" @@ -2276,14 +2299,12 @@ msgstr "Inaktivera strömsparning" #: backends/platform/iphone/osys_events.cpp:338 -#, fuzzy msgid "Mouse-click-and-drag mode enabled." -msgstr "Touchpad-läge aktiverat." +msgstr "Dra-och-släpp-läge med mus aktiverat." #: backends/platform/iphone/osys_events.cpp:340 -#, fuzzy msgid "Mouse-click-and-drag mode disabled." -msgstr "Touchpad-läge inaktiverat." +msgstr "Dra-och-släpp-läge med mus deaktiverat." #: backends/platform/iphone/osys_events.cpp:351 msgid "Touchpad mode enabled." @@ -2294,27 +2315,25 @@ msgstr "Touchpad-läge inaktiverat." #: backends/platform/sdl/macosx/appmenu_osx.mm:67 -#, fuzzy msgid "Hide ScummVM" -msgstr "Avsluta ScummVM" +msgstr "Dölj ScummVM" #: backends/platform/sdl/macosx/appmenu_osx.mm:70 msgid "Hide Others" -msgstr "" +msgstr "Dölj övriga" #: backends/platform/sdl/macosx/appmenu_osx.mm:74 msgid "Show All" -msgstr "" +msgstr "Visa alla" #: backends/platform/sdl/macosx/appmenu_osx.mm:92 #: backends/platform/sdl/macosx/appmenu_osx.mm:99 -#, fuzzy msgid "Window" -msgstr "Windows MIDI" +msgstr "Fönster" #: backends/platform/sdl/macosx/appmenu_osx.mm:95 msgid "Minimize" -msgstr "" +msgstr "Minimera" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:45 msgid "Normal (no scaling)" @@ -2327,26 +2346,22 @@ #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2147 #: backends/graphics/openglsdl/openglsdl-graphics.cpp:537 -#, fuzzy msgid "Enabled aspect ratio correction" -msgstr "Korrektion av bildförhållande på/av" +msgstr "Korrektion av bildförhållande på" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2153 #: backends/graphics/openglsdl/openglsdl-graphics.cpp:542 -#, fuzzy msgid "Disabled aspect ratio correction" -msgstr "Korrektion av bildförhållande på/av" +msgstr "Korrektion av bildförhållande av" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2208 -#, fuzzy msgid "Active graphics filter:" -msgstr "Växla grafikfilter" +msgstr "Aktivt grafikfilter:" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2250 #: backends/graphics/openglsdl/openglsdl-graphics.cpp:481 -#, fuzzy msgid "Windowed mode" -msgstr "Renderingsläge:" +msgstr "Fönsterläge" #: backends/graphics/opengl/opengl-graphics.cpp:130 msgid "OpenGL Normal" @@ -2361,21 +2376,20 @@ msgstr "OpenGL original" #: backends/graphics/openglsdl/openglsdl-graphics.cpp:415 -#, fuzzy msgid "Current display mode" -msgstr "Aktivt videoläge:" +msgstr "Nuvarande visningsläge" #: backends/graphics/openglsdl/openglsdl-graphics.cpp:428 msgid "Current scale" -msgstr "" +msgstr "Nuvarande skala" #: backends/graphics/openglsdl/openglsdl-graphics.cpp:562 msgid "Active filter mode: Linear" -msgstr "" +msgstr "Aktivt filterläge: Linjärt" #: backends/graphics/openglsdl/openglsdl-graphics.cpp:564 msgid "Active filter mode: Nearest" -msgstr "" +msgstr "Aktivt filterläge: Närmast" #: backends/platform/symbian/src/SymbianActions.cpp:38 #: backends/platform/wince/CEActionsSmartphone.cpp:39 @@ -2570,17 +2584,15 @@ msgstr "Nätverk inaktivt" #: backends/platform/wii/options.cpp:178 -#, fuzzy msgid "Initializing network" msgstr "Initialiserar nätverk" #: backends/platform/wii/options.cpp:182 -#, fuzzy msgid "Timeout while initializing network" msgstr "Timeout under initialisering av nätverk" #: backends/platform/wii/options.cpp:186 -#, fuzzy, c-format +#, c-format msgid "Network not initialized (%d)" msgstr "Nätverk ej initialiserat (%d)" @@ -2702,112 +2714,83 @@ "inventariet" #: backends/events/default/default-events.cpp:222 -#, fuzzy msgid "Do you really want to return to the Launcher?" -msgstr "Vill du verkligen radera den här spardatan?" +msgstr "Vill du verkligen återgå till launchern?" #: backends/events/default/default-events.cpp:222 -#, fuzzy msgid "Launcher" -msgstr "Slå" +msgstr "Launcher" #: backends/events/default/default-events.cpp:244 -#, fuzzy msgid "Do you really want to quit?" -msgstr "Vill du avsluta?" +msgstr "Vill du verkligen avsluta?" #: backends/events/gph/gph-events.cpp:338 #: backends/events/gph/gph-events.cpp:381 #: backends/events/openpandora/op-events.cpp:139 msgid "Touchscreen 'Tap Mode' - Left Click" -msgstr "" +msgstr "Touchscreen \"Tap-läge\" - Vänsterklick" #: backends/events/gph/gph-events.cpp:340 #: backends/events/gph/gph-events.cpp:383 #: backends/events/openpandora/op-events.cpp:141 msgid "Touchscreen 'Tap Mode' - Right Click" -msgstr "" +msgstr "Touchscren \"Tap-läge\" - Högerklick" #: backends/events/gph/gph-events.cpp:342 #: backends/events/gph/gph-events.cpp:385 #: backends/events/openpandora/op-events.cpp:143 msgid "Touchscreen 'Tap Mode' - Hover (No Click)" -msgstr "" +msgstr "Touchscreen \"Tap-läge\" - Hover (utan klick)" #: backends/events/gph/gph-events.cpp:362 -#, fuzzy msgid "Maximum Volume" -msgstr "Volym" +msgstr "Max. volym" #: backends/events/gph/gph-events.cpp:364 msgid "Increasing Volume" -msgstr "" +msgstr "Höja volymen" #: backends/events/gph/gph-events.cpp:370 -#, fuzzy msgid "Minimal Volume" -msgstr "Volym" +msgstr "Min. volym" #: backends/events/gph/gph-events.cpp:372 msgid "Decreasing Volume" -msgstr "" +msgstr "Sänka volymen" #: backends/updates/macosx/macosx-updates.mm:65 msgid "Check for Updates..." -msgstr "" +msgstr "Sök efter uppdateringar..." #: backends/platform/bada/form.cpp:269 -#, fuzzy msgid "Right Click Once" -msgstr "Högerklick" +msgstr "Ett högerklick" #: backends/platform/bada/form.cpp:277 -#, fuzzy msgid "Move Only" -msgstr "Tal" +msgstr "Endast rörelse" #: backends/platform/bada/form.cpp:291 msgid "Escape Key" -msgstr "" +msgstr "Escape-tangenten" #: backends/platform/bada/form.cpp:296 -#, fuzzy msgid "Game Menu" -msgstr "Spel" +msgstr "Spelmeny" #: backends/platform/bada/form.cpp:301 -#, fuzzy msgid "Show Keypad" msgstr "Visa tangentbord" #: backends/platform/bada/form.cpp:309 msgid "Control Mouse" -msgstr "" +msgstr "Kontrollera musen" #: backends/events/maemosdl/maemosdl-events.cpp:121 msgid "Clicking Enabled" -msgstr "" +msgstr "Klickning aktiverad" #: backends/events/maemosdl/maemosdl-events.cpp:121 msgid "Clicking Disabled" -msgstr "" - -#~ msgctxt "lowres" -#~ msgid "Add Game..." -#~ msgstr "Lägg till spel..." - -#~ msgid "Add Game..." -#~ msgstr "Lägg till spel..." - -#~ msgid "Discovered %d new games." -#~ msgstr "Nya spel upptäckta: %d." - -#, fuzzy -#~ msgid "Command line argument not processed" -#~ msgstr "Argument i kommandoraden ej verkställt" - -#~ msgid "FM Towns Emulator" -#~ msgstr "FM Towns-emulator" - -#~ msgid "Invalid Path" -#~ msgstr "Ogiltig sökväg" +msgstr "Klickning deaktiverad" diff -Nru scummvm-1.4.0/po/uk_UA.po scummvm-1.4.1/po/uk_UA.po --- scummvm-1.4.0/po/uk_UA.po 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/po/uk_UA.po 2012-01-14 09:28:44.000000000 +0000 @@ -1,8 +1,8 @@ -# Ukrainian translation for ScummVM. -# Copyright (C) 2010-2011 ScummVM Team -# This file is distributed under the same license as the ScummVM package. -# Lubomyr Lisen, 2010. -# +# Ukrainian translation for ScummVM. +# Copyright (C) 2010-2012 ScummVM Team +# This file is distributed under the same license as the ScummVM package. +# Lubomyr Lisen, 2010. +# msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" diff -Nru scummvm-1.4.0/ports.mk scummvm-1.4.1/ports.mk --- scummvm-1.4.0/ports.mk 2011-11-03 18:05:03.000000000 +0000 +++ scummvm-1.4.1/ports.mk 2012-01-14 09:28:44.000000000 +0000 @@ -166,6 +166,9 @@ cp $(srcdir)/doc/it/GuidaRapida ./ScummVM-snapshot/doc/it/GuidaRapida mkdir ScummVM-snapshot/doc/no-nb cp $(srcdir)doc/no-nb/HurtigStart ./ScummVM-snapshot/doc/no-nb/HurtigStart + mkdir ScummVM-snapshot/doc/se + cp $(srcdir)doc/se/LasMig ./ScummVM-snapshot/doc/se/LasMig + cp $(srcdir)doc/se/Snabbstart ./ScummVM-snapshot/doc/se/Snabbstart /Developer/Tools/SetFile -t ttro -c ttxt ./ScummVM-snapshot/* xattr -w "com.apple.TextEncoding" "utf-8;134217984" ./ScummVM-snapshot/doc/cz/* xattr -w "com.apple.TextEncoding" "utf-8;134217984" ./ScummVM-snapshot/doc/de/* @@ -173,6 +176,7 @@ xattr -w "com.apple.TextEncoding" "utf-8;134217984" ./ScummVM-snapshot/doc/fr/* xattr -w "com.apple.TextEncoding" "utf-8;134217984" ./ScummVM-snapshot/doc/it/* xattr -w "com.apple.TextEncoding" "utf-8;134217984" ./ScummVM-snapshot/doc/no-nb/* + xattr -w "com.apple.TextEncoding" "utf-8;134217984" ./ScummVM-snapshot/doc/se/* /Developer/Tools/CpMac -r $(bundle_name) ./ScummVM-snapshot/ cp $(srcdir)/dists/macosx/DS_Store ./ScummVM-snapshot/.DS_Store cp $(srcdir)/dists/macosx/background.jpg ./ScummVM-snapshot/background.jpg @@ -202,6 +206,7 @@ mkdir -p $(WIN32PATH)/doc/fr mkdir -p $(WIN32PATH)/doc/it mkdir -p $(WIN32PATH)/doc/no-nb + mkdir -p $(WIN32PATH)/doc/se $(STRIP) $(EXECUTABLE) -o $(WIN32PATH)/$(EXECUTABLE) cp $(DIST_FILES_THEMES) $(WIN32PATH) ifdef DIST_FILES_ENGINEDATA @@ -220,8 +225,10 @@ cp $(srcdir)/doc/it/GuidaRapida $(WIN32PATH)/doc/it/GuidaRapida.txt cp $(srcdir)/doc/no-nb/HurtigStart $(WIN32PATH)/doc/no-nb/HurtigStart.txt cp $(srcdir)/doc/de/Schnellstart $(WIN32PATH)/doc/de/Schnellstart.txt + cp $(srcdir)/doc/se/Snabbstart $(WIN32PATH)/doc/se/Snabbstart.txt cp $(srcdir)/README $(WIN32PATH)/README.txt cp $(srcdir)/doc/de/Liesmich $(WIN32PATH)/doc/de/Liesmich.txt + cp $(srcdir)/doc/se/LasMig $(WIN32PATH)/doc/se/LasMig.txt cp /usr/local/README-SDL.txt $(WIN32PATH) cp /usr/local/bin/SDL.dll $(WIN32PATH) cp $(srcdir)/dists/win32/graphics/left.bmp $(WIN32PATH)/graphics @@ -234,6 +241,7 @@ unix2dos $(WIN32PATH)/doc/fr/*.txt unix2dos $(WIN32PATH)/doc/it/*.txt unix2dos $(WIN32PATH)/doc/no-nb/*.txt + unix2dos $(WIN32PATH)/doc/se/*.txt # Special target to create a win32 NSIS installer win32setup: $(EXECUTABLE)