… | |
… | |
216 | op->contr->party = op->contr->party_to_join; |
216 | op->contr->party = op->contr->party_to_join; |
217 | op->contr->party_to_join = NULL; |
217 | op->contr->party_to_join = NULL; |
218 | new_draw_info_format (NDI_UNIQUE, 0, op, "You have joined party: %s\n", joined_party->partyname); |
218 | new_draw_info_format (NDI_UNIQUE, 0, op, "You have joined party: %s\n", joined_party->partyname); |
219 | snprintf (buf, MAX_BUF, "%s joins party %s", &op->name, joined_party->partyname); |
219 | snprintf (buf, MAX_BUF, "%s joins party %s", &op->name, joined_party->partyname); |
220 | send_party_message (op, buf); |
220 | send_party_message (op, buf); |
221 | op->contr->state = ST_PLAYING; |
221 | op->contr->ns->state = ST_PLAYING; |
222 | return; |
222 | return; |
223 | } |
223 | } |
224 | else |
224 | else |
225 | { |
225 | { |
226 | new_draw_info (NDI_UNIQUE, 0, op, "You entered the wrong password"); |
226 | new_draw_info (NDI_UNIQUE, 0, op, "You entered the wrong password"); |
227 | op->contr->party_to_join = NULL; |
227 | op->contr->party_to_join = NULL; |
228 | op->contr->state = ST_PLAYING; |
228 | op->contr->ns->state = ST_PLAYING; |
229 | return; |
229 | return; |
230 | } |
230 | } |
231 | } |
231 | } |
232 | |
232 | |
233 | void |
233 | void |