q3aql/Serious-Engine
q3aql/Serious-Engine
1
0
Fork 0
mirror of https://github.com/ptitSeb/Serious-Engine synced 2024-11-22 18:30:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

More mismerge corrections and other fixes to get this closer to compiling.

Browse Source
This commit is contained in:
Ryan C. Gordon 2016-03-30 02:01:02 -04:00
parent 28a8b5cb2e
commit 2e7af8cf00
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Sources/Engine/Entities/EntityClass.cpp
View File

@ -247,11 +247,6 @@ void CEntityClass::Read_t( CTStream *istr) // throw char *
ThrowF_t(TRANS("Cannot load DLL file '%s':\n%s"), ThrowF_t(TRANS("Cannot load DLL file '%s':\n%s"),
(const char *) dllName, (const char *) err); (const char *) dllName, (const char *) err);
} }
// load the DLL
CTFileName fnmExpanded;
ExpandFilePath(EFP_READ, fnmDLL, fnmExpanded);
ec_fnmClassDLL = fnmDLL; ec_fnmClassDLL = fnmDLL;

4
Sources/Engine/Graphics/Adapter.cpp
View File

@ -60,7 +60,7 @@ static CResolution _areResolutions[] =
// THIS NUMBER MUST NOT BE OVER 25! (otherwise change it in adapter.h) // THIS NUMBER MUST NOT BE OVER 25! (otherwise change it in adapter.h)
static const INDEX MAX_RESOLUTIONS = sizeof(_areResolutions)/sizeof(_areResolutions[0]); static const INDEX MAX_RESOLUTIONS = sizeof(_areResolutions)/sizeof(_areResolutions[0]);
// !!! FIXME : rcg11052001 abstract this...
#ifdef PLATFORM_WIN32 #ifdef PLATFORM_WIN32
// initialize CDS support (enumerate modes at startup) // initialize CDS support (enumerate modes at startup)
@ -210,6 +210,8 @@ void CGfxLibrary::InitAPIs(void)
} }
// shutdown DX8 (we'll start it again if needed) // shutdown DX8 (we'll start it again if needed)
D3DRELEASE( gl_pD3D, TRUE); D3DRELEASE( gl_pD3D, TRUE);
#endif
if( gl_hiDriver!=NONE) FreeLibrary(gl_hiDriver); if( gl_hiDriver!=NONE) FreeLibrary(gl_hiDriver);
gl_hiDriver = NONE; gl_hiDriver = NONE;
} }

14
Sources/Engine/Graphics/GfxLibrary.cpp
View File

@ -45,9 +45,9 @@
#endif #endif
// control for partial usage of compiled vertex arrays // control for partial usage of compiled vertex arrays
extern BOOL CVA_b2D = FALSE; BOOL CVA_b2D = FALSE;
extern BOOL CVA_bWorld = FALSE; BOOL CVA_bWorld = FALSE;
extern BOOL CVA_bModels = FALSE; BOOL CVA_bModels = FALSE;
// common element arrays // common element arrays
CStaticStackArray<GFXVertex> _avtxCommon; CStaticStackArray<GFXVertex> _avtxCommon;
@ -299,14 +299,18 @@ static INDEX sys_bHasHardwareTnL = 1;
static INDEX sys_bHasTruform = 0; static INDEX sys_bHasTruform = 0;
static INDEX sys_bHasCVAs = 0; static INDEX sys_bHasCVAs = 0;
static INDEX sys_bUsingOpenGL = 0; static INDEX sys_bUsingOpenGL = 0;
extern INDEX sys_bUsingDirect3D = 0; INDEX sys_bUsingDirect3D = 0;
/* /*
* Low level hook flags * Low level hook flags
*/ */
#define WH_KEYBOARD_LL 13 #define WH_KEYBOARD_LL 13
#ifdef PLATFORM_WIN32
void EnableWindowsKeys(void);
#pragma message(">> doublecheck me!!!") #pragma message(">> doublecheck me!!!")
// these are commented because they are already defined in winuser.h // these are commented because they are already defined in winuser.h
//#define LLKHF_EXTENDED 0x00000001 //#define LLKHF_EXTENDED 0x00000001
//#define LLKHF_INJECTED 0x00000010 //#define LLKHF_INJECTED 0x00000010
@ -315,7 +319,6 @@ extern INDEX sys_bUsingDirect3D = 0;
//#define LLMHF_INJECTED 0x00000001 //#define LLMHF_INJECTED 0x00000001
#ifdef PLATFORM_WIN32
/* /*
* Structure used by WH_KEYBOARD_LL * Structure used by WH_KEYBOARD_LL
*/ */
@ -1061,7 +1064,6 @@ CGfxLibrary::CGfxLibrary(void)
*/ */
CGfxLibrary::~CGfxLibrary() CGfxLibrary::~CGfxLibrary()
{ {
extern void EnableWindowsKeys(void);
EnableWindowsKeys(); EnableWindowsKeys();
// free common arrays // free common arrays
_avtxCommon.Clear(); _avtxCommon.Clear();

2
Sources/Engine/Templates/Selection.cpp
View File

@ -20,7 +20,7 @@ void CSelection<cType, ulFlag>::Select(cType &tToSelect)
// select it // select it
tToSelect.Select(ulFlag); tToSelect.Select(ulFlag);
// add it to this container // add it to this container
Add(&tToSelect); this->Add(&tToSelect);
// if the object is already selected // if the object is already selected
} else { } else {