| … | |
… | |
| 768 | player *pl = op->contr; |
768 | player *pl = op->contr; |
| 769 | shstr name = op->name; |
769 | shstr name = op->name; |
| 770 | |
770 | |
| 771 | op->contr = 0; |
771 | op->contr = 0; |
| 772 | op->type = 0; |
772 | op->type = 0; |
| 773 | op->free (1); |
773 | op->destroy (1); |
| 774 | pl = get_player (pl); |
774 | pl = get_player (pl); |
| 775 | op = pl->ob; |
775 | op = pl->ob; |
| 776 | add_friendly_object (op); |
776 | add_friendly_object (op); |
| 777 | op->contr->password[0] = '~'; |
777 | op->contr->password[0] = '~'; |
| 778 | op->name = op->name_pl = 0; |
778 | op->name = op->name_pl = 0; |
| … | |
… | |
| 2352 | if (tmp == op) |
2352 | if (tmp == op) |
| 2353 | { |
2353 | { |
| 2354 | tmp = tmp->above; |
2354 | tmp = tmp->above; |
| 2355 | continue; |
2355 | continue; |
| 2356 | } |
2356 | } |
|
|
2357 | |
| 2357 | if (QUERY_FLAG (tmp, FLAG_ALIVE)) |
2358 | if (QUERY_FLAG (tmp, FLAG_ALIVE)) |
| 2358 | { |
2359 | { |
| 2359 | mon = tmp; |
2360 | mon = tmp; |
| 2360 | break; |
2361 | break; |
| 2361 | } |
2362 | } |
|
|
2363 | |
| 2362 | if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL)) |
2364 | if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL)) |
| 2363 | mon = tmp; |
2365 | mon = tmp; |
|
|
2366 | |
| 2364 | tmp = tmp->above; |
2367 | tmp = tmp->above; |
| 2365 | } |
2368 | } |
| 2366 | |
2369 | |
| 2367 | if (mon == NULL) /* This happens anytime the player tries to move */ |
2370 | if (mon == NULL) /* This happens anytime the player tries to move */ |
| 2368 | return; /* into a wall */ |
2371 | return; /* into a wall */ |
