From b991ddf8de4f85a44d3f0bf291d0d984f4047150 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sun, 22 May 2011 08:10:41 +0200 Subject: [PATCH] Drop pln_zap_transient_flags()'s work-around for unusable putplane() I believe putplane() became usable here in commit 3cf29456, v4.3.17. The work-around was pretty wasteful (not that it mattered). --- src/lib/common/ef_verify.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/lib/common/ef_verify.c b/src/lib/common/ef_verify.c index 139d04315..7709974ab 100644 --- a/src/lib/common/ef_verify.c +++ b/src/lib/common/ef_verify.c @@ -198,7 +198,6 @@ pln_zap_transient_flags(int may_put) { int i; struct plnstr *pp; - int dirty = 0; /* laziness: assumes plane file is EFF_MEM */ 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) { pp->pln_flags &= ~PLN_LAUNCHED; /* 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)"); - /* - * Can't putplane() here, because pln_prewrite() crashes - * without a valid player. - */ } } - if (dirty && may_put) - ef_flush(EF_PLANE); /* pretty wasteful */ } /* -- 2.43.0