mirror of
https://github.com/tbamud/tbamud.git
synced 2026-02-11 02:24:21 +01:00
GitHub issues 78 79 81 num aff flags off by one (#82)
* Make sure all followers are free'd before freeing the character list Otherwise, the followers structs will point to free'd memory and the stop_follower call will attempt to dereference a free'd characters' followers list. * https://github.com/tbamud/tbamud/issues/79 typo * https://github.com/tbamud/tbamud/issues/81 nullpointer crash on syntax check run * NUM_AFF_FLAGS fix. Now, consistently, the NUM_AFF_FLAGS is used in the same way as other NUM_* variables. Specifically, the the number is consistent with how others are defined - 1 above the highest in the list. I would like to have removed the need to start from 1 instead of 0 as well, but the loading mechanism, and thus potentially a lot of existing object files, use 0 as a marker for "no flags set", and we can't easily fix that. So, the places we loop through the list, we still need to make sure we're stying within the [1;NUM_AFF_FLAGS) interval. Simultaneously, I've checked over the other flags, and it seems like the usage is pretty consistent there. Fixes https://github.com/tbamud/tbamud/issues/78
This commit is contained in:
parent
7f0acefcb4
commit
eb650c2811
9 changed files with 17 additions and 21 deletions
|
|
@ -977,11 +977,6 @@ void column_list(struct char_data *ch, int num_cols, const char **list, int list
|
|||
/* Ensure that the number of columns is in the range 1-10 */
|
||||
num_cols = MIN(MAX(num_cols,1), 10);
|
||||
|
||||
/* Work out the longest list item */
|
||||
for (i=0; i<list_length; i++)
|
||||
if (max_len < strlen(list[i]))
|
||||
max_len = strlen(list[i]);
|
||||
|
||||
/* Calculate the width of each column */
|
||||
if (IS_NPC(ch)) col_width = 80 / num_cols;
|
||||
else col_width = (GET_SCREEN_WIDTH(ch)) / num_cols;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue