From 2e7af8cf007c3d7f1a0e2b781060f7616cfc467f Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Wed, 30 Mar 2016 02:01:02 -0400
Subject: [PATCH] More mismerge corrections and other fixes to get this closer
 to compiling.

---
 Sources/Engine/Entities/EntityClass.cpp |  5 -----
 Sources/Engine/Graphics/Adapter.cpp     |  4 +++-
 Sources/Engine/Graphics/GfxLibrary.cpp  | 14 ++++++++------
 Sources/Engine/Templates/Selection.cpp  |  2 +-
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Sources/Engine/Entities/EntityClass.cpp b/Sources/Engine/Entities/EntityClass.cpp
index 1f0f801..887b9f1 100644
--- a/Sources/Engine/Entities/EntityClass.cpp
+++ b/Sources/Engine/Entities/EntityClass.cpp
@@ -247,11 +247,6 @@ void CEntityClass::Read_t( CTStream *istr) // throw char *
     ThrowF_t(TRANS("Cannot load DLL file '%s':\n%s"),
               (const char *) dllName, (const char *) err);
   }
-  
-
-  // load the DLL
-  CTFileName fnmExpanded;
-  ExpandFilePath(EFP_READ, fnmDLL, fnmExpanded);
 
   ec_fnmClassDLL = fnmDLL;
 
diff --git a/Sources/Engine/Graphics/Adapter.cpp b/Sources/Engine/Graphics/Adapter.cpp
index 839e7dc..5741468 100644
--- a/Sources/Engine/Graphics/Adapter.cpp
+++ b/Sources/Engine/Graphics/Adapter.cpp
@@ -60,7 +60,7 @@ static CResolution _areResolutions[] =
 // THIS NUMBER MUST NOT BE OVER 25! (otherwise change it in adapter.h)
 static const INDEX MAX_RESOLUTIONS = sizeof(_areResolutions)/sizeof(_areResolutions[0]);
 
-// !!! FIXME : rcg11052001 abstract this...
+
 #ifdef PLATFORM_WIN32
 
 // initialize CDS support (enumerate modes at startup)
@@ -210,6 +210,8 @@ void CGfxLibrary::InitAPIs(void)
   }
   // shutdown DX8 (we'll start it again if needed)
   D3DRELEASE( gl_pD3D, TRUE);
+#endif
+
   if( gl_hiDriver!=NONE) FreeLibrary(gl_hiDriver);
   gl_hiDriver = NONE;
 }
diff --git a/Sources/Engine/Graphics/GfxLibrary.cpp b/Sources/Engine/Graphics/GfxLibrary.cpp
index 311e381..5bb6bf3 100644
--- a/Sources/Engine/Graphics/GfxLibrary.cpp
+++ b/Sources/Engine/Graphics/GfxLibrary.cpp
@@ -45,9 +45,9 @@
 #endif
 
 // control for partial usage of compiled vertex arrays
-extern BOOL CVA_b2D     = FALSE;
-extern BOOL CVA_bWorld  = FALSE;
-extern BOOL CVA_bModels = FALSE;    
+BOOL CVA_b2D     = FALSE;
+BOOL CVA_bWorld  = FALSE;
+BOOL CVA_bModels = FALSE;
 
 // common element arrays
 CStaticStackArray<GFXVertex>   _avtxCommon;      
@@ -299,14 +299,18 @@ static INDEX sys_bHasHardwareTnL = 1;
 static INDEX sys_bHasTruform = 0;
 static INDEX sys_bHasCVAs = 0;
 static INDEX sys_bUsingOpenGL = 0;
-extern INDEX sys_bUsingDirect3D = 0;
+INDEX sys_bUsingDirect3D = 0;
 
 /*
  * Low level hook flags
  */
 #define WH_KEYBOARD_LL 13
 
+#ifdef PLATFORM_WIN32
+void EnableWindowsKeys(void);
+
 #pragma message(">> doublecheck me!!!")
+
 // these are commented because they are already defined in winuser.h
 //#define LLKHF_EXTENDED 0x00000001
 //#define LLKHF_INJECTED 0x00000010
@@ -315,7 +319,6 @@ extern INDEX sys_bUsingDirect3D = 0;
 
 //#define LLMHF_INJECTED 0x00000001
 
-#ifdef PLATFORM_WIN32
 /*
  * Structure used by WH_KEYBOARD_LL
  */
@@ -1061,7 +1064,6 @@ CGfxLibrary::CGfxLibrary(void)
  */
 CGfxLibrary::~CGfxLibrary()
 {
-  extern void EnableWindowsKeys(void);
   EnableWindowsKeys();
   // free common arrays
   _avtxCommon.Clear();
diff --git a/Sources/Engine/Templates/Selection.cpp b/Sources/Engine/Templates/Selection.cpp
index 6c8388c..56d910c 100644
--- a/Sources/Engine/Templates/Selection.cpp
+++ b/Sources/Engine/Templates/Selection.cpp
@@ -20,7 +20,7 @@ void CSelection<cType, ulFlag>::Select(cType &tToSelect)
     // select it
     tToSelect.Select(ulFlag);
     // add it to this container
-    Add(&tToSelect);
+    this->Add(&tToSelect);
 
   // if the object is already selected
   } else {