Index: GlobalAI.cpp
===================================================================
--- GlobalAI.cpp	(revision 3061)
+++ GlobalAI.cpp	(working copy)
@@ -10,81 +10,80 @@
 #include "ExternalAI/GlobalAICInterface/AbicProxy.h"
 #include "LogOutput.h"
 
-CGlobalAI::CGlobalAI(int team, const char* dll)
-: team(team), cheatevents(false)
-{
-	ai=0;
 
+CGlobalAI::CGlobalAI(int team, const char* dll): team(team), cheatevents(false) {
+	ai = 0;
+
 	if (!filesystem.GetFilesize(dll)) {
-		handleerror(NULL,dll,"Could not find AI lib",MBF_OK|MBF_EXCL);
+		handleerror(NULL, dll, "Could not find AI lib", MBF_OK | MBF_EXCL);
 		return;
 	}
 
 	lib = SharedLib::Instantiate(dll);
+	_IsCInterface = (ISCINTERFACE) lib -> FindAddress("IsCInterface");
 
-	// check if presents C interface
-	_IsCInterface = (ISCINTERFACE)lib->FindAddress("IsCInterface");
-	if( _IsCInterface != 0 )
-	{
+	// check if IsCInterface function exported and return value true
+	if ( _IsCInterface != 0 && _IsCInterface() == 1) {
 		// presents C interface
-        logOutput << dll <<  " has C interface\n";
+		logOutput << dll <<  " has C interface\n";
 		IsCInterface = true;
-		AbicProxy* ai=SAFE_NEW AbicProxy; // keep as AbicProxy, so InitAI works ok
-		this->ai = ai;
-		gh=SAFE_NEW CGroupHandler(team);
-		callback=SAFE_NEW CGlobalAICallback(this);
-		ai->InitAI(dll,callback,team);
+
+		// keep as AbicProxy, so InitAI works ok
+		AbicProxy* ai = SAFE_NEW AbicProxy;
+		this -> ai = ai;
+
+		gh = SAFE_NEW CGroupHandler(team);
+		callback = SAFE_NEW CGlobalAICallback(this);
+		ai -> InitAI(dll, callback, team);
 	}
-	else
-	{
+	else {
 		// presents C++ interface
 		logOutput << dll <<  " has C++ interface\n";
+		IsCInterface = false;
+	
+		GetGlobalAiVersion = (GETGLOBALAIVERSION) lib -> FindAddress("GetGlobalAiVersion");
 
-		GetGlobalAiVersion = (GETGLOBALAIVERSION)lib->FindAddress("GetGlobalAiVersion");
-		if (GetGlobalAiVersion==0){
-			handleerror(NULL,dll,"Incorrect Global AI dll",MBF_OK|MBF_EXCL);
+		if (GetGlobalAiVersion == 0) {
+			handleerror(NULL, dll, "Incorrect Global AI dll", MBF_OK|MBF_EXCL);
 			return;
 		}
+		
+		int i = GetGlobalAiVersion();
 
-		int i=GetGlobalAiVersion();
-
-		if (i!=GLOBAL_AI_INTERFACE_VERSION){
-			handleerror(NULL,dll,"Incorrect Global AI dll version",MBF_OK|MBF_EXCL);
+		if (i != GLOBAL_AI_INTERFACE_VERSION) {
+			handleerror(NULL, dll, "Incorrect Global AI dll version", MBF_OK | MBF_EXCL);
 			return;
 		}
 
-		GetNewAI = (GETNEWAI)lib->FindAddress("GetNewAI");
-		ReleaseAI = (RELEASEAI)lib->FindAddress("ReleaseAI");
+		GetNewAI = (GETNEWAI) lib -> FindAddress("GetNewAI");
+		ReleaseAI = (RELEASEAI) lib -> FindAddress("ReleaseAI");
 
-		ai=GetNewAI();
-		gh=SAFE_NEW CGroupHandler(team);
-		callback=SAFE_NEW CGlobalAICallback(this);
-		ai->InitAI(callback,team);
+		ai = GetNewAI();
+		gh = SAFE_NEW CGroupHandler(team);
+		callback = SAFE_NEW CGlobalAICallback(this);
+		ai -> InitAI(callback, team);
 	}
 }
 
-void CGlobalAI::PreDestroy ()
-{
-	callback->noMessages = true;
+void CGlobalAI::PreDestroy () {
+	callback -> noMessages = true;
 }
 
-CGlobalAI::~CGlobalAI(void)
-{
-	if(ai){
-		if( !IsCInterface )
-		{
+CGlobalAI::~CGlobalAI(void) {
+	if (ai) {
+		if (!IsCInterface) {
 			ReleaseAI(ai);
-		}// note to self: ideally should clean up c interface too
+		}
+
 		delete lib;
 		delete callback;
 		delete gh;
 	}
 }
 
-void CGlobalAI::Update(void)
-{
-	gh->Update();
-	ai->Update();
+void CGlobalAI::Update(void) {
+	gh -> Update();
+	ai -> Update();
 }
 
 IMPLEMENT_PURE_VIRTUAL(IGlobalAI::~IGlobalAI())