mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-11-05 06:35:54 +00:00
Fixes after merge
This commit is contained in:
parent
86cc86ac12
commit
9df1d08348
|
@ -88,16 +88,6 @@ IsShootThrough(uint8 surfType)
|
|||
return false;
|
||||
}
|
||||
|
||||
inline bool
|
||||
IsSeeThrough(uint8 surfType)
|
||||
{
|
||||
switch(surfType)
|
||||
case SURFACE_GLASS:
|
||||
case SURFACE_TRANSPARENT_CLOTH:
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
class CSurfaceTable
|
||||
{
|
||||
static float ms_aAdhesiveLimitTable[NUMADHESIVEGROUPS][NUMADHESIVEGROUPS];
|
||||
|
|
|
@ -1371,11 +1371,6 @@ cursorEnterCB(GLFWwindow* window, int entered) {
|
|||
PSGLOBAL(cursorIsInWindow) = !!entered;
|
||||
}
|
||||
|
||||
void
|
||||
cursorEnterCB(GLFWwindow* window, int entered) {
|
||||
PSGLOBAL(cursorIsInWindow) = !!entered;
|
||||
}
|
||||
|
||||
/*
|
||||
*****************************************************************************
|
||||
*/
|
||||
|
|
|
@ -1305,34 +1305,6 @@ InitApplication(HANDLE instance)
|
|||
}
|
||||
|
||||
|
||||
/*
|
||||
*****************************************************************************
|
||||
*/
|
||||
static BOOL
|
||||
InitApplication(HANDLE instance)
|
||||
{
|
||||
/*
|
||||
* Perform any necessary MS Windows application initialization. Basically,
|
||||
* this means registering the window class for this application.
|
||||
*/
|
||||
|
||||
WNDCLASS windowClass;
|
||||
|
||||
windowClass.style = CS_BYTEALIGNWINDOW;
|
||||
windowClass.lpfnWndProc = (WNDPROC)MainWndProc;
|
||||
windowClass.cbClsExtra = 0;
|
||||
windowClass.cbWndExtra = 0;
|
||||
windowClass.hInstance = (HINSTANCE)instance;
|
||||
windowClass.hIcon = nil;
|
||||
windowClass.hCursor = LoadCursor(nil, IDC_ARROW);
|
||||
windowClass.hbrBackground = nil;
|
||||
windowClass.lpszMenuName = NULL;
|
||||
windowClass.lpszClassName = AppClassName;
|
||||
|
||||
return RegisterClass(&windowClass);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
*****************************************************************************
|
||||
*/
|
||||
|
|
Loading…
Reference in a new issue