kyonshi/grenzland-mud
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug Fix: cured Mirad's multiple char creation crash bug

Browse Source
This commit is contained in:
JamDog
2010-11-26 19:11:02 +00:00
parent 4892b22a51
commit 7bff0f37ad
2 changed files with 70 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
changelog
View File

@@ -39,6 +39,7 @@ Xlist (mlist, olist, rlist, zlist, slist, tlist, qlist)
Bug-Fix: set level now allows GRGOD or higher to set to any mortal level Bug-Fix: set level now allows GRGOD or higher to set to any mortal level
Advance command changed to work for both mortal and admin levels Advance command changed to work for both mortal and admin levels
Added increase_gold and increase_bank functions to prevent cash overflows Added increase_gold and increase_bank functions to prevent cash overflows
Added dupe check for new characters in char creation (thanks Mirad)
[Nov 25 2010] - Jamdog [Nov 25 2010] - Jamdog
Added diagonal directions with cedit toggle (default to 'off') Added diagonal directions with cedit toggle (default to 'off')
Bug-Fix: admin <player> default now targets the victim player Bug-Fix: admin <player> default now targets the victim player

55
src/interpreter.c
View File

@@ -41,6 +41,7 @@
/* local (file scope) functions */ /* local (file scope) functions */
static int perform_dupe_check(struct descriptor_data *d); static int perform_dupe_check(struct descriptor_data *d);
static bool perform_new_char_dupe_check(struct descriptor_data *d);
static struct alias_data *find_alias(struct alias_data *alias_list, char *str); static struct alias_data *find_alias(struct alias_data *alias_list, char *str);
static void perform_complex_alias(struct txt_q *input_q, char *orig, struct alias_data *a); static void perform_complex_alias(struct txt_q *input_q, char *orig, struct alias_data *a);
static int _parse_name(char *arg, char *name); static int _parse_name(char *arg, char *name);
@@ -1193,6 +1194,59 @@ static int perform_dupe_check(struct descriptor_data *d)
return (1); return (1);
} }
/* New Char dupe-check called at the start of character creation */
static bool perform_new_char_dupe_check(struct descriptor_data *d)
{
struct descriptor_data *k, *next_k;
bool found = FALSE;
/* Now that this descriptor has successfully logged in, disconnect all
* other descriptors controlling a character with the same ID number. */
for (k = descriptor_list; k; k = next_k) {
next_k = k->next;
if (k == d)
continue;
/* Do the player names match? */
if (!strcmp(GET_NAME(k->character), GET_NAME(d->character))) {
/* Check the other character is still in creation? */
if ((STATE(k) > CON_PLAYING) && (STATE(k) < CON_QCLASS)) {
/* Boot the older one */
k->character->desc = NULL;
k->character = NULL;
k->original = NULL;
write_to_output(k, "\r\nMultiple login detected -- disconnecting.\r\n");
STATE(k) = CON_CLOSE;
mudlog(NRM, ADMLVL_GOD, TRUE, "Multiple logins detected in char creation for %s.", GET_NAME(d->character));
found = TRUE;
} else {
/* Something went VERY wrong, boot both chars */
k->character->desc = NULL;
k->character = NULL;
k->original = NULL;
write_to_output(k, "\r\nMultiple login detected -- disconnecting.\r\n");
STATE(k) = CON_CLOSE;
d->character->desc = NULL;
d->character = NULL;
d->original = NULL;
write_to_output(d, "\r\nSorry, due to multiple connections, all your connections are being closed.\r\n");
write_to_output(d, "\r\nPlease reconnect.\r\n");
STATE(d) = CON_CLOSE;
mudlog(NRM, ADMLVL_GOD, TRUE, "SYSERR: Multiple logins with 1st in-game and the 2nd in char creation.");
found = TRUE;
}
}
}
return (found);
}
/* load the player, put them in the right room - used by copyover_recover too */ /* load the player, put them in the right room - used by copyover_recover too */
int enter_player_game (struct descriptor_data *d) int enter_player_game (struct descriptor_data *d)
{ {
@@ -1373,6 +1427,7 @@ void nanny(struct descriptor_data *d, char *arg)
STATE(d) = CON_CLOSE; STATE(d) = CON_CLOSE;
return; return;
} }
perform_new_char_dupe_check(d);
write_to_output(d, "New character.\r\nGive me a password for %s: ", GET_PC_NAME(d->character)); write_to_output(d, "New character.\r\nGive me a password for %s: ", GET_PC_NAME(d->character));
echo_off(d); echo_off(d);
STATE(d) = CON_NEWPASSWD; STATE(d) = CON_NEWPASSWD;