| … | |
… | |
| 2071 | --op->speed_left; |
2071 | --op->speed_left; |
| 2072 | |
2072 | |
| 2073 | op->play_sound (sound_find ("push_player")); |
2073 | op->play_sound (sound_find ("push_player")); |
| 2074 | push_ob (mon, dir, op); |
2074 | push_ob (mon, dir, op); |
| 2075 | |
2075 | |
| 2076 | if (op->contr->tmp_invis || op->hide) |
2076 | if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN]) |
| 2077 | make_visible (op); |
2077 | make_visible (op); |
| 2078 | |
2078 | |
| 2079 | return true; |
2079 | return true; |
| 2080 | } |
2080 | } |
| 2081 | else |
2081 | else |
| … | |
… | |
| 2103 | push_ob (mon, dir, op); |
2103 | push_ob (mon, dir, op); |
| 2104 | } |
2104 | } |
| 2105 | else |
2105 | else |
| 2106 | op->statusmsg ("You withhold your attack"); |
2106 | op->statusmsg ("You withhold your attack"); |
| 2107 | |
2107 | |
| 2108 | if (op->contr->tmp_invis || op->hide) |
2108 | if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN]) |
| 2109 | make_visible (op); |
2109 | make_visible (op); |
| 2110 | |
2110 | |
| 2111 | return true; |
2111 | return true; |
| 2112 | } |
2112 | } |
| 2113 | } |
2113 | } |
| … | |
… | |
| 2171 | if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) |
2171 | if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) |
| 2172 | dir = absdir (dir + rndm (3) + rndm (3) - 2); |
2172 | dir = absdir (dir + rndm (3) + rndm (3) - 2); |
| 2173 | |
2173 | |
| 2174 | op->facing = dir; |
2174 | op->facing = dir; |
| 2175 | |
2175 | |
| 2176 | if (op->hide) |
2176 | if (op->flag [FLAG_HIDDEN]) |
| 2177 | do_hidden_move (op); |
2177 | do_hidden_move (op); |
| 2178 | |
2178 | |
| 2179 | bool retval; |
2179 | bool retval; |
| 2180 | |
2180 | |
| 2181 | if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) |
2181 | if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) |
| … | |
… | |
| 3001 | } |
3001 | } |
| 3002 | |
3002 | |
| 3003 | void |
3003 | void |
| 3004 | make_visible (object *op) |
3004 | make_visible (object *op) |
| 3005 | { |
3005 | { |
| 3006 | op->hide = 0; |
3006 | op->flag [FLAG_HIDDEN] = 0; |
| 3007 | op->invisible = 0; |
3007 | op->invisible = 0; |
| 3008 | |
3008 | |
| 3009 | if (op->type == PLAYER) |
3009 | if (op->type == PLAYER) |
| 3010 | { |
3010 | { |
| 3011 | op->contr->tmp_invis = 0; |
3011 | op->contr->tmp_invis = 0; |
| … | |
… | |
| 3232 | |
3232 | |
| 3233 | if (op->contr && op->contr->tmp_invis == 0) |
3233 | if (op->contr && op->contr->tmp_invis == 0) |
| 3234 | return 0; |
3234 | return 0; |
| 3235 | |
3235 | |
| 3236 | /* If monsters, they should become visible */ |
3236 | /* If monsters, they should become visible */ |
| 3237 | if (op->hide || !op->contr || (op->contr && op->contr->tmp_invis)) |
3237 | if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis)) |
| 3238 | { |
3238 | { |
| 3239 | new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible"); |
3239 | new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible"); |
| 3240 | return 1; |
3240 | return 1; |
| 3241 | } |
3241 | } |
| 3242 | } |
3242 | } |
| 3243 | |
3243 | |
| 3244 | return 0; |
3244 | return 0; |
