From 578c4e8f4fe02d58c0fd1905e68989d3dc3a91b5 Mon Sep 17 00:00:00 2001 From: Vincent Gee Date: Thu, 6 Nov 2014 08:38:05 -0500 Subject: [PATCH] Removed Tabs, added check on connection --- Engine/source/T3D/levelInfo.cpp | 2 +- Engine/source/T3D/levelInfo.h | 2 +- Engine/source/scene/sceneObject.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Engine/source/T3D/levelInfo.cpp b/Engine/source/T3D/levelInfo.cpp index 6e442f2a5..e37c89771 100644 --- a/Engine/source/T3D/levelInfo.cpp +++ b/Engine/source/T3D/levelInfo.cpp @@ -80,7 +80,7 @@ LevelInfo::LevelInfo() : mNearClip( 0.1f ), mVisibleDistance( 1000.0f ), #ifdef GHOSTSCOPING - mVisibleGhostDistance (200.0f), + mVisibleGhostDistance (200.0f), #endif mDecalBias( 0.0015f ), mCanvasClearColor( 255, 0, 255, 255 ), diff --git a/Engine/source/T3D/levelInfo.h b/Engine/source/T3D/levelInfo.h index 43a80a7b8..d3696f23e 100644 --- a/Engine/source/T3D/levelInfo.h +++ b/Engine/source/T3D/levelInfo.h @@ -57,7 +57,7 @@ class LevelInfo : public NetObject F32 mVisibleDistance; #ifdef GHOSTSCOPING - F32 mVisibleGhostDistance; + F32 mVisibleGhostDistance; #endif F32 mDecalBias; diff --git a/Engine/source/scene/sceneObject.cpp b/Engine/source/scene/sceneObject.cpp index 9e862da13..85d8f1ca1 100644 --- a/Engine/source/scene/sceneObject.cpp +++ b/Engine/source/scene/sceneObject.cpp @@ -672,7 +672,7 @@ void SceneObject::onCameraScopeQuery( NetConnection* connection, CameraScopeQuer #ifdef GHOSTSCOPING SceneManager* scenemanager = getSceneManager(); GameConnection* conn = dynamic_cast (connection); - if (conn->getVisibleGhostDistance() == 0.0f) + if (conn && conn->getVisibleGhostDistance() == 0.0f) query->visibleDistance = scenemanager->getVisibleGhostDistance(); else query->visibleDistance = conn->getVisibleGhostDistance();