From 886ef13becf801cd40a3f07c3464cb943107ff3f Mon Sep 17 00:00:00 2001
From: DjWarmonger <warmonger@vp.pl>
Date: Fri, 12 Jul 2013 19:13:39 +0000
Subject: [PATCH] Levels for WoG neutral creatures - fixes #1282.

Renamed Myriad and Medusa Queen (sic?) to Arctic & Lava Sharpshooter.
---
 Mods/WoG/config/wog/creatures.json | 28 ++++++++++++++--------------
 lib/HeroBonus.cpp                  |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Mods/WoG/config/wog/creatures.json b/Mods/WoG/config/wog/creatures.json
index 6a66d441e..a5de5bb3f 100644
--- a/Mods/WoG/config/wog/creatures.json
+++ b/Mods/WoG/config/wog/creatures.json
@@ -210,7 +210,7 @@
 	"ghost" :
 	{
 		"index": 159,
-		"level": 0,
+		"level": 3,
 		"faction": "neutral",
 		"graphics" :
 		{
@@ -344,7 +344,7 @@
 	"gorynych" :
 	{
 		"index": 168,
-		"level": 0,
+		"level": 7,
 		"faction": "neutral",
 		"abilities":
 		{
@@ -369,7 +369,7 @@
 	"warZealot" :
 	{
 		"index": 169,
-		"level": 0,
+		"level": 6,
 		"faction": "neutral",
 		"graphics" :
 		{
@@ -389,10 +389,10 @@
 			"wince": "ZELTWNCE.wav"
 		}
 	},
-	"myriad" :
+	"arcticSharpshooter" :
 	{
 		"index": 170,
-		"level": 0,
+		"level": 5,
 		"faction": "neutral",
 		"graphics" :
 		{
@@ -412,10 +412,10 @@
 			"wince": "HCRSWNCE.wav"
 		}
 	},
-	"medusaMatriarch" :
+	"lavaSharpshooter" :
 	{
 		"index": 171,
-		"level": 0,
+		"level": 5,
 		"faction": "neutral",
 		"graphics" :
 		{
@@ -438,7 +438,7 @@
 	"nightmare" :
 	{
 		"index": 172,
-		"level": 0,
+		"level": 6,
 		"faction": "neutral",
 		"graphics" :
 		{
@@ -456,7 +456,7 @@
 	"santaGremlin" :
 	{
 		"index": 173,
-		"level": 0,
+		"level": 2,
 		"faction": "neutral",
 		"graphics" :
 		{
@@ -1092,7 +1092,7 @@
 	"sylvanCentaur" :
 	{
 		"index": 192,
-		"level": 0,
+		"level": 3,
 		"faction": "neutral",
 		"graphics" :
 		{
@@ -1112,10 +1112,10 @@
 			"wince": "ECNTWNCE.wav"
 		}
 	},
-	"sorceress" :
+	"sorceresses" :
 	{
 		"index": 193,
-		"level": 0,
+		"level": 6,
 		"faction": "neutral",
 		"graphics" :
 		{
@@ -1138,7 +1138,7 @@
 	"werewolf" :
 	{
 		"index": 194,
-		"level": 0,
+		"level": 4,
 		"faction": "neutral",
 		"graphics" :
 		{
@@ -1148,7 +1148,7 @@
 	"hellSteed" :
 	{
 		"index": 195,
-		"level": 0,
+		"level": 6,
 		"faction": "neutral",
 		"graphics" :
 		{
diff --git a/lib/HeroBonus.cpp b/lib/HeroBonus.cpp
index 10631cd07..955559e02 100644
--- a/lib/HeroBonus.cpp
+++ b/lib/HeroBonus.cpp
@@ -226,7 +226,7 @@ void BonusList::getBonuses(BonusList & out, const CSelector &selector, const CSe
 		Bonus *b = elem;
 
 		//add matching bonuses that matches limit predicate or have NO_LIMIT if no given predicate
-		if(selector(b) && ((!limit && b->effectRange == Bonus::NO_LIMIT) || (limit && limit(b))))
+		if(selector(b) && ((!limit && b->effectRange == Bonus::NO_LIMIT) || ((bool)limit && limit(b))))
 			out.push_back(b);
 	}
 }