From 62f74102af5d33f54694055c19e451e078fc46d8 Mon Sep 17 00:00:00 2001 From: Rumble Date: Mon, 25 Jun 2007 13:27:20 +0000 Subject: [PATCH] Added questpoints to load_char, more 128 bit fixes, and set autoexit on by default. (Thanks Trulight) --Rumble --- changelog | 5 ++++- lib/misc/socials.new | 2 +- src/class.c | 2 ++ src/db.c | 1 - src/oedit.c | 2 +- src/players.c | 4 ++++ 6 files changed, 12 insertions(+), 4 deletions(-) diff --git a/changelog b/changelog index 6d58e60..971a4b7 100644 --- a/changelog +++ b/changelog @@ -7,6 +7,10 @@ builderacademy.net 9091 tbaMUD 3.53 [Jun 28 2007] Updated World and files for 3.53 release. +[Jun 25 2007] - Rumble + Added questpoints to load_char and set autoexit on by default. (thanks Trulight) +[Jun 20 2007] + Fixed many more bugs from the 128 bit patch. [Jun 16 2007] - Rumble Missed replacing NUM_SPELLS -1 with NUM_SPELLS, corrected. (thanks Kyle) [Jun 01 2007] - Rumble @@ -29,7 +33,6 @@ tbaMUD 3.53 Fixed nogos/nowiz from flagging everyone in who. Fixed numerous SYSERR's where mobs were using player only specials. Added 128 bits patch by Niese Petersen with numerous updates and fixes. - tbaMUD 3.52 [Apr 14 2007] - Rumble IP's only visible to LVL_GOD and above now for the paranoid people out there. diff --git a/lib/misc/socials.new b/lib/misc/socials.new index b8a0032..ea293ad 100644 --- a/lib/misc/socials.new +++ b/lib/misc/socials.new @@ -3473,7 +3473,7 @@ Never around when required. All the lonely people :( Tres bizarre! $n kisses $mself all over $s body. You kiss $M on $S $t. -$N kisses $N on $S $t. +$n kisses $N on $S $t. $n kisses you on your $t. You kiss $p. $n kisses $p. diff --git a/src/class.c b/src/class.c index 1f17760..7af5b49 100644 --- a/src/class.c +++ b/src/class.c @@ -1465,6 +1465,8 @@ void do_start(struct char_data *ch) GET_COND(ch, HUNGER) = 24; GET_COND(ch, DRUNK) = 0; + SET_BIT_AR(PRF_FLAGS(ch), PRF_AUTOEXIT); + if (CONFIG_SITEOK_ALL) SET_BIT_AR(PLR_FLAGS(ch), PLR_SITEOK); } diff --git a/src/db.c b/src/db.c index 5532c82..47db305 100644 --- a/src/db.c +++ b/src/db.c @@ -2646,7 +2646,6 @@ void free_char(struct char_data *ch) free(ch->player_specials->poofout); if (GET_HOST(ch)) free(GET_HOST(ch)); - free(ch->player_specials); if (IS_NPC(ch)) log("SYSERR: Mob %s (#%d) had player_specials allocated!", GET_NAME(ch), GET_MOB_VNUM(ch)); } diff --git a/src/oedit.c b/src/oedit.c index 5d888de..eceaaf9 100644 --- a/src/oedit.c +++ b/src/oedit.c @@ -981,7 +981,7 @@ void oedit_parse(struct descriptor_data *d, char *arg) if (number < 0 || number > 4) oedit_disp_container_flags_menu(d); else if (number != 0) { - TOGGLE_BIT(GET_OBJ_VAL(OLC_OBJ(d), 1), (number - 1)); + TOGGLE_BIT(GET_OBJ_VAL(OLC_OBJ(d), 1), 1 << (number - 1)); OLC_VAL(d) = 1; oedit_disp_val2_menu(d); } else diff --git a/src/players.c b/src/players.c index b4eb939..f29b7e5 100644 --- a/src/players.c +++ b/src/players.c @@ -373,6 +373,10 @@ int load_char(const char *name, struct char_data *ch) PRF_FLAGS(ch)[3] = asciiflag_conv(f4); break; + case 'Q': + if (!strcmp(tag, "Qstp")) GET_QUESTPOINTS(ch) = atoi(line); + break; + case 'R': if (!strcmp(tag, "Room")) GET_LOADROOM(ch) = atoi(line); break;