From 9df1d08348ddd3fa7449aa1edf5430b1e9c29898 Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Wed, 29 Jul 2020 15:41:00 +0300
Subject: [PATCH] Fixes after merge

---
 src/core/SurfaceTable.h | 10 ----------
 src/skel/glfw/glfw.cpp  |  5 -----
 src/skel/win/win.cpp    | 28 ----------------------------
 3 files changed, 43 deletions(-)

diff --git a/src/core/SurfaceTable.h b/src/core/SurfaceTable.h
index 5fe9c24e..359ebd5c 100644
--- a/src/core/SurfaceTable.h
+++ b/src/core/SurfaceTable.h
@@ -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];
diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp
index 25785294..9a4f2188 100644
--- a/src/skel/glfw/glfw.cpp
+++ b/src/skel/glfw/glfw.cpp
@@ -1371,11 +1371,6 @@ cursorEnterCB(GLFWwindow* window, int entered) {
 	PSGLOBAL(cursorIsInWindow) = !!entered;
 }
 
-void
-cursorEnterCB(GLFWwindow* window, int entered) {
-	PSGLOBAL(cursorIsInWindow) = !!entered;
-}
-
 /*
  *****************************************************************************
  */
diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp
index 3e0a7934..75a3a7c9 100644
--- a/src/skel/win/win.cpp
+++ b/src/skel/win/win.cpp
@@ -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);
-}
-
-
 /*
  *****************************************************************************
  */