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

Diverse short/int Warnings im mapper ausgebaut, immer noch eine Million übrig.

This commit is contained in:
Enno Rehling 2005-07-14 18:35:32 +00:00
parent 9bfa55d584
commit 617457f3d6
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mapper/map_modify.c
View File

@ -90,8 +90,8 @@ static int g_maxluxuries;
void void
block_create(int x1, int y1, int size, char chaotisch, int special, char terrain) block_create(int x1, int y1, int size, char chaotisch, int special, char terrain)
{ {
int local_climate; int local_climate, k;
int x, y, k; short x, y;
vset fringe; vset fringe;
vset_init(&fringe); vset_init(&fringe);

3
src/mapper/map_partei.c
View File

@ -171,7 +171,8 @@ read_dropouts(const char * filename)
if (F==NULL) return; if (F==NULL) return;
for (;;) { for (;;) {
char email[64], race[20]; char email[64], race[20];
int age, x, y; int age;
short x, y;
if (fscanf(F, "%s %s %d %d %d", email, race, &age, &x, &y)<=0) break; if (fscanf(F, "%s %s %d %d %d", email, race, &age, &x, &y)<=0) break;
if (age<=2) { if (age<=2) {
region * r = findregion(x, y); region * r = findregion(x, y);

1
src/mapper/mapper.c
View File

@ -1154,7 +1154,6 @@ movearound(int rx, int ry) {
case 'I': case 'I':
a=map_input(0,0,0,"Wieviele Regionen?",0,500,0); a=map_input(0,0,0,"Wieviele Regionen?",0,500,0);
if (a) { if (a) {
/* block_create(rx, ry, a, 0, 0, T_GLACIER); */
create_island(r, a, (terrain_t)(rand()%(T_GLACIER)+1)); create_island(r, a, (terrain_t)(rand()%(T_GLACIER)+1));
modified=1; modified=1;
} }

3
src/mapper/mapper.h
View File

@ -127,7 +127,8 @@ extern int numnewbies;
typedef struct dropout { typedef struct dropout {
struct dropout * next; struct dropout * next;
const struct race * race; const struct race * race;
int x, y, fno; short x, y;
int fno;
} dropout; } dropout;
extern dropout * dropouts; extern dropout * dropouts;