diff Items.cpp @ 2282:f5680ba9c96d

SpellStats::Initialize using tokenizer
author Grumpy7
date Fri, 14 Mar 2014 23:06:24 +0100
parents b13ab8114e5d
children 40c4065234f8
line wrap: on
line diff
--- a/Items.cpp	Fri Mar 14 23:55:50 2014 +0600
+++ b/Items.cpp	Fri Mar 14 23:06:24 2014 +0100
@@ -15,23 +15,6 @@
 #include "texts.h"
 #include "mm7_data.h"
 
-struct ci_less : std::binary_function<std::string, std::string, bool>
-{
-  // case-independent (ci) compare_less binary function
-  struct nocase_compare : public std::binary_function<unsigned char,unsigned char,bool> 
-  {
-    bool operator() (const unsigned char& c1, const unsigned char& c2) const {
-      return tolower (c1) < tolower (c2); 
-    }
-  };
-  bool operator() (const std::string & s1, const std::string & s2) const {
-    return std::lexicographical_compare 
-      (s1.begin (), s1.end (),   // source range
-      s2.begin (), s2.end (),   // dest range
-      nocase_compare ());  // comparison
-  }
-};
-
 
 struct ITEM_VARIATION
 	{
@@ -372,7 +355,6 @@
   materialMap["relic"] = MATERIAL_RELIC;
   materialMap["special"] = MATERIAL_SPECIAL;
 
-	int i,j;
   char* test_string;
   int item_counter;
 
@@ -402,7 +384,7 @@
 	strtok(NULL, "\r");
 	strtok(NULL, "\r");
 	//Standard Bonuses by Group	
-	for (i=0;i<24;++i)
+	for (int i=0;i<24;++i)
 		{
 		test_string = strtok(NULL, "\r") + 1;
     auto tokens = Tokenize(test_string, '\t');
@@ -415,9 +397,9 @@
 	}
 
 	memset(&pEnchantmentsSumm, 0, 36);
-	for(i=0;i<9;++i)
+	for(int i=0;i<9;++i)
 		{
-		for (j=0;j<24;++j)
+		for (int j=0;j<24;++j)
 			pEnchantmentsSumm[i]+=pEnchantments[j].to_item[i];
 		}
 
@@ -427,7 +409,7 @@
 	strtok(NULL, "\r");
 	strtok(NULL, "\r");
 	strtok(NULL, "\r");
-	for(i=0;i<6;++i) //counted from 1
+	for(int i=0;i<6;++i) //counted from 1
   {
     test_string = strtok(NULL, "\r") + 1;
     auto tokens = Tokenize(test_string, '\t');
@@ -443,7 +425,7 @@
 	strtok(NULL, "\r");
 	strtok(NULL, "\r");
 	strtok(NULL, "\r");
-	for (i=0;i<72;++i)
+	for (int i=0;i<72;++i)
 	{
     test_string = strtok(NULL, "\r") + 1;
     auto tokens = Tokenize(test_string, '\t');
@@ -469,7 +451,7 @@
 
 	pSpecialEnchantments_count = 71;
 	memset(&pSpecialEnchantmentsSumm, 0, 96);
-	for(i=0;i<12;++i)
+	for(int i=0;i<12;++i)
 		{
 		for (unsigned int j=0;j<=pSpecialEnchantments_count;++j)
 			pSpecialEnchantmentsSumm[i]+=pSpecialEnchantments[j].to_item_apply[i];
@@ -582,9 +564,9 @@
 
 	//ChanceByTreasureLvl Summ - to calculate chance
 	memset(&uChanceByTreasureLvlSumm, 0, 24);
-	for(i=0;i<6;++i)
+	for(int i=0;i<6;++i)
 		{
-		for (j=1;j<item_counter;++j)
+		for (int j=1;j<item_counter;++j)
 			uChanceByTreasureLvlSumm[i]+=pItems[j].uChanceByTreasureLvl[i];
 		}
 
@@ -593,7 +575,7 @@
 	strtok(NULL, "\r");
 	strtok(NULL, "\r");
 	strtok(NULL, "\r");
-	for (i=0;i<3;++i)
+	for (int i=0;i<3;++i)
 		{
 		test_string = strtok(NULL, "\r") + 1;
     auto tokens = Tokenize(test_string, '\t');
@@ -636,7 +618,7 @@
 	pSkillDescTXT_Raw = NULL;
 	pSkillDescTXT_Raw = (char *)pEvents_LOD->LoadRaw("skilldes.txt", 0);
 	strtok(pSkillDescTXT_Raw, "\r");
-	for (i=0; i<37; ++i)
+	for (int i=0; i<37; ++i)
 		{
 		test_string = strtok(NULL, "\r") + 1;
     auto tokens = Tokenize(test_string, '\t');
@@ -651,7 +633,7 @@
 	pStatsTXT_Raw = 0;
 	pStatsTXT_Raw = (char *)pEvents_LOD->LoadRaw("stats.txt", 0);
 	strtok(pStatsTXT_Raw, "\r");
-	for (i=0; i<26; ++i)
+	for (int i=0; i<26; ++i)
 		{
 		test_string = strtok(NULL, "\r") + 1;
     auto tokens = Tokenize(test_string, '\t');
@@ -730,7 +712,7 @@
 	pClassTXT_Raw = 0;
 	pClassTXT_Raw = (char *)pEvents_LOD->LoadRaw("class.txt", 0);
 	strtok(pClassTXT_Raw, "\r");
-	for (i=0; i<36; ++i)
+	for (int i=0; i<36; ++i)
 		{
 		test_string = strtok(NULL, "\r") + 1;
     auto tokens = Tokenize(test_string, '\t');