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

Merge pull request #236 from badgerman/develop 

Bug 2113: player-controlled dragon movement
This commit is contained in:
Enno Rehling 2015-06-27 11:48:49 +02:00
parent f1e3bc7013 0ee76ea8dd
commit 59b0c7b957
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/move.c
View File

@ -1485,7 +1485,7 @@ static void make_route(unit * u, order * ord, region_list ** routep)
*/ */
static int movement_speed(unit * u) static int movement_speed(unit * u)
{ {
int mp; int mp = BP_WALKING;
static const curse_type *speed_ct; static const curse_type *speed_ct;
static bool init = false; static bool init = false;
double dk = u_race(u)->speed; double dk = u_race(u)->speed;
@ -1496,9 +1496,11 @@ static int movement_speed(unit * u)
case RC_DRAGON: case RC_DRAGON:
case RC_WYRM: case RC_WYRM:
case RC_FIREDRAGON: case RC_FIREDRAGON:
return BP_DRAGON;
case RC_BIRTHDAYDRAGON: case RC_BIRTHDAYDRAGON:
case RC_SONGDRAGON: case RC_SONGDRAGON:
return BP_DRAGON; mp = BP_DRAGON;
break;
default: default:
break; break;
} }
@ -1516,7 +1518,6 @@ static int movement_speed(unit * u)
} }
switch (canride(u)) { switch (canride(u)) {
case 1: /* Pferd */ case 1: /* Pferd */
mp = BP_RIDING; mp = BP_RIDING;
break; break;
@ -1526,8 +1527,6 @@ static int movement_speed(unit * u)
break; break;
default: default:
mp = BP_WALKING;
/* Siebenmeilentee */ /* Siebenmeilentee */
if (get_effect(u, oldpotiontype[P_FAST]) >= u->number) { if (get_effect(u, oldpotiontype[P_FAST]) >= u->number) {
mp *= 2; mp *= 2;