diff --git a/src/act.offensive.c b/src/act.offensive.c index 6748817..1de140f 100644 --- a/src/act.offensive.c +++ b/src/act.offensive.c @@ -84,7 +84,7 @@ ACMD(do_hit) char arg[MAX_INPUT_LENGTH]; struct char_data *vict; - one_argument(argument, arg); + one_argument(argument, arg); if (!*arg) send_to_char(ch, "Hit who?\r\n"); @@ -406,6 +406,7 @@ ACMD(do_kick) send_to_char(ch, "You have no idea how.\r\n"); return; } + one_argument(argument, arg); if (!(vict = get_char_vis(ch, arg, NULL, FIND_CHAR_ROOM))) { diff --git a/src/constants.c b/src/constants.c index 5102276..01d408b 100644 --- a/src/constants.c +++ b/src/constants.c @@ -13,7 +13,7 @@ #include "structs.h" #include "interpreter.h" /* alias_data */ -cpp_extern const char *tbamud_version = "tbaMUD, version 3.52"; +cpp_extern const char *tbamud_version = "tbaMUD, version 3.53"; cpp_extern const char *oasisolc_version = "OasisOLC 2.0.6"; cpp_extern const char *ascii_pfiles_version = "ASCII Player Files 3.0.1"; diff --git a/src/db.c b/src/db.c index 53d448e..5532c82 100644 --- a/src/db.c +++ b/src/db.c @@ -2662,6 +2662,8 @@ void free_char(struct char_data *ch) free(ch->player.long_descr); if (ch->player.description) free(ch->player.description); + if (ch->player_specials) + free(ch->player_specials); for (i = 0; i < NUM_HIST; i++) if (GET_HISTORY(ch, i)) diff --git a/src/mobact.c b/src/mobact.c index 718a10a..9e382e9 100644 --- a/src/mobact.c +++ b/src/mobact.c @@ -87,7 +87,8 @@ void mobile_activity(void) /* Mob Movement */ if (!MOB_FLAGGED(ch, MOB_SENTINEL) && (GET_POS(ch) == POS_STANDING) && ((door = rand_number(0, 18)) < NUM_OF_DIRS) && CAN_GO(ch, door) && - !ROOM_FLAGGED(EXIT(ch, door)->to_room, ROOM_NOMOB | ROOM_DEATH) && + !ROOM_FLAGGED(EXIT(ch, door)->to_room, ROOM_NOMOB) && + !ROOM_FLAGGED(EXIT(ch, door)->to_room, ROOM_DEATH) && (!MOB_FLAGGED(ch, MOB_STAY_ZONE) || (world[EXIT(ch, door)->to_room].zone == world[IN_ROOM(ch)].zone))) { perform_move(ch, door, 1); diff --git a/src/oedit.c b/src/oedit.c index eb185d5..5d888de 100644 --- a/src/oedit.c +++ b/src/oedit.c @@ -972,7 +972,7 @@ void oedit_parse(struct descriptor_data *d, char *arg) if (number == 0 || number == -1) GET_OBJ_VAL(OLC_OBJ(d), 1) = -1; else - GET_OBJ_VAL(OLC_OBJ(d), 1) = LIMIT(number, 1, NUM_SPELLS-1); + GET_OBJ_VAL(OLC_OBJ(d), 1) = LIMIT(number, 1, NUM_SPELLS); oedit_disp_val3_menu(d); break; @@ -1010,7 +1010,7 @@ void oedit_parse(struct descriptor_data *d, char *arg) return; } min_val = 1; - max_val = NUM_SPELLS - 1; + max_val = NUM_SPELLS; break; case ITEM_WEAPON: min_val = 1; @@ -1049,12 +1049,12 @@ void oedit_parse(struct descriptor_data *d, char *arg) return; } min_val = 1; - max_val = NUM_SPELLS - 1; + max_val = NUM_SPELLS; break; case ITEM_WAND: case ITEM_STAFF: min_val = 1; - max_val = NUM_SPELLS - 1; + max_val = NUM_SPELLS; break; case ITEM_WEAPON: min_val = 0; diff --git a/src/structs.h b/src/structs.h index 8aa054b..e7803fd 100644 --- a/src/structs.h +++ b/src/structs.h @@ -14,7 +14,7 @@ * account the version and supply their own definition for the macro if used * on an older version. You are supposed to compare this with the macro * TBAMUD_VERSION() in utils.h. */ -#define _TBAMUD 0x030520 /* Major/Minor/Patchlevel - MMmmPP */ +#define _TBAMUD 0x030530 /* Major/Minor/Patchlevel - MMmmPP */ /* If you want equipment to be automatically equipped to the same place * it was when players rented, set the define below to 1. */