From 3a438ffd4f20ac24a9d086ef1dd2bb5c92d740a9 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 10 Sep 2016 21:12:19 +0200 Subject: [PATCH 1/2] I have questions about this --- src/economy.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/economy.c b/src/economy.c index c9d218038..8d4939d4a 100644 --- a/src/economy.c +++ b/src/economy.c @@ -2543,6 +2543,8 @@ static void steal_cmd(unit * u, struct order *ord, request ** stealorders) f = u2->faction; } else { + // TODO: is this really necessary? it's the only time we use faction.c/deadhash + // it allows stealing from a unit in a dead faction, but why? f = dfindhash(id); } From afeae5ff2bab7db322cd2b5d85abae09e5f0db45 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 10 Sep 2016 21:16:49 +0200 Subject: [PATCH 2/2] fix travis build, bad gitmodules urls --- .gitmodules | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitmodules b/.gitmodules index 7e795bf4e..81c45896e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,31 +1,31 @@ [submodule "lunit"] path = lunit - url = git@github.com:ennorehling/lunit.git + url = https://github.com/ennorehling/lunit.git [submodule "cmake"] path = cmake - url = git@github.com:ennorehling/cmake.git + url = https://github.com/ennorehling/cmake.git [submodule "quicklist"] path = quicklist - url = git@github.com:ennorehling/quicklist.git + url = https://github.com/ennorehling/quicklist.git [submodule "critbit"] path = critbit - url = git@github.com:ennorehling/critbit.git + url = https://github.com/ennorehling/critbit.git [submodule "dlmalloc"] path = dlmalloc - url = git@github.com:ennorehling/dlmalloc.git + url = https://github.com/ennorehling/dlmalloc.git [submodule "cutest"] path = cutest - url = git@github.com:ennorehling/cutest.git + url = https://github.com/ennorehling/cutest.git [submodule "iniparser"] path = iniparser - url = git@github.com:ennorehling/iniparser.git + url = https://github.com/ennorehling/iniparser.git [submodule "cJSON"] path = cJSON - url = git@github.com:ennorehling/cJSON.git + url = https://github.com/ennorehling/cJSON.git [submodule "storage"] path = storage - url = git@github.com:ennorehling/storage.git + url = https://github.com/ennorehling/storage.git branch = master [submodule "tolua"] path = tolua - url = git@github.com:ennorehling/tolua.git + url = https://github.com/ennorehling/tolua.git