[c.f. Hoikas Discord>>OpenUru>>Dev]

Restore exception handler after PhysX initialization seizes it.

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

@@ -91,7 +91,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #if BUILD_TYPE == BUILD_TYPE_DEV
 	#define STATUS_PATH L"www2.cyanworlds.com"
 #else
-	#define STATUS_PATH L"support.cyanworlds.com"
+	#define STATUS_PATH L"account.mystonline.com"
 #endif
 
 
@@ -1965,6 +1965,9 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, int nC
 		if( !gClient->StartInit() )
 			break;
 		
+		// Reestablish exception handler after PhysX stole it
+		SetUnhandledExceptionFilter( plCustomUnhandledExceptionFilter );
+
 		// I want it on top! I mean it!
 		BringWindowToTop( gClient->GetWindowHandle() );
 

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plUruLauncher/Main.cpp

@@ -58,7 +58,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #if BUILD_TYPE == BUILD_TYPE_DEV
 	#define STATUS_PATH L"www2.cyanworlds.com"
 #else
-	#define STATUS_PATH L"support.cyanworlds.com"
+	#define STATUS_PATH L"account.mystonline.com"
 #endif
 
 

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGImage/plBitmap.cpp

@@ -113,8 +113,7 @@ UInt32 	plBitmap::Read( hsStream *s )
 	fFlags = s->ReadSwap16();
 	fCompressionType = s->ReadByte();
 
-	if( fCompressionType == kUncompressed || fCompressionType == kJPEGCompression ||
-		fCompressionType == kPNGCompression )
+	if(( fCompressionType == kUncompressed )||( fCompressionType == kJPEGCompression ))
 	{
 		fUncompressedInfo.fType = s->ReadByte();
 		read++;
@@ -146,8 +145,7 @@ UInt32 	plBitmap::Write( hsStream *s )
 	s->WriteSwap16( fFlags );
 	s->WriteByte( fCompressionType );
 
-	if( fCompressionType == kUncompressed || fCompressionType == kJPEGCompression ||
-		fCompressionType == kPNGCompression )
+	if(( fCompressionType == kUncompressed )||(fCompressionType == kJPEGCompression ))
 	{
 		s->WriteByte( fUncompressedInfo.fType );
 		written++;

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGImage/plBitmap.h

@@ -104,8 +104,7 @@ class plBitmap : public hsKeyedObject
 		{
 			kUncompressed		= 0x0,
 			kDirectXCompression	= 0x1,
-			kJPEGCompression    = 0x2,
-			kPNGCompression     = 0x3
+			kJPEGCompression	= 0x2
 		};
 
 		struct DirectXInfo

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGImage/plMipmap.cpp

@@ -60,7 +60,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "../plPipeline/hsGDeviceRef.h"
 #include "plProfile.h"
 #include "../plJPEG/plJPEG.h"
-#include "plPNG.h"
 
 plProfile_CreateMemCounter("Mipmaps", "Memory", MemMipmaps);
 
@@ -123,8 +122,11 @@ void	plMipmap::Create( UInt32 width, UInt32 height, unsigned config, UInt8 numLe
 	}
 	
 	fCompressionType = compType;
-	if( compType == kUncompressed || compType == kJPEGCompression ||
-		compType == kPNGCompression )
+	if( compType == kUncompressed )
+	{
+		fUncompressedInfo.fType = format;
+	}
+	else if( compType == kJPEGCompression )
 	{
 		fUncompressedInfo.fType = format;
 	}
@@ -267,10 +269,6 @@ UInt32  plMipmap::Read( hsStream *s )
 			case kJPEGCompression:
 				IReadJPEGImage( s );
 				break;
-
-			case kPNGCompression:
-				IReadPNGImage( s );
-				break;
 				
 			default:
 				hsAssert( false, "Unknown compression type in plMipmap::Read()" );
@@ -311,10 +309,6 @@ UInt32 	plMipmap::Write( hsStream *s )
 				IWriteJPEGImage( s );
 				break;
 
-			case kPNGCompression:
-				IWritePNGImage( s );
-				break;
-
 			default:
 				hsAssert( false, "Unknown compression type in plMipmap::Read()" );
 				return totalWritten;
@@ -582,23 +576,6 @@ void plMipmap::IWriteJPEGImage( hsStream *stream )
 	delete alpha;
 }
 
-void plMipmap::IReadPNGImage(hsStream* stream)
-{
-    plMipmap* temp = NULL;
-
-    temp = plPNG::Instance().ReadFromStream(stream);
-
-    if (temp) {
-        CopyFrom(temp);
-        delete temp;
-    }
-}
-
-void plMipmap::IWritePNGImage(hsStream* stream)
-{
-    plPNG::Instance().WriteToStream(stream, this);
-}
-
 //// GetLevelSize /////////////////////////////////////////////////////////////
 //	Get the size of a single mipmap level (0 is the largest)
 
@@ -636,7 +613,6 @@ void	plMipmap::IBuildLevelSizes()
 
 			case kUncompressed:
 			case kJPEGCompression:
-			case kPNGCompression:
 				fLevelSizes[ level ] = height * rowBytes;
 				break;
 
@@ -1610,7 +1586,6 @@ void	plMipmap::CopyFrom( const plMipmap *source )
 			break;
 		case kUncompressed:
 		case kJPEGCompression:
-		case kPNGCompression:
 			fUncompressedInfo.fType = source->fUncompressedInfo.fType;
 			break;
 		default:

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGImage/plMipmap.h

@@ -310,8 +310,6 @@ class plMipmap : public plBitmap
 		void	IWriteRLEImage( hsStream *stream, plMipmap *mipmap );
 		void	IReadJPEGImage( hsStream *stream );
 		void	IWriteJPEGImage( hsStream *stream );
-		void    IReadPNGImage( hsStream *stream );
-		void    IWritePNGImage( hsStream *stream );
 		void	IBuildLevelSizes();
 
 		void	IColorLevel( UInt8 level, const UInt8 *colorMask );

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetResManager.cpp

@@ -66,7 +66,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "../pnKeyedObject/hsKeyedObject.h"
 #include "../pnFactory/plCreatable.h"
 #include "../pnNetCommon/plNetApp.h"
-#include "hsStream.h"
+#include "hsStream.h" 
 
 plNetResManager::plNetResManager()
 {
@@ -92,19 +92,11 @@ plCreatable* plNetResManager::IReadCreatable(hsStream* s) const
 	return nil;
 }
 
-void plNetResManager::IKeyReffed(plKeyImp* key)
+void plNetResManager::IKeyReffed(plKeyImp* key) 
 {
 }
 
-void plNetResManager::IKeyUnreffed(plKeyImp* key)
-{
-//   Expanded even with HS_DEBUGGING undefined. XXX
-//	hsAssert( key != nil, "NetResMgr::NIL key to Unref" );
-	if (key == nil) {
-		ErrorAssert(104,
-					"H:\\projects\\OpenURU\\Repo\\Foundry-CWE-ou-minkata\\MOULOpenSourceClientPlugin\\Plasma20\\Sources\\Plasma\\PubUtilLib\\plNetCommon\\plNetResManager.cpp",
-					"NetResMgr::NIL key to Unref");
-	} else {
-		delete key;
-	}
+void plNetResManager::IKeyUnreffed(plKeyImp* key) 
+{ 
+	delete key; 
 }