From a51ae280184fe7e2a4008157b0d21bca65b03040 Mon Sep 17 00:00:00 2001 From: titiger Date: Wed, 23 Jul 2014 02:33:10 +0200 Subject: [PATCH] windows does not know uint out of the box --- source/glest_game/type_instances/unit.cpp | 4 ++-- source/glest_game/types/unit_type.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/glest_game/type_instances/unit.cpp b/source/glest_game/type_instances/unit.cpp index 6a539ea5..09f8a2fc 100644 --- a/source/glest_game/type_instances/unit.cpp +++ b/source/glest_game/type_instances/unit.cpp @@ -35,8 +35,8 @@ using namespace Shared::Util; namespace Glest{ namespace Game{ -const uint CHANGE_COMMAND_SPEED = 325; -const uint MIN_FRAMECOUNT_CHANGE_COMMAND_SPEED = 160; +const int CHANGE_COMMAND_SPEED = 325; +const int MIN_FRAMECOUNT_CHANGE_COMMAND_SPEED = 160; //Mutex Unit::mutexDeletedUnits; //map Unit::deletedUnits; diff --git a/source/glest_game/types/unit_type.cpp b/source/glest_game/types/unit_type.cpp index 7ff85f87..39129206 100644 --- a/source/glest_game/types/unit_type.cpp +++ b/source/glest_game/types/unit_type.cpp @@ -597,7 +597,7 @@ void UnitType::loaddd(int id,const string &dir, const TechTree *techTree, if(parametersNode->hasChild("resources-death")) { const XmlNode *deathResourcesNode= parametersNode->getChild("resources-death"); - for(uint i=0; i < deathResourcesNode->getChildCount(); ++i){ + for(int i=0; i < deathResourcesNode->getChildCount(); ++i){ const XmlNode *resourceNode= deathResourcesNode->getChild("resource", i); string name= resourceNode->getAttribute("name")->getRestrictedValue();