forked from github/server
- fixed trails for drifitng ships with no units. - cleared up some TODOs Issue: 1443
This commit is contained in:
parent
3b32b490d7
commit
d418aca832
4 changed files with 12 additions and 13 deletions
|
@ -1279,6 +1279,7 @@ durchreisende(FILE * F, const region * r, const faction * f)
|
|||
}
|
||||
}
|
||||
}
|
||||
/* TODO: finish localization */
|
||||
if (maxtravel == 1) {
|
||||
bytes = (int)strlcpy(bufp, " hat die Region durchquert.", size);
|
||||
} else {
|
||||
|
|
|
@ -357,7 +357,6 @@ border_type bt_fogwall = {
|
|||
static const char *
|
||||
b_nameillusionwall(const border * b, const region * r, const struct faction * f, int gflags)
|
||||
{
|
||||
/* TODO: UNICODE: f->locale bestimmt die Sprache */
|
||||
int fno = b->data.i;
|
||||
unused(b);
|
||||
unused(r);
|
||||
|
@ -394,7 +393,6 @@ boolean b_blockquestportal(const border * b, const unit * u, const region * r) {
|
|||
static const char *
|
||||
b_namequestportal(const border * b, const region * r, const struct faction * f, int gflags)
|
||||
{
|
||||
/* TODO: UNICODE: f->locale bestimmt die Sprache */
|
||||
const char * bname;
|
||||
int lock = b->data.i;
|
||||
unused(b);
|
||||
|
|
|
@ -582,16 +582,16 @@ move_ship(ship * sh, region * from, region * to, region_list * route)
|
|||
translist(&from->ships, &to->ships, sh);
|
||||
sh->region = to;
|
||||
}
|
||||
if (!trail) {
|
||||
leave_trail(sh, from, route);
|
||||
trail = true;
|
||||
}
|
||||
|
||||
while (*iunit!=NULL) {
|
||||
unit *u = *iunit;
|
||||
assert(u->region == from);
|
||||
|
||||
if (u->ship == sh) {
|
||||
if (!trail) {
|
||||
leave_trail(sh, from, route);
|
||||
trail = true;
|
||||
}
|
||||
if (route!=NULL) mark_travelthru(u, from, route, NULL);
|
||||
if (from!=to) {
|
||||
u->ship = NULL; /* damit move_unit() kein leave() macht */
|
||||
|
@ -2521,6 +2521,7 @@ movement(void)
|
|||
|
||||
/** Overrides long orders with a FOLLOW order if the target is moving.
|
||||
* FOLLOW SHIP is a long order, and doesn't need to be treated in here.
|
||||
* BUGS: http://bugs.eressea.de/view.php?id=1444 (A folgt B folgt C)
|
||||
*/
|
||||
void
|
||||
follow_unit(unit * u)
|
||||
|
|
|
@ -979,7 +979,8 @@ free_regions(void)
|
|||
}
|
||||
|
||||
/** creates a name for a region
|
||||
* TODO: Make this XML-configurable and allow non-ascii characters again.
|
||||
* TODO: Make vowels XML-configurable and allow non-ascii characters again.
|
||||
* - that will probably require a wchar_t * string to pick from.
|
||||
*/
|
||||
static char *
|
||||
makename(void)
|
||||
|
@ -988,13 +989,11 @@ makename(void)
|
|||
size_t nk, ne, nv, ns;
|
||||
static char name[16];
|
||||
const char *kons = "bcdfghklmnprstvwz",
|
||||
*start = "bcdgtskpvfr",
|
||||
*end = "nlrdst",
|
||||
#if 0
|
||||
*vowels = "aaaaaaaaaàâeeeeeeeeeéèêiiiiiiiiiíîoooooooooóòôuuuuuuuuuúyy",
|
||||
#else
|
||||
*vowels = "aaaaaaaaaaaeeeeeeeeeeeeiiiiiiiiiiioooooooooooouuuuuuuuuuyy",
|
||||
#endif
|
||||
*start = "bcdgtskpvfr";
|
||||
*vowels = "aaaaaaaaaaaeeeeeeeeeeeeiiiiiiiiiiioooooooooooouuuuuuuuuuyy";
|
||||
|
||||
/* const char * vowels_latin1 = "aaaaaaaaaàâeeeeeeeeeéèêiiiiiiiiiíîoooooooooóòôuuuuuuuuuúyy"; */
|
||||
|
||||
nk = strlen(kons);
|
||||
ne = strlen(end);
|
||||
|
|
Loading…
Reference in a new issue