forked from github/server
local linux fixes
This commit is contained in:
parent
c088273a9d
commit
b1703d27d4
|
@ -158,19 +158,6 @@ reset_translations(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* implementation */
|
|
||||||
static void
|
|
||||||
cr_output_str_list(FILE * F, const char *title, const strlist * S, const faction * f)
|
|
||||||
{
|
|
||||||
if (!S) return;
|
|
||||||
|
|
||||||
fprintf(F, "%s\n", title);
|
|
||||||
while (S) {
|
|
||||||
fprintf(F, "\"%s\"\n", S->s);
|
|
||||||
S = S->next;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#include "objtypes.h"
|
#include "objtypes.h"
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
|
@ -26,6 +26,7 @@
|
||||||
|
|
||||||
/* kernel includes */
|
/* kernel includes */
|
||||||
#include <kernel/building.h>
|
#include <kernel/building.h>
|
||||||
|
#include <kernel/faction.h>
|
||||||
#include <kernel/item.h>
|
#include <kernel/item.h>
|
||||||
#include <kernel/movement.h>
|
#include <kernel/movement.h>
|
||||||
#include <kernel/message.h>
|
#include <kernel/message.h>
|
||||||
|
|
|
@ -173,7 +173,7 @@ read_dropouts(const char * filename)
|
||||||
char email[64], race[20];
|
char email[64], race[20];
|
||||||
int age;
|
int age;
|
||||||
short x, y;
|
short x, y;
|
||||||
if (fscanf(F, "%s %s %d %d %d", email, race, &age, &x, &y)<=0) break;
|
if (fscanf(F, "%s %s %d %hd %hd", email, race, &age, &x, &y)<=0) break;
|
||||||
if (age<=2) {
|
if (age<=2) {
|
||||||
region * r = findregion(x, y);
|
region * r = findregion(x, y);
|
||||||
if (r) {
|
if (r) {
|
||||||
|
|
|
@ -812,7 +812,7 @@ SetHighlight(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
recalc_everything(int *x, int *y, int *rx, int *ry)
|
recalc_everything(short *x, short *y, short *rx, short *ry)
|
||||||
{
|
{
|
||||||
int eingerueckt;
|
int eingerueckt;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue