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

Rename obj_nameof() to unit_nameof() and move to unitsub.c

Browse source
This commit is contained in:
Markus Armbruster 2011-05-21 15:42:38 +02:00
parent 766788480f
commit 1c93c5fbc8
10 changed files with 41 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/lib/commands/scra.c
View file

@ -35,7 +35,6 @@
#include <ctype.h>
#include "commands.h"
#include "empobj.h"
#include "optlist.h"
#include "unit.h"
@ -159,7 +158,7 @@ scra(void)
if (!player->owner
&& relations_with(sect.sct_own, player->cnum) != ALLIED) {
pr("%s is not in an allied sector!\n",
obj_nameof(&item.gen));
unit_nameof(&item.gen));
continue;
}
if (type == EF_PLANE
@ -171,7 +170,7 @@ scra(void)
}
pr("%s scrapped in %s\n",
obj_nameof(&item.gen),
unit_nameof(&item.gen),
xyas(item.gen.x, item.gen.y, player->cnum));
unit_drop_cargo(&item.gen, sect.sct_own);
if (type == EF_SHIP) {