]> git.pond.sub.org Git - empserver/commitdiff
Clean up unobvious coordinate system use in detonate()
authorMarkus Armbruster <armbru@pond.sub.org>
Sun, 20 Jun 2010 15:57:55 +0000 (17:57 +0200)
committerMarkus Armbruster <armbru@pond.sub.org>
Sun, 25 Jul 2010 15:48:53 +0000 (17:48 +0200)
Use the obviously correct player->cnum instead of own.  They're
actually equal here.

src/lib/subs/detonate.c

index b87842e61a0ee67fdad7145bc55350f1b2a1ee6d..95bcf2ae1843eac2787db4c7812f6946ade9681e 100644 (file)
@@ -186,7 +186,7 @@ detonate(struct nukstr *np, coord x, coord y, int airburst)
        if (own == player->cnum) {
            pr("%s at %s reports %d%% damage\n",
               prplane(&plane),
-              xyas(plane.pln_x, plane.pln_y, own), damage);
+              xyas(plane.pln_x, plane.pln_y, player->cnum), damage);
        } else {
            mpr(own, "%s nuclear device did %d%% damage to %s at %s\n",
                cname(player->cnum), damage,
@@ -228,7 +228,8 @@ detonate(struct nukstr *np, coord x, coord y, int airburst)
        land_damage(&land, damage);
        if (own == player->cnum) {
            pr("%s at %s reports %d%% damage\n",
-              prland(&land), xyas(land.lnd_x, land.lnd_y, own), damage);
+              prland(&land), xyas(land.lnd_x, land.lnd_y, player->cnum),
+              damage);
        } else {
            mpr(own, "%s nuclear device did %d%% damage to %s at %s\n",
                cname(player->cnum), damage,
@@ -264,7 +265,8 @@ detonate(struct nukstr *np, coord x, coord y, int airburst)
        ship_damage(&ship, damage);
        if (own == player->cnum) {
            pr("%s at %s reports %d%% damage\n",
-              prship(&ship), xyas(ship.shp_x, ship.shp_y, own), damage);
+              prship(&ship), xyas(ship.shp_x, ship.shp_y, player->cnum),
+              damage);
        } else {
            mpr(own, "%s nuclear device did %d%% damage to %s at %s\n",
                cname(player->cnum), damage, prship(&ship),
@@ -284,7 +286,7 @@ detonate(struct nukstr *np, coord x, coord y, int airburst)
        nuke.nuk_effic = 0;
        if (own == player->cnum) {
            pr("%s at %s destroyed\n",
-              prnuke(&nuke), xyas(nuke.nuk_x, nuke.nuk_y, own));
+              prnuke(&nuke), xyas(nuke.nuk_x, nuke.nuk_y, player->cnum));
        } else {
            mpr(own, "%s nuclear device destroyed %s at %s\n",
                cname(player->cnum), prnuke(&nuke),