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

s_char purge directed by compiler warnings.

Browse source
This commit is contained in:
Markus Armbruster 2006-04-29 06:41:45 +00:00
parent 87b5d5d6e3
commit a988b907fc
130 changed files with 527 additions and 527 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/lib/common/mailbox.c
View file

@ -38,8 +38,8 @@
#include "optlist.h"
#include <stdio.h>
s_char *
mailbox(s_char *buf, natid cn)
char *
mailbox(char *buf, natid cn)
{
(void)sprintf(buf, "%s%d", telfil, cn);
return buf;

26
src/lib/common/maps.c
View file

@ -51,7 +51,7 @@
#include "optlist.h"
static int bmnxtsct(struct nstr_sect *);
static s_char map_char(unsigned char type, natid own, int owner_or_god);
static char map_char(unsigned char type, natid own, int owner_or_god);
int
draw_map(int bmap, s_char origin, int map_flags, struct nstr_sect *nsp)
@ -67,8 +67,8 @@ draw_map(int bmap, s_char origin, int map_flags, struct nstr_sect *nsp)
/* Note this is not re-entrant anyway, so we keep the buffers
around */
static unsigned char *bitmap = NULL;
static s_char *wmapbuf = NULL;
static s_char **wmap = NULL;
static char *wmapbuf = NULL;
static char **wmap = NULL;
if (!wmapbuf)
wmapbuf = malloc(WORLD_Y * MAPWIDTH(1));
@ -153,7 +153,7 @@ draw_map(int bmap, s_char origin, int map_flags, struct nstr_sect *nsp)
}
} else {
struct sctstr sect;
s_char mapch;
char mapch;
int changed = 0;
if (!player->god) {
@ -218,7 +218,7 @@ draw_map(int bmap, s_char origin, int map_flags, struct nstr_sect *nsp)
}
}
if (map_flags & MAP_HIGH) {
s_char *ptr;
char *ptr;
struct sctstr sect;
snxtsct_rewind(nsp);
@ -287,7 +287,7 @@ bmnxtsct(struct nstr_sect *np)
* Return character to use in maps for sector type TYPE owned by OWN.
* If OWNER_OR_GOD, the map is for the sector's owner or a deity.
*/
static s_char
static char
map_char(unsigned char type, natid own, int owner_or_god)
{
if (type > SCT_MAXDEF) {
@ -352,16 +352,16 @@ bmaps_intersect(natid a, natid b)
/* Note that this requires that the BMAP is mapped into memory */
int
share_bmap(natid from, natid to, struct nstr_sect *ns, s_char des,
s_char *from_name)
share_bmap(natid from, natid to, struct nstr_sect *ns, char des,
char *from_name)
{
s_char *from_bmap = ef_ptr(EF_BMAP, from);
s_char *to_bmap = ef_ptr(EF_BMAP, to);
char *from_bmap = ef_ptr(EF_BMAP, from);
char *to_bmap = ef_ptr(EF_BMAP, to);
int n = 0;
struct sctstr sect;
s_char fromdes;
s_char todes;
s_char from_des = *from_name;
char fromdes;
char todes;
char from_des = *from_name;
if (isalpha(from_des))
from_des &= ~0x20;

26
src/lib/common/path.c
View file

@ -59,7 +59,7 @@ struct bestp {
struct as_data *adp;
};
static int bp_path(struct as_path *pp, s_char *buf);
static int bp_path(struct as_path *pp, char *buf);
static int bp_neighbors(struct as_coord c, struct as_coord *cp, void *);
static double bp_lbcost(struct as_coord from, struct as_coord to, void *);
static double bp_realcost(struct as_coord from, struct as_coord to, void *);
@ -96,7 +96,7 @@ bp_init(void)
* string in path. Return 0 on success, -1 on error.
*/
static int
best_path(struct sctstr *from, struct sctstr *to, s_char *path,
best_path(struct sctstr *from, struct sctstr *to, char *path,
int mob_type)
{
static struct bestp *mybestpath;
@ -138,10 +138,10 @@ best_path(struct sctstr *from, struct sctstr *to, s_char *path,
* success, -1 on failure.
*/
static int
bp_path(struct as_path *pp, s_char *buf)
bp_path(struct as_path *pp, char *buf)
{
struct as_path *np;
s_char *cp = buf;
char *cp = buf;
int dx, dy;
int n;
@ -301,7 +301,7 @@ bp_clear_cachepath(void)
}
double
pathcost(struct sctstr *start, s_char *path, int mob_type)
pathcost(struct sctstr *start, char *path, int mob_type)
{
struct sctstr *sectp = (void *)empfile[EF_SECTOR].cache;
unsigned i;
@ -338,16 +338,16 @@ pathcost(struct sctstr *start, s_char *path, int mob_type)
return cost;
}
s_char *
BestDistPath(s_char *path,
char *
BestDistPath(char *path,
struct sctstr *from,
struct sctstr *to, double *cost, int mob_type)
{
return BestLandPath(path, from, to, cost, mob_type);
}
s_char *
BestLandPath(s_char *path,
char *
BestLandPath(char *path,
struct sctstr *from,
struct sctstr *to, double *cost, int mob_type)
{
@ -364,8 +364,8 @@ BestLandPath(s_char *path,
return path;
}
s_char *
BestShipPath(s_char *path, int fx, int fy, int tx, int ty, int owner)
char *
BestShipPath(char *path, int fx, int fy, int tx, int ty, int owner)
{
char *map;
@ -376,8 +376,8 @@ BestShipPath(s_char *path, int fx, int fy, int tx, int ty, int owner)
return bestownedpath(path, map, fx, fy, tx, ty, owner);
}
s_char *
BestAirPath(s_char *path, int fx, int fy, int tx, int ty)
char *
BestAirPath(char *path, int fx, int fy, int tx, int ty)
{
return bestownedpath(path, 0, fx, fy, tx, ty, -1);
}