Stratagus

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

  1. macro-space
  2. Merge into trunk
Proposed by Dmitry Marakasov
Status: Needs review
Proposed branch: lp:~amdmi3/stratagus/macro-space
Merge into: lp:stratagus
Diff against target: 34 lines (+3/-3)
2 files modified
src/ai/ai_plan.cpp (+1/-1)
src/stratagus/script.cpp (+2/-2)
To merge this branch: bzr merge lp:~amdmi3/stratagus/macro-space
Reviewer Review Type Date Requested Status
Stratagus Pending
Review via email: mp+259060@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

9013. By Dmitry Marakasov

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/ai/ai_plan.cpp'
2--- src/ai/ai_plan.cpp 2015-02-26 12:50:55 +0000
3+++ src/ai/ai_plan.cpp 2015-05-13 23:51:37 +0000
4@@ -343,7 +343,7 @@
5 int AiForce::PlanAttack()
6 {
7 CPlayer &player = *AiPlayer->Player;
8- DebugPrint("%d: Planning for force #%lu of player #%d\n"_C_ player.Index
9+ DebugPrint("%d: Planning for force #%lu of player #%d\n" _C_ player.Index
10 _C_(long unsigned int)(this - & (AiPlayer->Force[0])) _C_ player.Index);
11
12 TerrainTraversal transporterTerrainTraversal;
13
14=== modified file 'src/stratagus/script.cpp'
15--- src/stratagus/script.cpp 2015-03-08 20:00:56 +0000
16+++ src/stratagus/script.cpp 2015-05-13 23:51:37 +0000
17@@ -758,7 +758,7 @@
18 lua_pop(l, 1); // table.
19 } else {
20 lua_pop(l, 1);
21- LuaError(l, "unknow condition '%s'"_C_ key);
22+ LuaError(l, "unknow condition '%s'" _C_ key);
23 }
24 } else {
25 LuaError(l, "Parse Error in ParseNumber");
26@@ -872,7 +872,7 @@
27 res->D.PlayerName = CclParseNumberDesc(l);
28 } else {
29 lua_pop(l, 1);
30- LuaError(l, "unknow condition '%s'"_C_ key);
31+ LuaError(l, "unknow condition '%s'" _C_ key);
32 }
33 } else {
34 LuaError(l, "Parse Error in ParseString");

Subscribers

People subscribed via source and target branches

to status/vote changes: