forked from github/server
bugfix: could not GIVE to TEMP units.
https://bugs.eressea.de/view.php?id=2052
This commit is contained in:
parent
b506bed4d9
commit
0645578305
|
@ -518,7 +518,7 @@ void give_unit(unit * u, unit * u2, order * ord)
|
|||
|
||||
bool can_give_to(unit *u, unit *u2) {
|
||||
/* Damit Tarner nicht durch die Fehlermeldung enttarnt werden können */
|
||||
if (!u2 || u2->number == 0) {
|
||||
if (!u2) {
|
||||
return false;
|
||||
}
|
||||
if (u2 && !alliedunit(u2, u->faction, HELP_GIVE)
|
||||
|
|
|
@ -1016,9 +1016,9 @@ int read_unitid(const faction * f, const region * r)
|
|||
|
||||
int getunit(const region * r, const faction * f, unit **uresult)
|
||||
{
|
||||
unit *u2 = NULL;
|
||||
int n = read_unitid(f, r);
|
||||
int result = GET_NOTFOUND;
|
||||
unit *u2 = NULL;
|
||||
|
||||
if (n == 0) {
|
||||
result = GET_PEASANTS;
|
||||
|
|
Loading…
Reference in New Issue