Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a bug introduced in r5406: 

* VTOLs didn't ever become "happy" again (i.e. where marked as fully armed and healed)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5407 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2008-07-07 12:44:00 +00:00
parent 9c501e4641
commit 336656a0a8
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/droid.c
View File

@ -4576,7 +4576,7 @@ BOOL vtolHappy(const DROID* psDroid)
ASSERT(isVtolDroid(psDroid), "not a VTOL droid");
if (psDroid->body <= psDroid->originalBody)
if (psDroid->body < psDroid->originalBody)
{
// VTOLs with less health than their original aren't happy
return false;
@ -4613,6 +4613,8 @@ BOOL vtolHappy(const DROID* psDroid)
&& !(rearmedWeaps & curWeap))
return false;
}
return true;
}
ASSERT(!"Do we ever get here?", "If a crash/abortion occurs here, please attach a backtrace (the crash dump file) to https://gna.org/bugs/?11865 as it will affect the bugfix for that bug.");