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

ursprung-fix

This commit is contained in:
Enno Rehling 2001-04-22 08:21:07 +00:00
parent 1830bedd47
commit b4ba66a95b
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/kernel/plane.c
View File

@ -114,6 +114,11 @@ ursprung_x(const faction *f, const plane *pl)
return ur->x; return ur->x;
} }
if (pl) {
set_ursprung(f, id, plane_center_x(pl), plane_center_y(pl));
return plane_center_x(pl);
}
return 0; return 0;
} }
@ -134,6 +139,11 @@ ursprung_y(const faction *f, const plane *pl)
return ur->y; return ur->y;
} }
if (pl) {
set_ursprung(f, id, plane_center_x(pl), plane_center_y(pl));
return plane_center_y(pl);
}
return 0; return 0;
} }

4
src/common/kernel/plane.h
View File

@ -56,8 +56,8 @@ int getplaneid(struct region *r);
struct plane * getplanebyid(int id); struct plane * getplanebyid(int id);
int region_x(const struct region *r, const struct faction *f); int region_x(const struct region *r, const struct faction *f);
int region_y(const struct region *r, const struct faction *f); int region_y(const struct region *r, const struct faction *f);
int plane_center_x(plane *pl); int plane_center_x(const struct plane *pl);
int plane_center_y(plane *pl); int plane_center_y(const struct plane *pl);
int ursprung_x(const struct faction *f, const plane *pl); int ursprung_x(const struct faction *f, const plane *pl);
int ursprung_y(const struct faction *f, const plane *pl); int ursprung_y(const struct faction *f, const plane *pl);
void set_ursprung(struct faction *f, int id, int x, int y); void set_ursprung(struct faction *f, int id, int x, int y);

2
src/mapper/map_units.c
View File

@ -851,7 +851,7 @@ mapper_spunit(dbllist ** SP, unit * u, int indent)
dh = 0; dh = 0;
for (sk = 0; sk != MAXSKILLS; sk++) for (sk = 0; sk != MAXSKILLS; sk++)
spskill(u, sk, &dh, 1); spskill(find_locale("de"), u, sk, &dh, 1);
dh = 0; dh = 0;
for (itm = u->items;itm;itm=itm->next) { for (itm = u->items;itm;itm=itm->next) {