Merge pull request #1 from welcor/master

Updating my branch... I think
This commit is contained in:
Vatiken 2013-06-21 21:24:05 -07:00
commit cce10458d4
2 changed files with 2 additions and 2 deletions

View file

@ -3458,7 +3458,7 @@ void init_char(struct char_data *ch)
GET_NUM_QUESTS(ch) = 0;
ch->player_specials->saved.completed_quests = NULL;
GET_QUEST(ch) = -1;
GET_QUEST(ch) = NOTHING;
ch->player.time.birth = time(0);
ch->player.time.logon = time(0);

View file

@ -399,7 +399,7 @@ WCMD(do_wpurge)
ch = get_char_in_room(room, arg);
if (!ch) {
if (obj && *arg == UID_CHAR)
if (*arg == UID_CHAR)
obj = get_obj(arg);
else
obj = get_obj_in_room(room, arg);