OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 10:37:41 -04:00
Code Releases Activity

Fix crash in PtGetCameraNumber()

Browse Source
This commit is contained in:
Adam Johnson
2012-12-26 18:44:24 -05:00
parent 3d15f529aa
commit e86d3a7658
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp
View File

@ -226,8 +226,11 @@ plVirtualCam1::~plVirtualCam1()
// for saving camera stack // for saving camera stack
plCameraModifier1* plVirtualCam1::GetCameraNumber(size_t camNumber) plCameraModifier1* plVirtualCam1::GetCameraNumber(size_t camNumber)
{ {
return (fCameraStack[camNumber]); if (fCameraStack.size() > camNumber)
return fCameraStack[camNumber];
else
return nil;
} }
// for rebuilding camera stack // for rebuilding camera stack
void plVirtualCam1::RebuildStack(const plKey& key) void plVirtualCam1::RebuildStack(const plKey& key)

2
Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp
View File

@ -2462,7 +2462,7 @@ int cyMisc::GetNumCameras()
const char* cyMisc::GetCameraNumber(int number) const char* cyMisc::GetCameraNumber(int number)
{ {
plCameraModifier1* pCam = plVirtualCam1::Instance()->GetCameraNumber(number-1); plCameraModifier1* pCam = plVirtualCam1::Instance()->GetCameraNumber(number-1);
if (pCam->GetTarget()) if (pCam && pCam->GetTarget())
{ {
const char* ret = pCam->GetTarget()->GetKeyName().c_str(); const char* ret = pCam->GetTarget()->GetKeyName().c_str();
plString str = plString::Format("saving camera named %s to chronicle\n",ret); plString str = plString::Format("saving camera named %s to chronicle\n",ret);