This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch upstream/latest
in repository colobot.
commit 498a5ca4cdf0e677955fef2bf61681dd2ea1f241
Author: krzys-h <krzy...@interia.pl>
Date: Sun Mar 22 17:40:08 2015 +0100
Reapplied temporary fix for #94
---
src/object/robotmain.cpp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp
index 36b9182..de8663e 100644
--- a/src/object/robotmain.cpp
+++ b/src/object/robotmain.cpp
@@ -2856,6 +2856,10 @@ void CRobotMain::ScenePerso()
CObjectManager::GetInstancePointer()->Flush();
+
+ ChangeColor();
+
+
m_dialog->SetSceneName("perso");
m_dialog->SetSceneRank(0);
try {
@@ -3936,7 +3940,7 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene,
bool resetObject)
g_build |= BUILD_FLAG;
}
- if (!resetObject)
+ if (!resetObject && !fixScene)
{
ChangeColor(); // changes the colors of texture
m_short->SetMode(false); // vehicles?
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/colobot.git
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
