Merge pull request #241 from Hoikas/camstack

PtGetCameraNumber() fixes

Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp

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

Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp

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

Sources/Plasma/FeatureLib/pfPython/cyMisc.h

@@ -809,7 +809,7 @@ public:
     //
 
     static int GetNumCameras();
-    static const char* GetCameraNumber(int number);
+    static plString GetCameraNumber(int number);
     static void RebuildCameraStack(const plString& name, const char* ageName);
     static void PyClearCameraStack();
     static void RecenterCamera();

Sources/Plasma/FeatureLib/pfPython/cyMiscGlue4.cpp

@@ -337,7 +337,7 @@ PYTHON_GLOBAL_METHOD_DEFINITION(PtGetCameraNumber, args, "Params: x\nReturns cam
         PyErr_SetString(PyExc_TypeError, "PtGetCameraNumber expects an int");
         PYTHON_RETURN_ERROR;
     }
-    return PyString_FromString(cyMisc::GetCameraNumber(x));
+    return PyString_FromPlString(cyMisc::GetCameraNumber(x));
 }
 
 PYTHON_GLOBAL_METHOD_DEFINITION_NOARGS(PtGetNumCameras, "returns camera stack size")