This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch upstream/latest
in repository colobot.
commit 14068ce54b3cc04cc136a64616c58c58442836bb
Author: krzys-h <krzy...@interia.pl>
Date: Sat Mar 28 12:19:40 2015 +0100
Don't count transported items by default (#412)
---
src/object/robotmain.cpp | 6 ++++++
src/object/robotmain.h | 1 +
2 files changed, 7 insertions(+)
diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp
index 67119c7..13aec23 100644
--- a/src/object/robotmain.cpp
+++ b/src/object/robotmain.cpp
@@ -3842,6 +3842,7 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene,
bool resetObject)
m_endTake[i].drive =
line->GetParam("drive")->AsDriveType(DRIVE_OTHER);
m_endTake[i].lost = line->GetParam("lost")->AsInt(-1);
m_endTake[i].immediat =
line->GetParam("immediat")->AsBool(false);
+ m_endTake[i].countTransported =
line->GetParam("countTransported")->AsBool(false);
strcpy(m_endTake[i].message,
line->GetParam("message")->AsString("").c_str()); //TODO: Really, ending
mission on message()? Is this used anywhere? Do we need that?
m_endTakeTotal ++;
}
@@ -5525,6 +5526,11 @@ Error CRobotMain::CheckEndMission(bool frame)
if (obj->GetRuin()) continue;
if (!obj->GetEnable()) continue;
+ if(!m_endTake[t].countTransported)
+ {
+ if(obj->GetTruck() != nullptr) continue;
+ }
+
ObjectType type = obj->GetType();
if (type == OBJECT_SCRAP2 ||
type == OBJECT_SCRAP3 ||
diff --git a/src/object/robotmain.h b/src/object/robotmain.h
index 22955e3..78940d2 100644
--- a/src/object/robotmain.h
+++ b/src/object/robotmain.h
@@ -113,6 +113,7 @@ struct EndTake
ToolType tool;
DriveType drive;
bool immediat;
+ bool countTransported;
char message[100];
};
--
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
