… | |
… | |
86 | op->contr->hidden = 0; |
86 | op->contr->hidden = 0; |
87 | op->invisible = 1; |
87 | op->invisible = 1; |
88 | new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players"); |
88 | new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players"); |
89 | op->map->players++; |
89 | op->map->players++; |
90 | new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name); |
90 | new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name); |
|
|
91 | |
91 | if (!silent_dm) |
92 | if (!silent_dm) |
92 | { |
|
|
93 | new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!"); |
93 | new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!"); |
94 | } |
|
|
95 | } |
94 | } |
96 | else |
95 | else |
97 | { |
96 | { |
98 | op->contr->hidden = 1; |
97 | op->contr->hidden = 1; |
99 | new_draw_info (NDI_UNIQUE, 0, op, "Other players will no longer see you."); |
98 | new_draw_info (NDI_UNIQUE, 0, op, "Other players will no longer see you."); |
100 | op->map->players--; |
99 | op->map->players--; |
|
|
100 | |
101 | if (!silent_dm) |
101 | if (!silent_dm) |
102 | { |
|
|
103 | new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone.."); |
102 | new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone.."); |
104 | } |
103 | |
105 | new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s leaves the game.", &op->name); |
104 | new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s leaves the game.", &op->name); |
106 | new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s left the game.", &op->name); |
105 | new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s left the game.", &op->name); |
107 | } |
106 | } |
108 | } |
107 | } |
109 | |
108 | |
… | |
… | |
492 | at_spell = archetype::find (cp); |
491 | at_spell = archetype::find (cp); |
493 | if (!at_spell || at_spell->clone.type != SPELL) |
492 | if (!at_spell || at_spell->clone.type != SPELL) |
494 | at_spell = find_archetype_by_object_name (cp); |
493 | at_spell = find_archetype_by_object_name (cp); |
495 | if (!at_spell || at_spell->clone.type != SPELL) |
494 | if (!at_spell || at_spell->clone.type != SPELL) |
496 | { |
495 | { |
497 | strcpy (spell_name, cp); |
496 | assign (spell_name, cp); |
498 | fsp = strchr (spell_name, ' '); |
497 | fsp = strchr (spell_name, ' '); |
499 | if (fsp) |
498 | if (fsp) |
500 | { |
499 | { |
501 | *fsp = 0; |
500 | *fsp = 0; |
502 | fsp++; |
501 | fsp++; |
… | |
… | |
1004 | } |
1003 | } |
1005 | |
1004 | |
1006 | if (from != STACK_FROM_STACK) |
1005 | if (from != STACK_FROM_STACK) |
1007 | /* Item is either stack top, or is a number thus is now stack top, let's remove it */ |
1006 | /* Item is either stack top, or is a number thus is now stack top, let's remove it */ |
1008 | dm_stack_pop (op->contr); |
1007 | dm_stack_pop (op->contr); |
1009 | |
|
|
1010 | if (!QUERY_FLAG (tmp, FLAG_REMOVED)) |
|
|
1011 | { |
|
|
1012 | new_draw_info (NDI_UNIQUE, 0, op, "Warning, item wasn't removed."); |
|
|
1013 | tmp->remove (); |
|
|
1014 | } |
|
|
1015 | |
1008 | |
1016 | if (tmp->head) |
1009 | if (tmp->head) |
1017 | tmp = tmp->head; |
1010 | tmp = tmp->head; |
1018 | |
1011 | |
1019 | tmp->destroy (); |
1012 | tmp->destroy (); |