Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add region_id to messages that include a region.

This commit is contained in:
Enno Rehling 2020-08-23 20:55:58 +02:00
parent 708abf4997
commit 9c71139bf4
3 changed files with 47 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/creport.c
View File

@ -298,35 +298,35 @@ static void cr_output_curses_compat(FILE *F, const faction * viewer, const void
cr_output_curses(&strm, viewer, obj, typ); cr_output_curses(&strm, viewer, obj, typ);
} }
static int cr_unit(variant var, char *buffer, const void *userdata) static int cr_unit(variant var, const char *name, char *buffer, const void *userdata)
{ {
unit *u = (unit *)var.v; unit *u = (unit *)var.v;
sprintf(buffer, "%d", u ? u->no : -1); sprintf(buffer, "%d;%s\n", u ? u->no : -1, name);
return 0; return 0;
} }
static int cr_ship(variant var, char *buffer, const void *userdata) static int cr_ship(variant var, const char *name, char *buffer, const void *userdata)
{ {
ship *u = (ship *)var.v; ship *u = (ship *)var.v;
sprintf(buffer, "%d", u ? u->no : -1); sprintf(buffer, "%d;%s\n", u ? u->no : -1, name);
return 0; return 0;
} }
static int cr_building(variant var, char *buffer, const void *userdata) static int cr_building(variant var, const char *name, char *buffer, const void *userdata)
{ {
building *u = (building *)var.v; building *u = (building *)var.v;
sprintf(buffer, "%d", u ? u->no : -1); sprintf(buffer, "%d;%s\n", u ? u->no : -1, name);
return 0; return 0;
} }
static int cr_faction(variant var, char *buffer, const void *userdata) static int cr_faction(variant var, const char *name, char *buffer, const void *userdata)
{ {
faction *f = (faction *)var.v; faction *f = (faction *)var.v;
sprintf(buffer, "%d", f ? f->no : -1); sprintf(buffer, "%d;%s\n", f ? f->no : -1, name);
return 0; return 0;
} }
static int cr_region(variant var, char *buffer, const void *userdata) static int cr_region(variant var, const char *name, char *buffer, const void *userdata)
{ {
const faction *report = (const faction *)userdata; const faction *report = (const faction *)userdata;
region *r = (region *)var.v; region *r = (region *)var.v;
@ -335,60 +335,60 @@ static int cr_region(variant var, char *buffer, const void *userdata)
int nx = r->x, ny = r->y; int nx = r->x, ny = r->y;
pnormalize(&nx, &ny, pl); pnormalize(&nx, &ny, pl);
adjust_coordinates(report, &nx, &ny, pl); adjust_coordinates(report, &nx, &ny, pl);
sprintf(buffer, "%d %d %d", nx, ny, plane_id(pl)); sprintf(buffer, "%d;%s_id\n%d %d %d;%s\n", r->uid, name, nx, ny, plane_id(pl), name);
return 0; return 0;
} }
return -1; return -1;
} }
static int cr_resource(variant var, char *buffer, const void *userdata) static int cr_resource(variant var, const char *name, char *buffer, const void *userdata)
{ {
const faction *report = (const faction *)userdata; const faction *report = (const faction *)userdata;
const resource_type *r = (const resource_type *)var.v; const resource_type *r = (const resource_type *)var.v;
if (r) { if (r) {
const char *key = resourcename(r, 0); const char *key = resourcename(r, 0);
sprintf(buffer, "\"%s\"", sprintf(buffer, "\"%s\";%s\n",
translate(key, LOC(report->locale, key))); translate(key, LOC(report->locale, key)), name);
return 0; return 0;
} }
return -1; return -1;
} }
static int cr_race(variant var, char *buffer, const void *userdata) static int cr_race(variant var, const char *name, char *buffer, const void *userdata)
{ {
const faction *report = (const faction *)userdata; const faction *report = (const faction *)userdata;
const struct race *rc = (const race *)var.v; const struct race *rc = (const race *)var.v;
const char *key = rc_name_s(rc, NAME_SINGULAR); const char *key = rc_name_s(rc, NAME_SINGULAR);
sprintf(buffer, "\"%s\"", sprintf(buffer, "\"%s\";%s\n",
translate(key, LOC(report->locale, key))); translate(key, LOC(report->locale, key)), name);
return 0; return 0;
} }
static int cr_alliance(variant var, char *buffer, const void *userdata) static int cr_alliance(variant var, const char *name, char *buffer, const void *userdata)
{ {
const alliance *al = (const alliance *)var.v; const alliance *al = (const alliance *)var.v;
UNUSED_ARG(userdata); UNUSED_ARG(userdata);
if (al != NULL) { if (al != NULL) {
sprintf(buffer, "%d", al->id); sprintf(buffer, "%d;%s\n", al->id, name);
} }
return 0; return 0;
} }
static int cr_skill(variant var, char *buffer, const void *userdata) static int cr_skill(variant var, const char *name, char *buffer, const void *userdata)
{ {
const faction *f = (const faction *)userdata; const faction *f = (const faction *)userdata;
skill_t sk = (skill_t)var.i; skill_t sk = (skill_t)var.i;
UNUSED_ARG(userdata); UNUSED_ARG(userdata);
if (sk != NOSKILL) if (sk != NOSKILL)
sprintf(buffer, "\"%s\"", sprintf(buffer, "\"%s\";%s\n",
translate(mkname("skill", skillnames[sk]), skillname(sk, translate(mkname("skill", skillnames[sk]), skillname(sk,
f->locale))); f->locale)), name);
else else
strcpy(buffer, "\"\""); sprintf(buffer, "\"\";%s\n", name);
return 0; return 0;
} }
static int cr_order(variant var, char *buffer, const void *userdata) static int cr_order(variant var, const char *name, char *buffer, const void *userdata)
{ {
order *ord = (order *)var.v; order *ord = (order *)var.v;
const faction *f = (const faction *)userdata; const faction *f = (const faction *)userdata;
@ -408,15 +408,14 @@ static int cr_order(variant var, char *buffer, const void *userdata)
} }
*wp++ = r; *wp++ = r;
} }
*wp++ = '\"'; sprintf(wp, "\";%s\n", name);
*wp++ = 0;
} }
else else
strcpy(buffer, "\"\""); sprintf(buffer, "\"\";%s\n", name);
return 0; return 0;
} }
static int cr_resources(variant var, char *buffer, const void *userdata) static int cr_resources(variant var, const char *name, char *buffer, const void *userdata)
{ {
faction *f = (faction *)userdata; faction *f = (faction *)userdata;
resource *rlist = (resource *)var.v; resource *rlist = (resource *)var.v;
@ -437,12 +436,12 @@ static int cr_resources(variant var, char *buffer, const void *userdata)
sprintf(wp, ", %d %s", rlist->number, translate(name, sprintf(wp, ", %d %s", rlist->number, translate(name,
LOC(f->locale, name))); LOC(f->locale, name)));
} }
strcat(wp, "\""); sprintf(wp, "\";%s\n", name);
} }
return 0; return 0;
} }
static int cr_regions(variant var, char *buffer, const void *userdata) static int cr_regions(variant var, const char *name, char *buffer, const void *userdata)
{ {
faction *f = (faction *)userdata; faction *f = (faction *)userdata;
const arg_regions *rdata = (const arg_regions *)var.v; const arg_regions *rdata = (const arg_regions *)var.v;
@ -463,36 +462,36 @@ static int cr_regions(variant var, char *buffer, const void *userdata)
z = plane_id(pl); z = plane_id(pl);
wp += sprintf(wp, ", %d %d %d", nx, ny, z); wp += sprintf(wp, ", %d %d %d", nx, ny, z);
} }
strcat(wp, "\""); wp += sprintf(wp, "\"%s\n", name);
} }
else { else {
strcpy(buffer, "\"\""); sprintf(buffer, "\"\";%s\n", name);
} }
return 0; return 0;
} }
static int cr_spell(variant var, char *buffer, const void *userdata) static int cr_spell(variant var, const char *name, char *buffer, const void *userdata)
{ {
const faction *report = (const faction *)userdata; const faction *report = (const faction *)userdata;
spell *sp = (spell *)var.v; spell *sp = (spell *)var.v;
if (sp != NULL) { if (sp != NULL) {
sprintf(buffer, "\"%s\"", spell_name(mkname_spell(sp), report->locale)); sprintf(buffer, "\"%s\";%s\n", spell_name(mkname_spell(sp), report->locale), name);
} }
else { else {
strcpy(buffer, "\"\""); sprintf(buffer, "\"\";%s\n", name);
} }
return 0; return 0;
} }
static int cr_curse(variant var, char *buffer, const void *userdata) static int cr_curse(variant var, const char *name, char *buffer, const void *userdata)
{ {
const faction *report = (const faction *)userdata; const faction *report = (const faction *)userdata;
const curse_type *ctype = (const curse_type *)var.v; const curse_type *ctype = (const curse_type *)var.v;
if (ctype != NULL) { if (ctype != NULL) {
sprintf(buffer, "\"%s\"", curse_name(ctype, report->locale)); sprintf(buffer, "\"%s\";%s\n", curse_name(ctype, report->locale), name);
} }
else else
strcpy(buffer, "\"\""); sprintf(buffer, "\"\";%s\n", name);
return 0; return 0;
} }

