summaryrefslogtreecommitdiff
path: root/games-roguelike/scourge/files/scourge-0.21.1-gcc6.patch
blob: fed15f45ed7e5d43ce999524fbd60b8780e1287a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
Bug: https://bugs.gentoo.org/610492
Upstream ticket: https://sourceforge.net/p/scourge/patches/3/

--- a/src/equip.cpp
+++ b/src/equip.cpp
@@ -595,7 +595,7 @@
 		}
 	}
 	if ( !found ) {
-		specialSkill = false;
+		specialSkill = NULL;
 		canvas->setTooltip( "" );
 	}
 	glDisable( GL_BLEND );
--- a/src/render/map.cpp
+++ b/src/render/map.cpp
@@ -3154,7 +3154,7 @@
 			if ( shape )
 				return shape;
 		}
-		return false;
+		return NULL;
 	}
 	if ( y1 == y2 ) {
 		if ( x1 > x2 ) SWAP( x1, x2 );
@@ -3163,7 +3163,7 @@
 			if ( shape )
 				return shape;
 		}
-		return false;
+		return NULL;
 	}