From 198686dfd605669b5f4ba2d1b49e6542e8a8afc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali.rohar@gmail.com>
Date: Sun, 20 May 2012 15:01:37 +0200
Subject: [PATCH] Fix GCC printf warnings
---
src/ai/script_ai.cpp | 8 ++++----
src/unit/unit_save.cpp | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/ai/script_ai.cpp b/src/ai/script_ai.cpp
index 6d8dd5d99..c588ea2df 100644
--- a/src/ai/script_ai.cpp
+++ b/src/ai/script_ai.cpp
@@ -1060,19 +1060,19 @@ static int CclAiDump(lua_State *l)
// Requests
//
size_t n = AiPlayer->UnitTypeRequests.size();
- printf("UnitTypeRequests(%d):\n", n);
+ printf("UnitTypeRequests(%lu):\n", n);
for (size_t i = 0; i < n; ++i) {
printf("%s ", AiPlayer->UnitTypeRequests[i].Type->Ident.c_str());
}
printf("\n");
n = AiPlayer->UpgradeToRequests.size();
- printf("UpgradeToRequests(%d):\n", n);
+ printf("UpgradeToRequests(%lu):\n", n);
for (size_t i = 0; i < n; ++i) {
printf("%s ", AiPlayer->UpgradeToRequests[i]->Ident.c_str());
}
printf("\n");
n = AiPlayer->ResearchRequests.size();
- printf("ResearchRequests(%d):\n", n);
+ printf("ResearchRequests(%lu):\n", n);
for (size_t i = 0; i < n; ++i) {
printf("%s ", AiPlayer->ResearchRequests[i]->Ident.c_str());
}
@@ -1088,7 +1088,7 @@ static int CclAiDump(lua_State *l)
// PrintForce
for (size_t i = 0; i < AiPlayer->Force.Size(); ++i) {
- printf("Force(%d%s%s):\n", i,
+ printf("Force(%lu%s%s):\n", i,
AiPlayer->Force[i].Completed ? ",complete" : ",recruit",
AiPlayer->Force[i].Attacking ? ",attack" : "");
for (size_t j = 0; j < AiPlayer->Force[i].UnitTypes.size(); ++j) {
diff --git a/src/unit/unit_save.cpp b/src/unit/unit_save.cpp
index 08454f1c8..8c1a8f878 100644
--- a/src/unit/unit_save.cpp
+++ b/src/unit/unit_save.cpp
@@ -214,7 +214,7 @@ void SaveUnit(const CUnit &unit, CFile &file)
file.printf(" \"active\",");
}
file.printf("\"ttl\", %lu,\n ", unit.TTL);
- file.printf("\"threshold\", %lu,\n ", unit.Threshold);
+ file.printf("\"threshold\", %d,\n ", unit.Threshold);
for (size_t i = 0; i < UnitTypeVar.GetNumberVariable(); ++i) {
if (unit.Variable[i] != unit.Type->DefaultStat.Variables[i]) {