[Scummvm-cvs-logs] scummvm master -> c35ef00c4a10bcd4d1c8d8e57d8a368b879fb059

dreammaster dreammaster at scummvm.org
Fri May 6 13:11:49 CEST 2011


This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
80e23dd653 TSAGE: Initialise player fields to fix Valgrind warning
cfd8cfe7cf TSAGE: Added missing destructors for Globals fields
3758dcbbcc DEVTOOLS: Bugfix for CREATE_PROJECT creating duplicate tag in Visual Studio projects
c35ef00c4a DEVTOOLS: Fix linking failure in Visual Studio created project


Commit: 80e23dd65370e8a821b090348435666bad9dbbe6
    https://github.com/scummvm/scummvm/commit/80e23dd65370e8a821b090348435666bad9dbbe6
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-05-06T02:19:25-07:00

Commit Message:
TSAGE: Initialise player fields to fix Valgrind warning

Changed paths:
    engines/tsage/core.cpp
    engines/tsage/core.h



diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index 86219a7..28d6dbf 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -2622,6 +2622,12 @@ int Visage::getFrameCount() const {
 
 /*--------------------------------------------------------------------------*/
 
+Player::Player(): SceneObject() {
+	_canWalk = false;
+	_uiEnabled = false;
+	_field8C = 0;
+}
+
 void Player::postInit(SceneObjectList *OwnerList) {
 	SceneObject::postInit();
 
diff --git a/engines/tsage/core.h b/engines/tsage/core.h
index d1d3411..a4a0ec2 100644
--- a/engines/tsage/core.h
+++ b/engines/tsage/core.h
@@ -598,7 +598,7 @@ public:
 	bool _uiEnabled;
 	int _field8C;
 public:
-	Player() : SceneObject() {}
+	Player();
 
 	virtual Common::String getClassName() { return "Player"; }
 	virtual void synchronize(Serializer &s);


Commit: cfd8cfe7cf5875a698eadb8b6a2e623a0bc5acd5
    https://github.com/scummvm/scummvm/commit/cfd8cfe7cf5875a698eadb8b6a2e623a0bc5acd5
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-05-06T02:38:17-07:00

Commit Message:
TSAGE: Added missing destructors for Globals fields

Changed paths:
    engines/tsage/globals.cpp



diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index d5d63da..74e9575 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -93,6 +93,8 @@ Globals::Globals() :
 
 Globals::~Globals() {
 	_globals = NULL;
+	delete _inventory;
+	delete _game;
 }
 
 void Globals::reset() {


Commit: 3758dcbbcc6006aa2d16b90501fd0ea818a47d79
    https://github.com/scummvm/scummvm/commit/3758dcbbcc6006aa2d16b90501fd0ea818a47d79
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-05-06T02:39:12-07:00

Commit Message:
DEVTOOLS: Bugfix for CREATE_PROJECT creating duplicate tag in Visual Studio projects

Changed paths:
    devtools/create_project/visualstudio.cpp



diff --git a/devtools/create_project/visualstudio.cpp b/devtools/create_project/visualstudio.cpp
index f090190..3acb283 100644
--- a/devtools/create_project/visualstudio.cpp
+++ b/devtools/create_project/visualstudio.cpp
@@ -223,8 +223,7 @@ void VisualStudioProvider::outputGlobalPropFile(std::ofstream &properties, int b
 	properties << "\t\tRuntimeTypeInfo=\"false\"\n";
 #endif
 
-	properties << "\t\tRuntimeTypeInfo=\"false\"\n"
-	              "\t\tWarningLevel=\"4\"\n"
+	properties << "\t\tWarningLevel=\"4\"\n"
 	              "\t\tWarnAsError=\"false\"\n"
 	              "\t\tCompileAs=\"0\"\n"
 	              "\t\t/>\n"


Commit: c35ef00c4a10bcd4d1c8d8e57d8a368b879fb059
    https://github.com/scummvm/scummvm/commit/c35ef00c4a10bcd4d1c8d8e57d8a368b879fb059
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-05-06T04:09:44-07:00

Commit Message:
DEVTOOLS: Fix linking failure in Visual Studio created project

Changed paths:
    devtools/create_project/visualstudio.cpp



diff --git a/devtools/create_project/visualstudio.cpp b/devtools/create_project/visualstudio.cpp
index 3acb283..a7a6ac8 100644
--- a/devtools/create_project/visualstudio.cpp
+++ b/devtools/create_project/visualstudio.cpp
@@ -148,7 +148,7 @@ void VisualStudioProvider::createProjectFile(const std::string &name, const std:
 void VisualStudioProvider::outputConfiguration(std::ostream &project, const BuildSetup &setup, const std::string &libraries, const std::string &config, const std::string &platform, const std::string &props, const bool isWin32) {
 	project << "\t\t<Configuration Name=\"" << config << "|" << platform << "\" ConfigurationType=\"1\" InheritedPropertySheets=\".\\" << PROJECT_DESCRIPTION << "_" << config << props << ".vsprops\">\n"
 	           "\t\t\t<Tool\tName=\"VCCLCompilerTool\" DisableLanguageExtensions=\"false\" />\n"
-	           "\t\t\t<Tool\tName=\"VCLinkerTool\" OutputFile=\"$(OutDir)/" << PROJECT_NAME << "\"\n"
+	           "\t\t\t<Tool\tName=\"VCLinkerTool\" OutputFile=\"$(OutDir)/" << PROJECT_NAME << ".exe\"\n"
 	           "\t\t\t\tAdditionalDependencies=\"" << libraries << "\"\n"
 	           "\t\t\t/>\n";
 	outputBuildEvents(project, setup, isWin32);






More information about the Scummvm-git-logs mailing list