Merge pull request #564 from ennorehling/develop

fix broken develop build from previous PR
This commit is contained in:
Enno Rehling 2016-09-10 21:49:24 +02:00 committed by GitHub
commit 0978c1c98f
2 changed files with 12 additions and 10 deletions

20
.gitmodules vendored
View file

@ -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

View file

@ -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);
}