From c6462a25b43d2c3294a7cdb2208ffa92ee9744e1 Mon Sep 17 00:00:00 2001 From: Thomas Fischer Date: Sun, 30 Jun 2013 17:25:09 +0200 Subject: [PATCH] fixed camera code not checking for invalid/missing datablock: crashed before --- Engine/source/T3D/camera.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Engine/source/T3D/camera.cpp b/Engine/source/T3D/camera.cpp index 0ba19ea29..f7e5322d7 100644 --- a/Engine/source/T3D/camera.cpp +++ b/Engine/source/T3D/camera.cpp @@ -903,7 +903,7 @@ void Camera::_setPosition(const Point3F& pos, const Point3F& rot) MatrixF temp; - if(mDataBlock->cameraCanBank) + if(mDataBlock && mDataBlock->cameraCanBank) { // Take rot.y into account to bank the camera MatrixF imat; @@ -932,7 +932,7 @@ void Camera::setRotation(const Point3F& rot) MatrixF temp; - if(mDataBlock->cameraCanBank) + if(mDataBlock && mDataBlock->cameraCanBank) { // Take rot.y into account to bank the camera MatrixF imat; @@ -993,7 +993,7 @@ void Camera::writePacketData(GameConnection *connection, BitStream *bstream) bstream->setCompressionPoint(pos); mathWrite(*bstream, pos); bstream->write(mRot.x); - if(bstream->writeFlag(mDataBlock->cameraCanBank)) + if(mDataBlock && bstream->writeFlag(mDataBlock->cameraCanBank)) { // Include mRot.y to allow for camera banking bstream->write(mRot.y);