15
src/util/crmessage.c
View File

@ -123,33 +123,32 @@ int cr_render(const message * msg, char *buffer, const void *userdata)
continue; /* strcpy(c, (const char*)msg->locale_string(u->faction->locale, parameters[i])); */ continue; /* strcpy(c, (const char*)msg->locale_string(u->faction->locale, parameters[i])); */
} }
else { else {
if (crt->renderers[i](msg->parameters[i], c, userdata) != 0) if (crt->renderers[i](msg->parameters[i], msg->type->pnames[i], c, userdata) != 0)
continue; continue;
} }
c += strlen(c); c += strlen(c);
sprintf(c, ";%s\n", msg->type->pnames[i]);
c += strlen(c);
} }
return 0; return 0;
} }
int cr_string(variant var, char *buffer, const void *userdata) int cr_string(variant var, const char *name, char *buffer, const void *userdata)
{ {
sprintf(buffer, "\"%s\"", (const char *)var.v); sprintf(buffer, "\"%s\";%s", (const char *)var.v, name);
UNUSED_ARG(userdata); UNUSED_ARG(userdata);
return 0; return 0;
} }
int cr_int(variant var, char *buffer, const void *userdata) int cr_int(variant var, const char *name, char *buffer, const void *userdata)
{ {
sprintf(buffer, "%d", var.i); sprintf(buffer, "%d;%s", var.i, name);
UNUSED_ARG(userdata); UNUSED_ARG(userdata);
return 0; return 0;
} }
int cr_ignore(variant var, char *buffer, const void *userdata) int cr_ignore(variant var, const char *name, char *buffer, const void *userdata)
{ {
UNUSED_ARG(var); UNUSED_ARG(var);
UNUSED_ARG(name);
UNUSED_ARG(buffer); UNUSED_ARG(buffer);
UNUSED_ARG(userdata); UNUSED_ARG(userdata);
return -1; return -1;

8
src/util/crmessage.h
View File

@ -12,13 +12,13 @@ extern "C" {
void crmessage_done(void); void crmessage_done(void);
typedef int(*tostring_f) (variant data, char *buffer, const void *userdata); typedef int(*tostring_f) (variant data, const char *name, char *buffer, const void *userdata);
void tsf_register(const char *name, tostring_f fun); void tsf_register(const char *name, tostring_f fun);
/* registers a new type->string-function */ /* registers a new type->string-function */
int cr_string(variant v, char *buffer, const void *userdata); int cr_string(variant v, const char *name, char *buffer, const void *userdata);
int cr_int(variant v, char *buffer, const void *userdata); int cr_int(variant v, const char *name, char *buffer, const void *userdata);
int cr_ignore(variant v, char *buffer, const void *userdata); int cr_ignore(variant v, const char *name, char *buffer, const void *userdata);
void crt_register(const struct message_type *mtype); void crt_register(const struct message_type *mtype);
int cr_render(const struct message *msg, char *buffer, int cr_render(const struct message *msg, char *buffer,