Merge lp:~amdmi3/stratagus/macro-space into lp:stratagus

[Dmitry Marakasov]

Unmerged revisions

9013. By Dmitry Marakasov on 2015-05-13

[-] Fix compilation with c++11 by adding space between string literal and macro

=== modified file 'src/ai/ai_plan.cpp'
--- src/ai/ai_plan.cpp	2015-02-26 12:50:55 +0000
+++ src/ai/ai_plan.cpp	2015-05-13 23:51:37 +0000
@@ -343,7 +343,7 @@
 int AiForce::PlanAttack()
 {
 	CPlayer &player = *AiPlayer->Player;
-	DebugPrint("%d: Planning for force #%lu of player #%d\n"_C_ player.Index
+	DebugPrint("%d: Planning for force #%lu of player #%d\n" _C_ player.Index
 			   _C_(long unsigned int)(this - & (AiPlayer->Force[0])) _C_ player.Index);
 
 	TerrainTraversal transporterTerrainTraversal;
 
=== modified file 'src/stratagus/script.cpp'
--- src/stratagus/script.cpp	2015-03-08 20:00:56 +0000
+++ src/stratagus/script.cpp	2015-05-13 23:51:37 +0000
@@ -758,7 +758,7 @@
 			lua_pop(l, 1); // table.
 		} else {
 			lua_pop(l, 1);
-			LuaError(l, "unknow condition '%s'"_C_ key);
+			LuaError(l, "unknow condition '%s'" _C_ key);
 		}
 	} else {
 		LuaError(l, "Parse Error in ParseNumber");
@@ -872,7 +872,7 @@
 			res->D.PlayerName = CclParseNumberDesc(l);
 		} else {
 			lua_pop(l, 1);
-			LuaError(l, "unknow condition '%s'"_C_ key);
+			LuaError(l, "unknow condition '%s'" _C_ key);
 		}
 	} else {
 		LuaError(l, "Parse Error in ParseString");