Merge pull request #396 from doug1234/master

Fix half elf bug
GrognardsFromHell · Jun 9, 2020 · a60c291 · a60c291
2 parents 5195adc + dc23499
commit a60c291
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 2 deletions.
diff --git a/TemplePlus/python/python_object.cpp b/TemplePlus/python/python_object.cpp
@@ -1464,7 +1464,7 @@ static PyObject* PyObjHandle_ConditionsGet(PyObject* obj, PyObject* args) {
 		PyTuple_SET_ITEM(tuple, 0, cname);
 		if (node->condStruct->numArgs) {
 			auto tupleArgs = PyTuple_New(node->condStruct->numArgs);
-			for (auto i = 0; i < node->condStruct->numArgs; i++)
+			for (unsigned int i = 0; i < node->condStruct->numArgs; i++)
 			{
 				PyTuple_SET_ITEM(tupleArgs, i, PyInt_FromSize_t(node->args[i]));
 			}
@@ -2451,7 +2451,7 @@ static PyObject* GetCharacterClassesSet(Filter filter, PyObject* obj, PyObject*
 	}
 
 	auto result = PyTuple_New(classes.size());
-	for (auto i = 0; i < classes.size(); i++) {
+	for (size_t i = 0; i < classes.size(); i++) {
 		PyTuple_SET_ITEM(result, i, PyInt_FromLong(classes[i]));
 	}
 

diff --git a/tpdata/co8infra.dat b/tpdata/co8infra.dat
diff --git a/tpdata/kotbfixes.dat b/tpdata/kotbfixes.dat
diff --git a/tpdata/tpgamefiles.dat b/tpdata/tpgamefiles.dat
diff --git a/tpdatasrc/tpgamefiles/scr/tpModifiers/half_elf.py b/tpdatasrc/tpgamefiles/scr/tpModifiers/half_elf.py
@@ -2,6 +2,7 @@
 from toee import *
 import tpdp
 import race_utils
+import char_class_utils
 
 ###################################################