[Scummvm-cvs-logs] SF.net SVN: scummvm:[42359] scummvm/branches/gsoc2009-16bit
Kirben at users.sourceforge.net
Kirben at users.sourceforge.net
Sat Jul 11 01:40:22 CEST 2009
Revision: 42359
http://scummvm.svn.sourceforge.net/scummvm/?rev=42359&view=rev
Author: Kirben
Date: 2009-07-10 23:40:21 +0000 (Fri, 10 Jul 2009)
Log Message:
-----------
Merged revisions 42322,42328,42345-42346,42354-42358 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
........
r42322 | dreammaster | 2009-07-10 10:49:13 +1000 (Fri, 10 Jul 2009) | 1 line
Changed the status of the Tinsel engine to be enabled by default
........
r42328 | sev | 2009-07-10 18:40:44 +1000 (Fri, 10 Jul 2009) | 2 lines
Mention cruise support
........
r42345 | thebluegr | 2009-07-11 04:53:40 +1000 (Sat, 11 Jul 2009) | 1 line
Applied patch #2819665 - "SCI: cell palette fix for QfG3/SQ5/etc."
........
r42346 | sev | 2009-07-11 05:06:24 +1000 (Sat, 11 Jul 2009) | 2 lines
This is 1.0.0svn
........
r42354 | drmccoy | 2009-07-11 07:49:47 +1000 (Sat, 11 Jul 2009) | 1 line
Fixing mismatched delete
........
r42355 | drmccoy | 2009-07-11 08:11:36 +1000 (Sat, 11 Jul 2009) | 1 line
Mention the Gob savegame format change and change the version from 0.14.0 to 1.0.0 there too
........
r42356 | Hkz | 2009-07-11 08:13:27 +1000 (Sat, 11 Jul 2009) | 1 line
tinsel: proper detection entry for Discworld 1 Italian only CD
........
r42357 | wjpalenstijn | 2009-07-11 08:29:25 +1000 (Sat, 11 Jul 2009) | 4 lines
Recreate FSNode after calling checkPath since checkPath may
have created the directory the FSNode points to, invalidating
its cached metadata. In the future, it might be nice to add
a FSNode::rescan() function for this? This fixes #2793187 .
........
r42358 | sev | 2009-07-11 08:46:36 +1000 (Sat, 11 Jul 2009) | 5 lines
Restored several files after the version update.
.in files are THE sources, and have to be modified, not the files generated
from them.
........
Modified Paths:
--------------
scummvm/branches/gsoc2009-16bit/NEWS
scummvm/branches/gsoc2009-16bit/backends/saves/default/default-saves.cpp
scummvm/branches/gsoc2009-16bit/base/internal_version.h
scummvm/branches/gsoc2009-16bit/configure
scummvm/branches/gsoc2009-16bit/dists/redhat/scummvm.spec
scummvm/branches/gsoc2009-16bit/dists/redhat/scummvm.spec.in
scummvm/branches/gsoc2009-16bit/dists/scummvm.rc
scummvm/branches/gsoc2009-16bit/dists/scummvm.rc.in
scummvm/branches/gsoc2009-16bit/dists/slackware/scummvm.SlackBuild
scummvm/branches/gsoc2009-16bit/dists/wii/meta.xml
scummvm/branches/gsoc2009-16bit/engines/gob/video.cpp
scummvm/branches/gsoc2009-16bit/engines/sci/gfx/gfx_resmgr.cpp
scummvm/branches/gsoc2009-16bit/engines/tinsel/detection.cpp
Property Changed:
----------------
scummvm/branches/gsoc2009-16bit/
Property changes on: scummvm/branches/gsoc2009-16bit
___________________________________________________________________
Modified: svnmerge-integrated
- /scummvm/trunk:1-42317 /scummvm/branches/gsoc2008-tfmx:1-31765 /scummvm/branches/gsoc2008-gui:1-31703
+ /scummvm/trunk:1-42358 /scummvm/branches/gsoc2008-tfmx:1-31765 /scummvm/branches/gsoc2008-gui:1-31703
Modified: scummvm/branches/gsoc2009-16bit/NEWS
===================================================================
--- scummvm/branches/gsoc2009-16bit/NEWS 2009-07-10 22:46:36 UTC (rev 42358)
+++ scummvm/branches/gsoc2009-16bit/NEWS 2009-07-10 23:40:21 UTC (rev 42359)
@@ -1,7 +1,7 @@
For a more comprehensive changelog for the latest experimental SVN code, see:
http://scummvm.svn.sourceforge.net/viewvc/scummvm/?view=log
-0.14.0 (2009-??-??)
+1.0.0 (2009-??-??)
New Games:
- Added support for Discworld.
- Added support for Discworld 2 - Missing Presumed ...!?.
@@ -9,6 +9,7 @@
- Added support for Leather Goddesses of Phobos 2.
- Added support for The Manhole.
- Added support for Rodney's Funscreen.
+ - Added support for Cruise for a Corpse.
General:
- Added experimental AdLib emulator from DOSBox.
@@ -36,6 +37,10 @@
- Dropped support for playing cutscene sound without the video.
- Added support for the PlayStation version.
+ Gob:
+ - Introduced a new savegame format to fix a fatal flaw of the old one,
+ breaking compatibility with old savegames made on big-endian systems.
+
KYRA:
- Added support for PC Speaker based music and sound effects.
- Added support for 16 color dithering in Kyrandia PC-9801 (Japanese version
Modified: scummvm/branches/gsoc2009-16bit/backends/saves/default/default-saves.cpp
===================================================================
--- scummvm/branches/gsoc2009-16bit/backends/saves/default/default-saves.cpp 2009-07-10 22:46:36 UTC (rev 42358)
+++ scummvm/branches/gsoc2009-16bit/backends/saves/default/default-saves.cpp 2009-07-10 23:40:21 UTC (rev 42359)
@@ -55,11 +55,14 @@
}
Common::StringList DefaultSaveFileManager::listSavefiles(const Common::String &pattern) {
- Common::FSNode savePath(getSavePath());
- checkPath(savePath);
+ Common::String savePathName = getSavePath();
+ checkPath(Common::FSNode(savePathName));
if (getError() != Common::kNoError)
return Common::StringList();
+ // recreate FSNode since checkPath may have changed/created the directory
+ Common::FSNode savePath(savePathName);
+
Common::FSDirectory dir(savePath);
Common::ArchiveMemberList savefiles;
Common::StringList results;
@@ -76,11 +79,14 @@
Common::InSaveFile *DefaultSaveFileManager::openForLoading(const Common::String &filename) {
// Ensure that the savepath is valid. If not, generate an appropriate error.
- Common::FSNode savePath(getSavePath());
- checkPath(savePath);
+ Common::String savePathName = getSavePath();
+ checkPath(Common::FSNode(savePathName));
if (getError() != Common::kNoError)
return 0;
+ // recreate FSNode since checkPath may have changed/created the directory
+ Common::FSNode savePath(savePathName);
+
Common::FSNode file = savePath.getChild(filename);
if (!file.exists())
return 0;
@@ -93,11 +99,14 @@
Common::OutSaveFile *DefaultSaveFileManager::openForSaving(const Common::String &filename) {
// Ensure that the savepath is valid. If not, generate an appropriate error.
- Common::FSNode savePath(getSavePath());
- checkPath(savePath);
+ Common::String savePathName = getSavePath();
+ checkPath(Common::FSNode(savePathName));
if (getError() != Common::kNoError)
return 0;
+ // recreate FSNode since checkPath may have changed/created the directory
+ Common::FSNode savePath(savePathName);
+
Common::FSNode file = savePath.getChild(filename);
// Open the file for saving
@@ -107,13 +116,14 @@
}
bool DefaultSaveFileManager::removeSavefile(const Common::String &filename) {
- clearError();
-
- Common::FSNode savePath(getSavePath());
- checkPath(savePath);
+ Common::String savePathName = getSavePath();
+ checkPath(Common::FSNode(savePathName));
if (getError() != Common::kNoError)
return false;
+ // recreate FSNode since checkPath may have changed/created the directory
+ Common::FSNode savePath(savePathName);
+
Common::FSNode file = savePath.getChild(filename);
// FIXME: remove does not exist on all systems. If your port fails to
Modified: scummvm/branches/gsoc2009-16bit/base/internal_version.h
===================================================================
--- scummvm/branches/gsoc2009-16bit/base/internal_version.h 2009-07-10 22:46:36 UTC (rev 42358)
+++ scummvm/branches/gsoc2009-16bit/base/internal_version.h 2009-07-10 23:40:21 UTC (rev 42359)
@@ -2,4 +2,4 @@
#define SCUMMVM_SVN_REVISION
#endif
-#define SCUMMVM_VERSION "0.14.0svn" SCUMMVM_SVN_REVISION
+#define SCUMMVM_VERSION "1.0.0svn" SCUMMVM_SVN_REVISION
Modified: scummvm/branches/gsoc2009-16bit/configure
===================================================================
--- scummvm/branches/gsoc2009-16bit/configure 2009-07-10 22:46:36 UTC (rev 42358)
+++ scummvm/branches/gsoc2009-16bit/configure 2009-07-10 23:40:21 UTC (rev 42359)
@@ -93,7 +93,7 @@
add_engine sky "Beneath a Steel Sky" yes
add_engine sword1 "Broken Sword 1" yes
add_engine sword2 "Broken Sword 2" yes
-add_engine tinsel "Tinsel" no
+add_engine tinsel "Tinsel" yes
add_engine touche "Touche: The Adventures of the Fifth Musketeer" yes
add_engine tucker "Bud Tucker in Double Trouble" yes
Modified: scummvm/branches/gsoc2009-16bit/dists/redhat/scummvm.spec
===================================================================
--- scummvm/branches/gsoc2009-16bit/dists/redhat/scummvm.spec 2009-07-10 22:46:36 UTC (rev 42358)
+++ scummvm/branches/gsoc2009-16bit/dists/redhat/scummvm.spec 2009-07-10 23:40:21 UTC (rev 42359)
@@ -7,7 +7,7 @@
# Prologue information
#------------------------------------------------------------------------------
Name : scummvm
-Version : 0.14.0svn
+Version : 1.0.0svn
Release : 1
Summary : Graphic adventure game interpreter
Group : Interpreters
Modified: scummvm/branches/gsoc2009-16bit/dists/redhat/scummvm.spec.in
===================================================================
--- scummvm/branches/gsoc2009-16bit/dists/redhat/scummvm.spec.in 2009-07-10 22:46:36 UTC (rev 42358)
+++ scummvm/branches/gsoc2009-16bit/dists/redhat/scummvm.spec.in 2009-07-10 23:40:21 UTC (rev 42359)
@@ -58,6 +58,7 @@
install -m755 -D scummvm %{buildroot}%{_bindir}/scummvm
install -m644 -D dists/scummvm.6 %{buildroot}%{_mandir}/man6/scummvm.6
install -m644 -D icons/scummvm.xpm %{buildroot}%{_datadir}/pixmaps/scummvm.xpm
+install -m644 -D gui/themes/scummclassic.zip %{buildroot}%{_datadir}/scummvm/scummclassic.zip
install -m644 -D gui/themes/scummmodern.zip %{buildroot}%{_datadir}/scummvm/scummmodern.zip
install -m644 -D dists/pred.dic %{buildroot}%{_datadir}/scummvm/pred.dic
install -m644 -D dists/engine-data/kyra.dat %{buildroot}%{_datadir}/scummvm/kyra.dat
Modified: scummvm/branches/gsoc2009-16bit/dists/scummvm.rc
===================================================================
--- scummvm/branches/gsoc2009-16bit/dists/scummvm.rc 2009-07-10 22:46:36 UTC (rev 42358)
+++ scummvm/branches/gsoc2009-16bit/dists/scummvm.rc 2009-07-10 23:40:21 UTC (rev 42359)
@@ -7,8 +7,8 @@
#endif
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,14,0,0
- PRODUCTVERSION 0,14,0,0
+ FILEVERSION 1,0,0,0
+ PRODUCTVERSION 1,0,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -25,13 +25,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", "0.14.0svn\0"
+ VALUE "FileVersion", "1.0.0svn\0"
VALUE "InternalName", "scummvm\0"
VALUE "LegalCopyright", "Copyright \xA9 2001-2009 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", "0.14.0svn\0"
+ VALUE "ProductVersion", "1.0.0svn\0"
END
END
BLOCK "VarFileInfo"
Modified: scummvm/branches/gsoc2009-16bit/dists/scummvm.rc.in
===================================================================
--- scummvm/branches/gsoc2009-16bit/dists/scummvm.rc.in 2009-07-10 22:46:36 UTC (rev 42358)
+++ scummvm/branches/gsoc2009-16bit/dists/scummvm.rc.in 2009-07-10 23:40:21 UTC (rev 42359)
@@ -27,7 +27,7 @@
VALUE "FileDescription", "http://www.scummvm.org/\0"
VALUE "FileVersion", "@VERSION@\0"
VALUE "InternalName", "scummvm\0"
- VALUE "LegalCopyright", "Copyright \xA9 2001-2008 The ScummVM Team\0"
+ VALUE "LegalCopyright", "Copyright \xA9 2001-2009 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"
Modified: scummvm/branches/gsoc2009-16bit/dists/slackware/scummvm.SlackBuild
===================================================================
--- scummvm/branches/gsoc2009-16bit/dists/slackware/scummvm.SlackBuild 2009-07-10 22:46:36 UTC (rev 42358)
+++ scummvm/branches/gsoc2009-16bit/dists/slackware/scummvm.SlackBuild 2009-07-10 23:40:21 UTC (rev 42359)
@@ -8,7 +8,7 @@
fi
PKG=$TMP/package-scummvm
-VERSION=0.14.0svn
+VERSION=1.0.0svn
ARCH=i486
BUILD=1
Modified: scummvm/branches/gsoc2009-16bit/dists/wii/meta.xml
===================================================================
--- scummvm/branches/gsoc2009-16bit/dists/wii/meta.xml 2009-07-10 22:46:36 UTC (rev 42358)
+++ scummvm/branches/gsoc2009-16bit/dists/wii/meta.xml 2009-07-10 23:40:21 UTC (rev 42359)
@@ -2,7 +2,7 @@
<app version="1">
<name>ScummVM</name>
<coder>The ScummVM Team</coder>
- <version>0.14.0svn at REVISION@</version>
+ <version>1.0.0svn at REVISION@</version>
<release_date>@TIMESTAMP@</release_date>
<short_description>Point & Click Adventures</short_description>
<long_description>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!
Modified: scummvm/branches/gsoc2009-16bit/engines/gob/video.cpp
===================================================================
--- scummvm/branches/gsoc2009-16bit/engines/gob/video.cpp 2009-07-10 22:46:36 UTC (rev 42358)
+++ scummvm/branches/gsoc2009-16bit/engines/gob/video.cpp 2009-07-10 23:40:21 UTC (rev 42359)
@@ -62,7 +62,7 @@
}
Font::~Font() {
- delete _dataPtr;
+ delete[] _dataPtr;
}
uint8 Font::getCharWidth(uint8 c) const {
Modified: scummvm/branches/gsoc2009-16bit/engines/sci/gfx/gfx_resmgr.cpp
===================================================================
--- scummvm/branches/gsoc2009-16bit/engines/sci/gfx/gfx_resmgr.cpp 2009-07-10 22:46:36 UTC (rev 42358)
+++ scummvm/branches/gsoc2009-16bit/engines/sci/gfx/gfx_resmgr.cpp 2009-07-10 23:40:21 UTC (rev 42359)
@@ -601,6 +601,8 @@
}
if (!cel_data->data) {
+ if (!cel_data->palette)
+ cel_data->palette = view->palette->getref();
#ifdef CUSTOM_GRAPHICS_OPTIONS
gfx_get_res_config(_options, cel_data);
gfx_xlate_pixmap(cel_data, _driver->getMode(), _options->view_xlate_filter);
Modified: scummvm/branches/gsoc2009-16bit/engines/tinsel/detection.cpp
===================================================================
--- scummvm/branches/gsoc2009-16bit/engines/tinsel/detection.cpp 2009-07-10 22:46:36 UTC (rev 42358)
+++ scummvm/branches/gsoc2009-16bit/engines/tinsel/detection.cpp 2009-07-10 23:40:21 UTC (rev 42359)
@@ -163,6 +163,28 @@
TINSEL_V1,
},
+ { // Italian CD with english speech and *.gra files.
+ // Note: It contains only italian subtitles, but inside english.txt
+ {
+ "dw",
+ "CD",
+ {
+ {"dw.gra", 0, "c8808ccd988d603dd35dff42013ae7fd", 781656},
+ {"english.txt", 0, "15f0703f85477d7fab4280bf938b61c1", 237774},
+ {"english.smp", 0, NULL, -1},
+ {NULL, 0, NULL, 0}
+ },
+ Common::IT_ITA,
+ Common::kPlatformPC,
+ ADGF_DROPLANGUAGE,
+ GUIO_NONE
+ },
+ GID_DW1,
+ 0,
+ GF_CD | GF_USE_4FLAGS | GF_ENHANCED_AUDIO_SUPPORT,
+ TINSEL_V1,
+ },
+
{ // Multilingual CD with english speech and *.gra files.
// Note: It contains no english subtitles.
{
@@ -187,6 +209,7 @@
GF_CD | GF_USE_4FLAGS | GF_ENHANCED_AUDIO_SUPPORT,
TINSEL_V1,
},
+
{
{
"dw",
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list