forked from github/server
eliminate some spammy warnings.
This commit is contained in:
parent
c8ffe8da7a
commit
b8e17839a7
|
@ -207,6 +207,17 @@
|
||||||
</namespace>
|
</namespace>
|
||||||
|
|
||||||
<namespace name="spellinfo">
|
<namespace name="spellinfo">
|
||||||
|
<string name="concealing_aura">
|
||||||
|
<text locale="de">Dieser Zauber wird die gesamte Ausrüstung der
|
||||||
|
Zieleinheit für
|
||||||
|
einige Zeit vor den Blicken anderer verschleiern. Der
|
||||||
|
Zauber
|
||||||
|
schützt nicht vor Dieben und Spionen.</text>
|
||||||
|
<text locale="en">This spell will hide the whole equipment of a target
|
||||||
|
unit from the
|
||||||
|
looks of others. It will not protect against thieves or
|
||||||
|
spies.</text>
|
||||||
|
</string>
|
||||||
<string name="raindance">
|
<string name="raindance">
|
||||||
<text locale="de">Durch dieses uralte Tanzritual ruft der Zauberkundige
|
<text locale="de">Durch dieses uralte Tanzritual ruft der Zauberkundige
|
||||||
die Kräfte des Lebens und der Fruchtbarkeit an. Die darauf folgenden
|
die Kräfte des Lebens und der Fruchtbarkeit an. Die darauf folgenden
|
||||||
|
|
|
@ -1,17 +1,6 @@
|
||||||
<?xml version="1.0" encoding="utf-8" ?>
|
<?xml version="1.0" encoding="utf-8" ?>
|
||||||
<strings>
|
<strings>
|
||||||
<namespace name="spellinfo">
|
<namespace name="spellinfo">
|
||||||
<string name="concealing_aura">
|
|
||||||
<text locale="de">Dieser Zauber wird die gesamte Ausrüstung der
|
|
||||||
Zieleinheit für
|
|
||||||
einige Zeit vor den Blicken anderer verschleiern. Der
|
|
||||||
Zauber
|
|
||||||
schützt nicht vor Dieben und Spionen.</text>
|
|
||||||
<text locale="en">This spell will hide the whole equipment of a target
|
|
||||||
unit from the
|
|
||||||
looks of others. It will not protect against thieves or
|
|
||||||
spies.</text>
|
|
||||||
</string>
|
|
||||||
<string name="headache">
|
<string name="headache">
|
||||||
<text locale="de">
|
<text locale="de">
|
||||||
Aufzeichung des Vortrags von Selen Ard'Ragorn in Bar'Glingal:
|
Aufzeichung des Vortrags von Selen Ard'Ragorn in Bar'Glingal:
|
||||||
|
|
20
src/report.c
20
src/report.c
|
@ -1374,41 +1374,27 @@ static void durchreisende(stream *out, const region * r, const faction * f)
|
||||||
if (cansee_durchgezogen(f, r, u, 0)) {
|
if (cansee_durchgezogen(f, r, u, 0)) {
|
||||||
++counter;
|
++counter;
|
||||||
if (u->ship != NULL) {
|
if (u->ship != NULL) {
|
||||||
#ifdef GERMAN_FLUFF_ENABLED
|
|
||||||
if (strcmp("de", f->locale->name)==0) {
|
|
||||||
if (counter == 1) {
|
|
||||||
bytes = (int)strlcpy(bufp, "Die ", size);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
bytes = (int)strlcpy(bufp, "die ", size);
|
|
||||||
}
|
|
||||||
if (wrptr(&bufp, &size, bytes) != 0) {
|
|
||||||
WARN_STATIC_BUFFER();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
bytes = (int)strlcpy(bufp, shipname(u->ship), size);
|
bytes = (int)strlcpy(bufp, shipname(u->ship), size);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
bytes = (int)strlcpy(bufp, unitname(u), size);
|
bytes = (int)strlcpy(bufp, unitname(u), size);
|
||||||
}
|
}
|
||||||
if (wrptr(&bufp, &size, bytes) != 0) {
|
if (wrptr(&bufp, &size, bytes) != 0) {
|
||||||
WARN_STATIC_BUFFER();
|
INFO_STATIC_BUFFER();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (counter + 1 < maxtravel) {
|
if (counter + 1 < maxtravel) {
|
||||||
bytes = (int)strlcpy(bufp, ", ", size);
|
bytes = (int)strlcpy(bufp, ", ", size);
|
||||||
if (wrptr(&bufp, &size, bytes) != 0) {
|
if (wrptr(&bufp, &size, bytes) != 0) {
|
||||||
WARN_STATIC_BUFFER();
|
INFO_STATIC_BUFFER();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (counter + 1 == maxtravel) {
|
else if (counter + 1 == maxtravel) {
|
||||||
bytes = (int)strlcpy(bufp, LOC(f->locale, "list_and"), size);
|
bytes = (int)strlcpy(bufp, LOC(f->locale, "list_and"), size);
|
||||||
if (wrptr(&bufp, &size, bytes) != 0) {
|
if (wrptr(&bufp, &size, bytes) != 0) {
|
||||||
WARN_STATIC_BUFFER();
|
INFO_STATIC_BUFFER();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,7 +32,7 @@ extern "C" {
|
||||||
extern bool is_migrant(struct unit *u);
|
extern bool is_migrant(struct unit *u);
|
||||||
extern int study_cost(struct unit *u, skill_t talent);
|
extern int study_cost(struct unit *u, skill_t talent);
|
||||||
|
|
||||||
#define MAXTEACHERS 8
|
#define MAXTEACHERS 16
|
||||||
typedef struct teaching_info {
|
typedef struct teaching_info {
|
||||||
struct unit *teachers[MAXTEACHERS];
|
struct unit *teachers[MAXTEACHERS];
|
||||||
int value;
|
int value;
|
||||||
|
|
|
@ -17,5 +17,6 @@ extern size_t slprintf(char * dst, size_t size, const char * format, ...);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define WARN_STATIC_BUFFER() log_warning("static buffer too small in %s:%d\n", __FILE__, __LINE__)
|
#define WARN_STATIC_BUFFER() log_warning("static buffer too small in %s:%d\n", __FILE__, __LINE__)
|
||||||
|
#define INFO_STATIC_BUFFER() log_info("static buffer too small in %s:%d\n", __FILE__, __LINE__)
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue