From cf4220b40d72594beebd58e7bc89a03222511d12 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Wed, 19 Dec 2018 13:04:22 +0100
Subject: fix cannot convert 'bool' to 'Shape*' in return


diff --git a/src/equip.cpp b/src/equip.cpp
index 2c74b82..adc894b 100644
--- a/src/equip.cpp
+++ b/src/equip.cpp
@@ -595,7 +595,7 @@ void Equip::drawCapabilities() {
 		}
 	}
 	if ( !found ) {
-		specialSkill = false;
+		specialSkill = NULL;
 		canvas->setTooltip( "" );
 	}
 	glDisable( GL_BLEND );
diff --git a/src/render/map.cpp b/src/render/map.cpp
index 9a80e73..2af52b5 100644
--- a/src/render/map.cpp
+++ b/src/render/map.cpp
@@ -3154,7 +3154,7 @@ Shape *Map::isWallBetween( int x1, int y1, int z1, int x2, int y2, int z2 ) {
 			if ( shape )
 				return shape;
 		}
-		return false;
+		return NULL;
 	}
 	if ( y1 == y2 ) {
 		if ( x1 > x2 ) SWAP( x1, x2 );
@@ -3163,7 +3163,7 @@ Shape *Map::isWallBetween( int x1, int y1, int z1, int x2, int y2, int z2 ) {
 			if ( shape )
 				return shape;
 		}
-		return false;
+		return NULL;
 	}
 
 
-- 
2.19.1


From 1b355cfad0d86b74d6735c6b3eb972ee87ba320f Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Wed, 19 Dec 2018 14:17:51 +0100
Subject: fix 'sq_vm_free' was not declared (and others)


diff --git a/src/squirrel/squtils.h b/src/squirrel/squtils.h
index 3f86621..0addca8 100644
--- a/src/squirrel/squtils.h
+++ b/src/squirrel/squtils.h
@@ -2,6 +2,10 @@
 #ifndef _SQUTILS_H_
 #define _SQUTILS_H_
 
+void *sq_vm_malloc(SQUnsignedInteger size);
+void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
+void sq_vm_free(void *p,SQUnsignedInteger size);
+
 #define sq_new(__ptr,__type) {__ptr=(__type *)sq_vm_malloc(sizeof(__type));new (__ptr) __type;}
 #define sq_delete(__ptr,__type) {__ptr->~__type();sq_vm_free(__ptr,sizeof(__type));}
 #define SQ_MALLOC(__size) sq_vm_malloc(__size);
-- 
2.19.1


From d19b3c905efa09f3556b16f076a92ef39dcd53a9 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Fri, 21 Dec 2018 08:37:55 +0100
Subject: remove check for glext.h (tests)


diff --git a/configure.in b/configure.in
index 82aeac9..91b58d8 100644
--- a/configure.in
+++ b/configure.in
@@ -490,19 +490,6 @@ if test "x$has_glx_get_proc" = "xyes" ; then
     dnl fi
 fi
 
-dnl Check for glext.h 
-AC_CHECK_HEADERS( "GL/glext.h", have_glext_h=yes, have_glext_h=no )
-
-if test "x$have_glext_h" = "xno" ; then
-    AC_MSG_ERROR([
-*****************************************************************
-You are missing the file glext.h.
-You can get a copy at
-http://oss.sgi.com/projects/ogl-sample/ABI/glext.h
-Place it in the directory /usr/include/GL.
-*****************************************************************])
-fi
-
 dnl Check that glext.h version is recent enough
 AC_MSG_CHECKING([whether glext.h is recent enough]);
 AC_EGREP_CPP(yes,
-- 
2.19.1

