empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Drop pln_zap_transient_flags()'s work-around for unusable putplane()

Browse source 
I believe putplane() became usable here in commit 3cf29456, v4.3.17.
The work-around was pretty wasteful (not that it mattered).
This commit is contained in:
Markus Armbruster 2011-05-22 08:10:41 +02:00
parent 6eec001050
commit b991ddf8de
1 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/lib/common/ef_verify.c
View file

@ -198,7 +198,6 @@ pln_zap_transient_flags(int may_put)
{ {
int i; int i;
struct plnstr *pp; struct plnstr *pp;
int dirty = 0;
/* laziness: assumes plane file is EFF_MEM */ /* laziness: assumes plane file is EFF_MEM */
for (i = 0; (pp = getplanep(i)) != NULL; i++) { for (i = 0; (pp = getplanep(i)) != NULL; i++) {
@ -208,16 +207,11 @@ pln_zap_transient_flags(int may_put)
&& (plchr[pp->pln_type].pl_flags & (P_M | P_O)) != P_O) { && (plchr[pp->pln_type].pl_flags & (P_M | P_O)) != P_O) {
pp->pln_flags &= ~PLN_LAUNCHED; pp->pln_flags &= ~PLN_LAUNCHED;
/* FIXME missile should be destroyed instead */ /* FIXME missile should be destroyed instead */
dirty = 1; if (may_put)
putplane(i, pp);
verify_fail(EF_PLANE, i, NULL, 0, "stuck in the air (fixed)"); verify_fail(EF_PLANE, i, NULL, 0, "stuck in the air (fixed)");
/*
* Can't putplane() here, because pln_prewrite() crashes
* without a valid player.
*/
} }
} }
if (dirty && may_put)
ef_flush(EF_PLANE); /* pretty wasteful */
} }
/* /*