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

Remove p_mode, use MOB_FLY and MOB_SAIL instead

Browse source
This commit is contained in:
Markus Armbruster 2011-03-27 08:29:50 +02:00
parent 8f008bf849
commit 182d62deed
8 changed files with 19 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/lib/commands/bomb.c
View file

@ -30,7 +30,7 @@
* Dave Pare, 1986
* Ken Stevens, 1995
* Steve McClure, 1998-2000
* Markus Armbruster, 2004-2009
* Markus Armbruster, 2004-2011
*/
#include <config.h>
@ -108,7 +108,7 @@ bomb(void)
return RET_SYN;
ax = ap_sect.sct_x;
ay = ap_sect.sct_y;
if (!getpath(flightpath, player->argp[5], ax, ay, 0, 0, P_FLYING)
if (!getpath(flightpath, player->argp[5], ax, ay, 0, 0, MOB_FLY)
|| *flightpath == 0)
return RET_SYN;
tx = ax;

4
src/lib/commands/drop.c
View file

@ -28,7 +28,7 @@
*
* Known contributors to this file:
* Dave Pare, 1986
* Markus Armbruster, 2004-2009
* Markus Armbruster, 2004-2011
*/
#include <config.h>
@ -62,7 +62,7 @@ drop(void)
return RET_SYN;
ax = ap_sect.sct_x;
ay = ap_sect.sct_y;
if (!getpath(flightpath, player->argp[4], ax, ay, 0, 0, P_FLYING)
if (!getpath(flightpath, player->argp[4], ax, ay, 0, 0, MOB_FLY)
|| *flightpath == 0)
return RET_SYN;
tx = ax;

4
src/lib/commands/fly.c
View file

@ -29,7 +29,7 @@
* Known contributors to this file:
* Dave Pare, 1986
* Steve McClure, 2000
* Markus Armbruster, 2004-2009
* Markus Armbruster, 2004-2011
*/
#include <config.h>
@ -65,7 +65,7 @@ fly(void)
return RET_SYN;
ax = ap_sect.sct_x;
ay = ap_sect.sct_y;
if (!getpath(flightpath, player->argp[4], ax, ay, 0, 0, P_FLYING)
if (!getpath(flightpath, player->argp[4], ax, ay, 0, 0, MOB_FLY)
|| *flightpath == 0)
return RET_SYN;
tx = ax;

4
src/lib/commands/para.c
View file

@ -29,7 +29,7 @@
* Known contributors to this file:
* Dave Pare, 1986
* Ken Stevens, 1995
* Markus Armbruster, 2004-2009
* Markus Armbruster, 2004-2011
*/
#include <config.h>
@ -66,7 +66,7 @@ para(void)
return RET_SYN;
ax = ap_sect.sct_x;
ay = ap_sect.sct_y;
if (!getpath(flightpath, player->argp[4], ax, ay, 0, 0, P_FLYING)
if (!getpath(flightpath, player->argp[4], ax, ay, 0, 0, MOB_FLY)
|| *flightpath == 0)
return RET_SYN;
tx = ax;

4
src/lib/commands/reco.c
View file

@ -28,7 +28,7 @@
*
* Known contributors to this file:
* Dave Pare, 1986
* Markus Armbruster, 2004-2009
* Markus Armbruster, 2004-2011
*/
#include <config.h>
@ -63,7 +63,7 @@ reco(void)
return RET_SYN;
ax = ap_sect.sct_x;
ay = ap_sect.sct_y;
if (!getpath(flightpath, player->argp[4], ax, ay, 0, 0, P_FLYING)
if (!getpath(flightpath, player->argp[4], ax, ay, 0, 0, MOB_FLY)
|| *flightpath == 0)
return RET_SYN;
tx = ax;

2
src/lib/commands/sail.c
View file

@ -121,7 +121,7 @@ cmd_sail_ship(struct nstr_item *nstr)
pr("Ship #%d at %s\n", ship.shp_uid,
xyas(ship.shp_x, ship.shp_y, player->cnum));
cp = getpath(navpath, player->argp[2],
ship.shp_x, ship.shp_y, 0, 0, P_SAILING);
ship.shp_x, ship.shp_y, 0, 0, MOB_SAIL);
if (!cp)
return RET_FAIL;
if (!check_ship_ok(&ship))