Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #78 from badgerman/bug-2052 

bugfix: could not GIVE to TEMP units.
This commit is contained in:
Enno Rehling 2014-12-14 16:31:48 +01:00
parent 2a113bcd04 0645578305
commit d6ce30a9a9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/give.c
View File

@ -518,7 +518,7 @@ void give_unit(unit * u, unit * u2, order * ord)
bool can_give_to(unit *u, unit *u2) { bool can_give_to(unit *u, unit *u2) {
/* Damit Tarner nicht durch die Fehlermeldung enttarnt werden können */ /* Damit Tarner nicht durch die Fehlermeldung enttarnt werden können */
if (!u2 || u2->number == 0) { if (!u2) {
return false; return false;
} }
if (u2 && !alliedunit(u2, u->faction, HELP_GIVE) if (u2 && !alliedunit(u2, u->faction, HELP_GIVE)

2
src/kernel/config.c
View File

@ -1016,9 +1016,9 @@ int read_unitid(const faction * f, const region * r)
int getunit(const region * r, const faction * f, unit **uresult) int getunit(const region * r, const faction * f, unit **uresult)
{ {
unit *u2 = NULL;
int n = read_unitid(f, r); int n = read_unitid(f, r);
int result = GET_NOTFOUND; int result = GET_NOTFOUND;
unit *u2 = NULL;
if (n == 0) { if (n == 0) {
result = GET_PEASANTS; result = GET_PEASANTS;