Wrap uses of the missing CyPythonIDE with #ifdef HAVE_CYPYTHONIDE

to make things compile, like in H-uru/Plasma.

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/plClient.cpp

@@ -1619,7 +1619,7 @@ void plClient::ShutdownDLLs()
 
 hsBool plClient::MainLoop()
 {
-#ifndef PLASMA_EXTERNAL_RELEASE
+#if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE)
 	if (PythonInterface::UsePythonDebugger())
 	{
 		PythonInterface::PythonDebugger()->Update();

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp

@@ -7024,6 +7024,7 @@ PF_CONSOLE_CMD( Python,							// Group name
 }
 
 #ifndef LIMIT_CONSOLE_COMMANDS
+#ifdef HAVE_CYPYTHONIDE
 PF_CONSOLE_CMD( Python,
 			    UsePythonDebugger,
 				"",
@@ -7031,6 +7032,7 @@ PF_CONSOLE_CMD( Python,
 {
 	PythonInterface::UsePythonDebugger(true);
 }
+#endif
 
 
 #include "../pfMessage/pfBackdoorMsg.h"

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.cpp

@@ -180,7 +180,7 @@ PyObject* PythonInterface::dbgOut = nil;
 PyObject* PythonInterface::dbgSlice = nil;				// time slice function for the debug window
 plStatusLog* PythonInterface::dbgLog = nil;				// output logfile
 
-#ifndef PLASMA_EXTERNAL_RELEASE
+#if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE)
 bool PythonInterface::usePythonDebugger = false;
 plCyDebServer PythonInterface::debugServer;
 bool PythonInterface::requestedExit = false;
@@ -189,7 +189,7 @@ bool PythonInterface::requestedExit = false;
 // stupid Windows.h  and who started including that!
 #undef DrawText
 
-#ifndef PLASMA_EXTERNAL_RELEASE
+#if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE)
 // Special includes for debugging
 #include <frameobject.h>
 
@@ -840,7 +840,7 @@ void PythonInterface::initPython()
 		Py_SetProgramName("plasma");
 		Py_Initialize();
 
-#ifndef PLASMA_EXTERNAL_RELEASE
+#if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE)
 		if (usePythonDebugger)
 		{
 			debugServer.SetCallbackClass(&debServerCallback);
@@ -1512,7 +1512,7 @@ void PythonInterface::finiPython()
 	initialized--;
 	if ( initialized < 1 && Py_IsInitialized() != 0 && IsInShutdown )
 	{
-#ifndef PLASMA_EXTERNAL_RELEASE
+#if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE)
 		if (usePythonDebugger)
 			debugServer.Disconnect();
 #endif
@@ -1659,7 +1659,7 @@ int PythonInterface::getOutputAndReset(std::string *output)
 		pyOutputRedirector::ClearData(stdOut);
 
 		// tell python debugger
-#ifndef PLASMA_EXTERNAL_RELEASE
+#if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE)
 		if (UsePythonDebugger())
 			PythonInterface::PythonDebugger()->StdOut(strVal);
 #endif

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.h

@@ -34,7 +34,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsStlUtils.h"
 #include <python.h>
 
-#ifndef PLASMA_EXTERNAL_RELEASE
+#if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE)
 #include "../../Apps/CyPythonIDE/plCyDebug/plCyDebServer.h"
 #endif
 
@@ -66,7 +66,7 @@ private:
 	static PyObject* dbgSlice;	// time slice function for the debug window
 	static plStatusLog* dbgLog;
 
-#ifndef PLASMA_EXTERNAL_RELEASE
+#if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE)
 	static bool usePythonDebugger;
 	static bool requestedExit;
 	static plCyDebServer debugServer;
@@ -212,7 +212,7 @@ public:
 	//
 	static pyKey* GetpyKeyFromPython(PyObject* pkey);
 
-#ifndef PLASMA_EXTERNAL_RELEASE
+#if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE)
 	static bool UsePythonDebugger() { return usePythonDebugger; }
 	static void UsePythonDebugger(bool use) { usePythonDebugger = use; }
 

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp

@@ -39,11 +39,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "../plPipeline/plPlates.h"
 #include "../plPipeline/plDebugText.h"
-#include "../plGImage/plMipmap.h"
 
 #include "hsWindows.h"
 #include "../NucleusLib/inc/plPipeline.h"
 
+// base size of the cursor 
+#define CURSOR_SIZE_X 0.0675f	
+#define CURSOR_SIZE_Y 0.09f
+
 // The resolution that uses the base size of the cursor. 
 // All other resolutions will scale the cursor size to keep the same physical size.
 #define BASE_WIDTH 1024
@@ -451,7 +454,7 @@ void plMouseDevice::IUpdateCursorSize()
 	if(fCursor)
 	{
 		// set the size of the cursor based on resolution.
-		fCursor->SetSize( 2*fCursor->GetMipmap()->GetWidth()/fWidth, 2*fCursor->GetMipmap()->GetHeight()/fHeight );
+		fCursor->SetSize( CURSOR_SIZE_X * BASE_WIDTH / fWidth, CURSOR_SIZE_Y * BASE_HEIGHT / fHeight );
 	}
 }
 

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp

@@ -11664,11 +11664,7 @@ void	plDXPlateManager::IDrawToDevice( plPipeline *pipe )
 	fD3DDevice->SetFVF(dxPipe->fSettings.fCurrFVFFormat = PLD3D_PLATEFVF);
 	fD3DDevice->SetStreamSource( 0, fVertBuffer, 0, sizeof( plPlateVertex ) );	
 	plProfile_Inc(VertexChange);
-	// To get plates properly pixel-aligned, we need to compensate for D3D9's weird half-pixel
-	// offset (see http://drilian.com/2008/11/25/understanding-half-pixel-and-half-texel-offsets/
-	// or http://msdn.microsoft.com/en-us/library/bb219690(VS.85).aspx).
-	D3DXMatrixTranslation(&mat, -0.5f/scrnWidthDiv2, -0.5f/scrnHeightDiv2, 0.0f);
-	fD3DDevice->SetTransform( D3DTS_VIEW, &mat );
+	fD3DDevice->SetTransform( D3DTS_VIEW, &d3dIdentityMatrix );
 	oldCullMode = dxPipe->fCurrCullMode;
 
 	for( plate = fPlates; plate != nil; plate = plate->GetNext() )

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plPlates.h

@@ -110,7 +110,6 @@ class plPlate
 		hsMatrix44		&GetTransform( void ) { return fXformMatrix; }
 		const char		*GetTitle( void ) { return fTitle; }
 		UInt32			GetFlags( void ) { return fFlags; }
-		const plMipmap	*GetMipmap( void ) { return fMipmap; }
 
 		void	SetVisible( hsBool vis ) { if( vis ) fFlags |= kFlagVisible; else fFlags &= ~kFlagVisible; }
 		hsBool	IsVisible( void );