a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 16:50:07 +00:00
Code Issues Projects Releases Wiki Activity

Fixes after merge

Browse source
This commit is contained in:
Sergeanur 2020-07-29 15:41:00 +03:00
parent 86cc86ac12
commit 9df1d08348
3 changed files with 0 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/core/SurfaceTable.h
View file

@ -88,16 +88,6 @@ IsShootThrough(uint8 surfType)
return false; return false;
} }
inline bool
IsSeeThrough(uint8 surfType)
{
switch(surfType)
case SURFACE_GLASS:
case SURFACE_TRANSPARENT_CLOTH:
return true;
return false;
}
class CSurfaceTable class CSurfaceTable
{ {
static float ms_aAdhesiveLimitTable[NUMADHESIVEGROUPS][NUMADHESIVEGROUPS]; static float ms_aAdhesiveLimitTable[NUMADHESIVEGROUPS][NUMADHESIVEGROUPS];

5
src/skel/glfw/glfw.cpp
View file

@ -1371,11 +1371,6 @@ cursorEnterCB(GLFWwindow* window, int entered) {
PSGLOBAL(cursorIsInWindow) = !!entered; PSGLOBAL(cursorIsInWindow) = !!entered;
} }
void
cursorEnterCB(GLFWwindow* window, int entered) {
PSGLOBAL(cursorIsInWindow) = !!entered;
}
/* /*
***************************************************************************** *****************************************************************************
*/ */

28
src/skel/win/win.cpp
View file

@ -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);
}
/* /*
***************************************************************************** *****************************************************************************
*/ */