This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch upstream/latest
in repository colobot.
commit fd28dfd9bbec6c8d63c2e0716442533f4ff24195
Author: krzys-h <krzy...@interia.pl>
Date: Wed Nov 12 16:47:40 2014 +0100
Fixed Apperance textures
Issue #94
I beleive there is a better fix, I just can't find it because I don't fully
understand the graphics engine.
I'll leave this issue open for @piotrdz to take a look at when he comes back
---
src/object/robotmain.cpp | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)
diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp
index ac55ef1..b134085 100644
--- a/src/object/robotmain.cpp
+++ b/src/object/robotmain.cpp
@@ -3641,17 +3641,6 @@ Math::Vector CRobotMain::LookatPoint(Math::Vector eye,
float angleH, float angle
return lookat;
}
-
-
-char* SkipNum(char *p)
-{
- while (*p == ' ' || *p == '.' || *p == '-' || (*p >= '0' && *p <= '9'))
- {
- p++;
- }
- return p;
-}
-
//! Load the scene for the character
void CRobotMain::ScenePerso()
{
@@ -3671,7 +3660,9 @@ void CRobotMain::ScenePerso()
iMan->Flush(CLASS_PYRO);
CObjectManager::GetInstancePointer()->Flush();
-
+
+ ChangeColor();
+
m_dialog->SetSceneName("perso");
m_dialog->SetSceneRank(0);
try {
@@ -4752,7 +4743,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
