Merge branch 'master' into dev

src/game/game_macros.h

@@ -88,6 +88,8 @@ typedef dword DAMAGE_TYPE;		// describe a type of damage.
 #define SPELLFLAG_RESIST			    0x0000400	// Allowed to resist this.	
 #define SPELLFLAG_TARG_NOSELF		    0x0000800
 #define SPELLFLAG_FREEZEONCAST		    0x0001000	// freezes the char on cast for this spell.
+#define SPELLFLAG_FIELD_RANDOMDECAY     0x0002000 // Make the field items have random timers.
+#define SPELLFLAG_NO_ELEMENTALENGINE    0x0004000
 #define SPELLFLAG_DISABLED			    0x0008000
 #define SPELLFLAG_SCRIPTED			    0x0010000
 #define	SPELLFLAG_PLAYERONLY		    0x0020000	// casted by players only
@@ -105,7 +107,5 @@ typedef dword DAMAGE_TYPE;		// describe a type of damage.
 #define SPELLFLAG_CURSE				    0x20000000	// Curses just like Weaken,Purge Magic,Curse,etc.
 #define SPELLFLAG_HEAL                  0x40000000	// Healing spell
 #define SPELLFLAG_TICK				    0x80000000	// A ticking spell like Poison.
-#define SPELLFLAG_FIELD_RANDOMDECAY     0x100000000 // Make the field items have random timers.
-#define SPELLFLAG_NO_ELEMENTALENGINE    0x200000000
 
 #endif // _INC_GAME_MACROS_H

src/game/items/CItem.cpp

@@ -658,9 +658,18 @@ CItem * CItem::ReadTemplate( CResourceLock & s, CObjBase * pCont ) // static
 						pScriptArgs = std::make_unique<CScriptTriggerArgs>(ptcArgs);
 					}
 
-					CObjBaseTemplate* pContObjBaseT = pCont->GetTopLevelObj();
-					ASSERT(pContObjBaseT);
-					pItem->r_Call(ptcFunctionName, dynamic_cast<CTextConsole*>(pContObjBaseT), pScriptArgs.get());
+					// use pCont is exist, if not use g_Serv
+					if (pCont)
+					{
+						CObjBaseTemplate* pContObjBaseT = pCont->GetTopLevelObj();
+						ASSERT(pContObjBaseT);
+						pItem->r_Call(ptcFunctionName, dynamic_cast<CTextConsole*>(pContObjBaseT), pScriptArgs.get());
+					}
+					else
+					{
+						pItem->r_Call(ptcFunctionName, &g_Serv, pScriptArgs.get());
+					}
+
 					if (pItem->IsDeleted())
 					{
 						pItem = nullptr;