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

http://eressea.upb.de/mantis/view.php?id=984 

"Nicht-Meermenschen können anschwimmen"

und und oder soll man nicht verwechseln.
This commit is contained in:
Enno Rehling 2006-10-05 21:24:53 +00:00
parent 4478e666a9
commit 75a252146e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/kernel/movement.c
View File

@ -1351,7 +1351,7 @@ travel_route(unit * u, region_list * route_begin, region_list * route_end, order
if (fval(current->terrain, SEA_REGION)) {
int moving = u->race->flags & (RCF_SWIM|RCF_WALK|RCF_COASTAL);
/* Die Einheit kann nicht fliegen, ist im Ozean, und will an Land */
if (moving != (RCF_SWIM|RCF_WALK) && (moving|RCF_COASTAL) == 0) {
if (moving != (RCF_SWIM|RCF_WALK) && (moving&RCF_COASTAL) == 0) {
/* can't swim+walk and isn't allowed to enter coast from sea */
if (ord!=NULL) cmistake(u, ord, 44, MSG_MOVE);
break;

2
src/res/de/strings.xml
View File

@ -5057,7 +5057,7 @@
mountain or glacier that keeps all factions that
are not allied (HELP GUARD) from mining iron or
laen as long as it guards the region. The
Mountain Guardian is bound to the loaction where
Mountain Guardian is bound to the location where
it has been summoned.</text>
</string>
<string name="magicstreet">