From 05e5adfac83e42101025b395d2f414df022bce15 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 26 Apr 2008 09:53:47 +0200 Subject: [PATCH] Debug code to help catch the phantom nuke bug Thu Apr 24 12:20:52 2008 Oops: bug in ../src/lib/subs/plnsub.c:1146 #3 0x080e64f4 in oops (msg=0x0, file=0x80ff1ca "../src/lib/subs/plnsub.c", line=1146) at ../src/lib/gen/log.c:141 #4 0x080bce6c in pln_damage (pp=0x8415b60, x=82, y=20, type=115 's', nukedamp=0x84158bc, noisy=1) at ../src/lib/subs/plnsub.c:1146 #5 0x080684f2 in launch_missile (pp=0x8415b60, sublaunch=0) at ../src/lib/commands/laun.c:281 #6 0x08067c79 in laun () at ../src/lib/commands/laun.c:111 --- src/lib/subs/nuke.c | 3 +++ src/lib/subs/plane.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/lib/subs/nuke.c b/src/lib/subs/nuke.c index fe71e7ba..363621f3 100644 --- a/src/lib/subs/nuke.c +++ b/src/lib/subs/nuke.c @@ -89,6 +89,9 @@ nuk_prewrite(int n, void *ptr) } getnuke(n, &nuke); + if (nuke.nuk_plane != np->nuk_plane) + logerror("phantom nuke debug: nuk#%d plane %d->%d", + np->nuk_uid, nuke.nuk_plane, np->nuk_plane); return 1; } diff --git a/src/lib/subs/plane.c b/src/lib/subs/plane.c index aaaaf845..17554dd1 100644 --- a/src/lib/subs/plane.c +++ b/src/lib/subs/plane.c @@ -132,6 +132,9 @@ pln_prewrite(int n, void *ptr) } } getplane(n, &plane); + if (plane.pln_nuketype != pp->pln_nuketype) + logerror("phantom nuke debug: pln#%d nuketype %d->%d", + pp->pln_uid, plane.pln_nuketype, pp->pln_nuketype); return 1; }