Andreas/tbamud
1
0
Fork 0
mirror of https://github.com/tbamud/tbamud.git synced 2025-09-22 05:50:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Windows Crash Bug. (thanks Fade)

Browse source
This commit is contained in:
Rumble 2015-01-31 20:42:18 -06:00
parent 52cc4e8be1
commit b1b7864eb0
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/dg_triggers.c
View file

@ -202,6 +202,7 @@ int greet_mtrigger(char_data *actor, int dir)
char_data *ch; char_data *ch;
char buf[MAX_INPUT_LENGTH]; char buf[MAX_INPUT_LENGTH];
int intermediate, final=TRUE; int intermediate, final=TRUE;
struct trig_data *next_trig;
if (!valid_dg_target(actor, DG_ALLOW_GODS)) if (!valid_dg_target(actor, DG_ALLOW_GODS))
return TRUE; return TRUE;
@ -212,8 +213,9 @@ int greet_mtrigger(char_data *actor, int dir)
AFF_FLAGGED(ch, AFF_CHARM)) AFF_FLAGGED(ch, AFF_CHARM))
continue; continue;
for (t = TRIGGERS(SCRIPT(ch)); t; t = t->next) { for (t = TRIGGERS(SCRIPT(ch)); t; t = next_trig) {
if (((IS_SET(GET_TRIG_TYPE(t), MTRIG_GREET) && CAN_SEE(ch, actor)) || next_trig = t->next;
if (((IS_SET(GET_TRIG_TYPE(t), MTRIG_GREET) && CAN_SEE(ch, actor)) ||
IS_SET(GET_TRIG_TYPE(t), MTRIG_GREET_ALL)) && IS_SET(GET_TRIG_TYPE(t), MTRIG_GREET_ALL)) &&
!GET_TRIG_DEPTH(t) && (rand_number(1, 100) <= GET_TRIG_NARG(t))) { !GET_TRIG_DEPTH(t) && (rand_number(1, 100) <= GET_TRIG_NARG(t))) {
if (dir>=0 && dir < DIR_COUNT) if (dir>=0 && dir < DIR_COUNT)