Bladeren bron

Revert std string in boost::regex_match

Image 2 jaren geleden
bovenliggende
commit
d44969be6e
3 gewijzigde bestanden met toevoegingen van 3 en 3 verwijderingen
  1. 0 2
      EQ2/source/WorldServer/Combat.cpp
  2. 3 1
      EQ2/source/WorldServer/Zone/map.cpp
  3. BIN
      server/EQ2World__Debug_x64.exe

+ 0 - 2
EQ2/source/WorldServer/Combat.cpp

@@ -1546,8 +1546,6 @@ void Entity::ClearProcs() {
 }
 
 sint32 Entity::CalculateHateAmount(Spawn* target, sint32 amt) {
-	sint32 hate = amt;
-
 	amt = CalculateFormulaByStat(amt, ITEM_STAT_TAUNT_AMOUNT);
 
 	amt = CalculateFormulaByStat(amt, ITEM_STAT_TAUNT_AND_COMBAT_ART_DAMAGE);

+ 3 - 1
EQ2/source/WorldServer/Zone/map.cpp

@@ -688,7 +688,9 @@ void MapRange::AddVersionRange(std::string zoneName) {
   BOOST_FOREACH(boost::filesystem::path
     const & i, make_pair(iter, eod)) {
     if (is_regular_file(i)) {
-      if (boost::regex_match(i.string(), base_match, re)) {
+		std::string fileName(i.string());
+
+      if (boost::regex_match(fileName, base_match, re)) {
         boost::ssub_match base_sub_match = base_match[2];
         boost::ssub_match base_sub_match2 = base_match[5];
 		boost::ssub_match base_sub_match3 = base_match[6];

BIN
server/EQ2World__Debug_x64.exe