|
|
@ -1685,13 +1685,14 @@ void plVirtualCam1::PopCamera(plCameraModifier1* pCam) |
|
|
|
if (fCameraStack.size() <= 1) |
|
|
|
if (fCameraStack.size() <= 1) |
|
|
|
return; |
|
|
|
return; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Crazy Special Casing Turd: [based on some Cyan crap]
|
|
|
|
// is it the current camera AND the same camera we would otherwise switch to?
|
|
|
|
// is it the current camera AND the same camera we would otherwise switch to?
|
|
|
|
if (pCam==GetCurrentStackCamera() && pCam == fCameraStack[fCameraStack.size() - 2]) |
|
|
|
// if so, pop off the dupe if we're going to the age default... otherwise, go crazy.
|
|
|
|
|
|
|
|
if (fCameraStack.size() > 2 && pCam == GetCurrentStackCamera()) |
|
|
|
{ |
|
|
|
{ |
|
|
|
// pop but don't transition to a new camera
|
|
|
|
int theDupe = fCameraStack.size() - 1; |
|
|
|
// or do anything else:
|
|
|
|
if (pCam == fCameraStack[theDupe] && theDupe == 2) |
|
|
|
fCameraStack.pop_back(); |
|
|
|
fCameraStack.pop_back(); |
|
|
|
return; |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// are we mouse-looking?
|
|
|
|
// are we mouse-looking?
|
|
|
|