fire launch: Avoid "may be used uninitialized" warnings

[empserver] / src / lib / commands / mfir.c

diff --git a/src/lib/commands/mfir.c b/src/lib/commands/mfir.c
index 2cf719289c4b8548e889441f85e6eba0dee21fc3..de2aa0a45e45ecfd0fbdef4062d597f5ed4d8c6f 100644 (file)
--- a/src/lib/commands/mfir.c
+++ b/src/lib/commands/mfir.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -28,7 +28,7 @@
  *
  *  Known contributors to this file:
  *     Steve McClure, 2000
- *     Markus Armbruster, 2004-2016
+ *     Markus Armbruster, 2004-2021
  */
 
 #include <config.h>
@@ -66,7 +66,7 @@ static void free_flist(struct emp_qelem *);
 static struct flist *search_flist(struct emp_qelem *, struct empobj *);
 
 int
-multifire(void)
+c_fire(void)
 {
     static int ef_with_guns[] = { EF_SECTOR, EF_SHIP, EF_LAND, EF_BAD };
     char *ptr;
@@ -393,16 +393,16 @@ multifire(void)
            putsect(&vsect);
            break;
        default:
-           getship(vshipno, &vship);
+           getship(vship.shp_uid, &vship);
            shipdamage(&vship, dam);
            if (vship.shp_effic < SHIP_MINEFF)
                pr("%s sunk!\n", prsub(&vship));
            if (dam && (vship.shp_rflags & RET_INJURED))
-               retreat_ship(&vship, vict, 'i');
+               retreat_ship(&vship, vict);
            else if (target == targ_sub && (vship.shp_rflags & RET_DCHRGED))
-               retreat_ship(&vship, vict, 'd');
+               retreat_ship(&vship, vict);
            else if (totaldefdam == 0 && (vship.shp_rflags & RET_HELPLESS))
-               retreat_ship(&vship, vict, 'h');
+               retreat_ship(&vship, vict);
            putship(vship.shp_uid, &vship);
            break;
        }