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

Don't use 0 as null pointer constant, part 1

Browse source 
Use NULL instead of 0, for clarity.  Except in pointer comparisons;
leave that to the next two commits.
This commit is contained in:
Markus Armbruster 2009-03-22 18:50:43 +01:00
parent a2ed975ec2
commit 615681ce16
51 changed files with 107 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/lib/subs/unitsub.c
View file

@ -147,14 +147,14 @@ unit_path(int together, struct empobj *unit, char *buf)
return NULL;
if (!sarg_xy(buf, &destx, &desty))
return 0;
return NULL;
if (!together) {
pr("Cannot go to a destination sector if not all starting in the same sector\n");
return 0;
return NULL;
}
if (!getsect(destx, desty, &d_sect)) {
pr("%d,%d is not a sector\n", destx, desty);
return 0;
return NULL;
}
if (unit->ef_type == EF_SHIP) {
cp = BestShipPath(buf, unit->x, unit->y,
@ -162,7 +162,7 @@ unit_path(int together, struct empobj *unit, char *buf)
if (!cp || unit->mobil <= 0) {
pr("Can't get to '%s' right now.\n",
xyas(d_sect.sct_x, d_sect.sct_y, player->cnum));
return 0;
return NULL;
}
} else {
getsect(unit->x, unit->y, &sect);
@ -173,7 +173,7 @@ unit_path(int together, struct empobj *unit, char *buf)
mtype == MOB_RAIL ? "railway" : "path",
xyas(unit->x, unit->y, player->cnum),
xyas(d_sect.sct_x, d_sect.sct_y, player->cnum));
return 0;
return NULL;
}
pr("Using path '%s'\n", cp);
}