| … | … | ||
|---|---|---|---|
| 321 | combat_ob = op; | 321 | combat_ob = op; |
| 322 | break; | 322 | break; |
| 323 | } | 323 | } |
| 324 | 324 | ||
| 325 | ob->change_weapon (combat_ob ? combat_ob : ranged_ob); | 325 | ob->change_weapon (combat_ob ? combat_ob : ranged_ob); |
| 326 | ob->deactivate (); // change_Weapon activates, fix this better | 326 | ob->deactivate (); // change_weapon activates, fix this better |
| 327 | } | 327 | } |
| 328 | 328 | ||
| 329 | void | 329 | void |
| 330 | player::set_observe (object *op) | 330 | player::set_observe (object *op) |
| 331 | { | 331 | { |
| – | Removed lines |
| + | Added lines |
| < | Changed lines |
| > | Changed lines |