From a76709480b8300c7af955f5c2c85d2039c1ee919 Mon Sep 17 00:00:00 2001 From: shennetsind Date: Sun, 21 Jul 2013 11:33:43 -0300 Subject: Fixed Bug #7547 str_data[].val was uninitialised and thus using garbage memory on compilers that don't automatically initialize http://hercules.ws/board/tracker/issue-7547-notice-conflicting-itemscript-var/ Also updated guild aura sc_config options (special thanks to kyeme!) Signed-off-by: shennetsind --- db/sc_config.txt | 8 ++++---- src/map/script.c | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/db/sc_config.txt b/db/sc_config.txt index 4143b8b2e..b1cc016b9 100644 --- a/db/sc_config.txt +++ b/db/sc_config.txt @@ -384,10 +384,10 @@ SC_REBOUND, 18 SC_TELEKINESIS_INTENSE,18 //Guild Auras should not be saved -SC_LEADERSHIP,2 -SC_GLORYWOUNDS,2 -SC_SOULCOLD,2 -SC_HAWKEYES,2 +SC_LEADERSHIP,78 +SC_GLORYWOUNDS,78 +SC_SOULCOLD,78 +SC_HAWKEYES,78 // Unremovable SC_WEIGHTOVER50, 79 diff --git a/src/map/script.c b/src/map/script.c index 02fbf00ed..27368a174 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -569,6 +569,7 @@ int add_str(const char* p) safestrncpy(script->str_buf+script->str_pos, p, len+1); script->str_data[script->str_num].type = C_NOP; script->str_data[script->str_num].str = script->str_pos; + script->str_data[script->str_num].val = 0; script->str_data[script->str_num].next = 0; script->str_data[script->str_num].func = NULL; script->str_data[script->str_num].backpatch = -1; -- cgit v1.2.3-70-g09d2