yolinlin/mod-ale
1
0
Fork 0
mirror of https://github.com/azerothcore/mod-ale synced 2025-11-29 15:38:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix TC build

Browse Source
This commit is contained in:
Rochet2
2019-07-17 20:49:08 +03:00
parent d2b3bc867e
commit 897d5e9159
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
GameObjectMethods.h
View File

@@ -267,12 +267,18 @@ namespace LuaGameObject
owner->RemoveGameObject(go, false); owner->RemoveGameObject(go, false);
} }
if (deldb)
{
#ifdef TRINITY
GameObject::DeleteFromDB(go->GetSpawnId());
#else
go->DeleteFromDB();
#endif
}
go->SetRespawnTime(0); go->SetRespawnTime(0);
go->Delete(); go->Delete();
if (deldb)
go->DeleteFromDB();
Eluna::CHECKOBJ<ElunaObject>(L, 1)->Invalidate(); Eluna::CHECKOBJ<ElunaObject>(L, 1)->Invalidate();
return 0; return 0;
} }

5
MapMethods.h
View File

@@ -268,7 +268,10 @@ namespace LuaMap
uint32 weatherType = Eluna::CHECKVAL<uint32>(L, 3); uint32 weatherType = Eluna::CHECKVAL<uint32>(L, 3);
float grade = Eluna::CHECKVAL<float>(L, 4); float grade = Eluna::CHECKVAL<float>(L, 4);
#if defined TRINITY || AZEROTHCORE #if defined TRINITY
if (Weather * weather = map->GetOrGenerateZoneDefaultWeather(zoneId))
weather->SetWeather((WeatherType)weatherType, grade);
#elif defined AZEROTHCORE
Weather* weather = WeatherMgr::FindWeather(zoneId); Weather* weather = WeatherMgr::FindWeather(zoneId);
if (!weather) if (!weather)
weather = WeatherMgr::AddWeather(zoneId); weather = WeatherMgr::AddWeather(zoneId);