| … | |
… | |
| 41 | object *tmp; |
41 | object *tmp; |
| 42 | |
42 | |
| 43 | for (i = 1; i < 9; i += 2) |
43 | for (i = 1; i < 9; i += 2) |
| 44 | if ((tmp = present (DOOR, op->map, op->x + freearr_x[i], op->y + freearr_y[i])) != NULL) |
44 | if ((tmp = present (DOOR, op->map, op->x + freearr_x[i], op->y + freearr_y[i])) != NULL) |
| 45 | { |
45 | { |
| 46 | tmp->set_speed (0.1); |
46 | tmp->set_speed (0.1f); |
| 47 | tmp->speed_left = -0.2; |
47 | tmp->speed_left = -0.2f; |
| 48 | } |
48 | } |
| 49 | |
49 | |
| 50 | if (op->other_arch) |
50 | if (op->other_arch) |
| 51 | { |
51 | { |
| 52 | tmp = arch_to_object (op->other_arch); |
52 | tmp = arch_to_object (op->other_arch); |
| … | |
… | |
| 69 | for (i = 1; i < 9; i += 2) |
69 | for (i = 1; i < 9; i += 2) |
| 70 | { |
70 | { |
| 71 | tmp = present (LOCKED_DOOR, op->map, op->x + freearr_x[i], op->y + freearr_y[i]); |
71 | tmp = present (LOCKED_DOOR, op->map, op->x + freearr_x[i], op->y + freearr_y[i]); |
| 72 | if (tmp && tmp->slaying == op->slaying) |
72 | if (tmp && tmp->slaying == op->slaying) |
| 73 | { /* same key both doors */ |
73 | { /* same key both doors */ |
| 74 | tmp->set_speed (0.1); |
74 | tmp->set_speed (0.1f); |
| 75 | tmp->speed_left = -0.2; |
75 | tmp->speed_left = -0.2f; |
| 76 | } |
76 | } |
| 77 | } |
77 | } |
| 78 | |
78 | |
| 79 | if (op->other_arch) |
79 | if (op->other_arch) |
| 80 | { |
80 | { |
| … | |
… | |
| 1118 | * would sometimes get -inf speed_left, and from the |
1118 | * would sometimes get -inf speed_left, and from the |
| 1119 | * description, it could only happen here, so just put |
1119 | * description, it could only happen here, so just put |
| 1120 | * a lower sanity limit. My only guess is that the |
1120 | * a lower sanity limit. My only guess is that the |
| 1121 | * mover has 0 speed. |
1121 | * mover has 0 speed. |
| 1122 | */ |
1122 | */ |
| 1123 | if (victim->speed_left < -5.0) |
1123 | if (victim->speed_left < -5.f) |
| 1124 | victim->speed_left = -5.0; |
1124 | victim->speed_left = -5.f; |
| 1125 | } |
1125 | } |
| 1126 | } |
1126 | } |
| 1127 | } |
1127 | } |
| 1128 | } |
1128 | } |
| 1129 | |
1129 | |
