From aade16a2f4871607e4a12464835d230ef239b4b2 Mon Sep 17 00:00:00 2001 From: Warpten Date: Fri, 26 Jun 2015 01:13:35 +0200 Subject: Scripts/RubySanctum: Updates to Halion. * Fixed Living Embers not spawning. * Meteor Strike is now randomized. (cherry picked from 1447875cac0fefd58ae3ad27e6b3fa2134a714c0) Scripts/RubySanctum: Fix a mathematical mistake. SQL: Do not use MAX(Id), hardcode it. (cherry picked from 7a5bc9e1fe457f0c77cdfecefa5bd42525105c3e) Scripts/RubySanctum: Correctly spawn Living Embers. (cherry picked from 7c4b8b0e826fd1cdab8a635225123aebd1b950c6) Scripts/RubySanctum: Remove duplicate code. (cherry picked from 1d29328769d505caf4541b0d712972195dda8b70) Core/Misc: Warning fixes (cherry picked from dc53dad8a44292bcb555db9fdc07eb255a838cac) --- src/server/shared/Threading/Callback.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/server/shared/Threading') diff --git a/src/server/shared/Threading/Callback.h b/src/server/shared/Threading/Callback.h index d0c80efb00a..1f4ffc97cfc 100644 --- a/src/server/shared/Threading/Callback.h +++ b/src/server/shared/Threading/Callback.h @@ -97,7 +97,7 @@ class QueryCallback //! Resets all underlying variables (param, result and stage) void Reset() { - SetParam(NULL); + SetParam(ParamType()); FreeResult(); ResetStage(); } -- cgit v1.2.3