forked from github/server
eliminate bsdstring.h usage
This commit is contained in:
parent
6abf054b42
commit
cb5d15fee3
1 changed files with 8 additions and 11 deletions
19
src/move.c
19
src/move.c
|
@ -73,7 +73,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
#include <util/assert.h>
|
#include <util/assert.h>
|
||||||
#include <util/attrib.h>
|
#include <util/attrib.h>
|
||||||
#include <util/base36.h>
|
#include <util/base36.h>
|
||||||
#include <util/bsdstring.h>
|
|
||||||
#include <util/gamedata.h>
|
#include <util/gamedata.h>
|
||||||
#include <util/language.h>
|
#include <util/language.h>
|
||||||
#include <util/lists.h>
|
#include <util/lists.h>
|
||||||
|
@ -2247,10 +2246,9 @@ static direction_t hunted_dir(attrib * at, int id)
|
||||||
int follow_ship(unit * u, order * ord)
|
int follow_ship(unit * u, order * ord)
|
||||||
{
|
{
|
||||||
region *rc = u->region;
|
region *rc = u->region;
|
||||||
size_t bytes;
|
sbstring sbcmd;
|
||||||
int moves, id, speed;
|
int moves, id, speed;
|
||||||
char command[256], *bufp = command;
|
char command[256];
|
||||||
size_t size = sizeof(command);
|
|
||||||
direction_t dir;
|
direction_t dir;
|
||||||
|
|
||||||
if (fval(u, UFL_NOTMOVING)) {
|
if (fval(u, UFL_NOTMOVING)) {
|
||||||
|
@ -2286,11 +2284,10 @@ int follow_ship(unit * u, order * ord)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
bufp = command;
|
sbs_init(&sbcmd, command, sizeof(command));
|
||||||
bytes = slprintf(bufp, size, "%s %s", LOC(u->faction->locale, keyword(K_MOVE)), LOC(u->faction->locale, directions[dir]));
|
sbs_strcpy(&sbcmd, LOC(u->faction->locale, keyword(K_MOVE)));
|
||||||
assert(bytes <= INT_MAX);
|
sbs_strcat(&sbcmd, " ");
|
||||||
if (wrptr(&bufp, &size, (int)bytes) != 0)
|
sbs_strcat(&sbcmd, LOC(u->faction->locale, directions[dir]));
|
||||||
WARN_STATIC_BUFFER();
|
|
||||||
|
|
||||||
moves = 1;
|
moves = 1;
|
||||||
|
|
||||||
|
@ -2306,8 +2303,8 @@ int follow_ship(unit * u, order * ord)
|
||||||
rc = rconnect(rc, dir);
|
rc = rconnect(rc, dir);
|
||||||
while (rc && moves < speed && (dir = hunted_dir(rc->attribs, id)) != NODIRECTION) {
|
while (rc && moves < speed && (dir = hunted_dir(rc->attribs, id)) != NODIRECTION) {
|
||||||
const char *loc = LOC(u->faction->locale, directions[dir]);
|
const char *loc = LOC(u->faction->locale, directions[dir]);
|
||||||
bufp = STRLCPY_EX(bufp, " ", &size, "hunt");
|
sbs_strcat(&sbcmd, " ");
|
||||||
bufp = STRLCPY_EX(bufp, loc, &size, "hunt");
|
sbs_strcat(&sbcmd, loc);
|
||||||
moves++;
|
moves++;
|
||||||
rc = rconnect(rc, dir);
|
rc = rconnect(rc, dir);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue