… | |
… | |
27 | */ |
27 | */ |
28 | |
28 | |
29 | #include <global.h> |
29 | #include <global.h> |
30 | #include <object.h> |
30 | #include <object.h> |
31 | #include <living.h> |
31 | #include <living.h> |
32 | #ifndef __CEXTRACT__ |
|
|
33 | # include <sproto.h> |
32 | #include <sproto.h> |
34 | #endif |
|
|
35 | #include <spells.h> |
33 | #include <spells.h> |
36 | #include <sounds.h> |
34 | #include <sounds.h> |
37 | |
35 | |
38 | /* this function checks to see if a spell pushes objects as well |
36 | /* this function checks to see if a spell pushes objects as well |
39 | * as flies over and damages them (only used for cones for now) |
37 | * as flies over and damages them (only used for cones for now) |
… | |
… | |
747 | |
745 | |
748 | /* if no map then hit_map will crash so just ignore object */ |
746 | /* if no map then hit_map will crash so just ignore object */ |
749 | if (!op->map) |
747 | if (!op->map) |
750 | { |
748 | { |
751 | LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown"); |
749 | LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown"); |
752 | op->speed = 0; |
750 | op->set_speed (0); |
753 | update_ob_speed (op); |
|
|
754 | return; |
751 | return; |
755 | } |
752 | } |
756 | |
753 | |
757 | /* lava saves it's life, but not yours :) */ |
754 | /* lava saves it's life, but not yours :) */ |
758 | if (QUERY_FLAG (op, FLAG_LIFESAVE)) |
755 | if (QUERY_FLAG (op, FLAG_LIFESAVE)) |