| … | |
… | |
| 223 | change_spell (object *op, char k) |
223 | change_spell (object *op, char k) |
| 224 | { |
224 | { |
| 225 | if (op->contr->combat_ob == op->current_weapon) |
225 | if (op->contr->combat_ob == op->current_weapon) |
| 226 | { |
226 | { |
| 227 | if (op->contr->ranged_ob) |
227 | if (op->contr->ranged_ob) |
| 228 | op->set_weapon (op->contr->ranged_ob); |
228 | op->change_weapon (op->contr->ranged_ob); |
| 229 | } |
229 | } |
| 230 | else if (op->contr->ranged_ob == op->current_weapon) |
230 | else if (op->contr->ranged_ob == op->current_weapon) |
| 231 | { |
231 | { |
| 232 | if (op->contr->combat_ob) |
232 | if (op->contr->combat_ob) |
| 233 | op->set_weapon (op->contr->combat_ob); |
233 | op->change_weapon (op->contr->combat_ob); |
| 234 | } |
234 | } |
| 235 | |
235 | |
| 236 | //TODO: maybe switch to golem, if any? |
236 | //TODO: maybe switch to golem, if any? |
| 237 | } |
237 | } |
| 238 | |
238 | |
