Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some cleanups. (might break build for scripts as they are a WIP)

Browse Source
This commit is contained in:
hondacrx
2023-10-08 10:35:31 -04:00
parent fa10b981bd
commit cda53c8e7f
208 changed files with 2266 additions and 2329 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Player/CinematicManager.cs
+4 -4
View File
@@ -68,7 +68,7 @@ namespace Game.Entities
player.GetMap().LoadGridForActiveObject(pos.GetPositionX(), pos.GetPositionY(), player);
m_CinematicObject = player.SummonCreature(1, pos.posX, pos.posY, pos.posZ, 0.0f, TempSummonType.TimedDespawn, TimeSpan.FromMinutes(5));
if (m_CinematicObject)
if (m_CinematicObject != null)
{
m_CinematicObject.SetActive(true);
player.SetViewpoint(m_CinematicObject, true);
@@ -89,10 +89,10 @@ namespace Game.Entities
m_cinematicCamera = null;
m_activeCinematic = null;
m_activeCinematicCameraIndex = -1;
if (m_CinematicObject)
if (m_CinematicObject != null)
{
WorldObject vpObject = player.GetViewpoint();
if (vpObject)
if (vpObject != null)
if (vpObject == m_CinematicObject)
player.SetViewpoint(m_CinematicObject, false);
@@ -170,7 +170,7 @@ namespace Game.Entities
// Advance (at speed) to this position. The remote sight object is used
// to send update information to player in cinematic
if (m_CinematicObject && interPosition.IsPositionValid())
if (m_CinematicObject != null && interPosition.IsPositionValid())
m_CinematicObject.MonsterMoveWithSpeed(interPosition.posX, interPosition.posY, interPosition.posZ, 500.0f, false, true);
// If we never received an end packet 10 seconds after the final timestamp then force an end