Ver Fonte

Minor compile fix, std::copy used that way overwrites original bonuses [but the code won't be needed anyway]

Michał W. Urbańczyk há 14 anos atrás
pai
commit
9f21e4b46f
2 ficheiros alterados com 8 adições e 8 exclusões
  1. 1 1
      client/CAnimation.cpp
  2. 7 7
      lib/CCreatureHandler.cpp

+ 1 - 1
client/CAnimation.cpp

@@ -195,7 +195,7 @@ void CDefFile::loadFrame(size_t frame, size_t group, ImageLoader &loader) const
 	case 1:
 		{
 			//for each line we have offset of pixel data
-			const ui32 * RWEntriesLoc = reinterpret_cast<const unsigned int *>(FDef+currentOffset);
+			const ui32 * RWEntriesLoc = reinterpret_cast<const ui32 *>(FDef+currentOffset);
 			currentOffset += sizeof(ui32) * sprite.height;
 
 			for (unsigned int i=0; i<sprite.height; i++)

+ 7 - 7
lib/CCreatureHandler.cpp

@@ -649,13 +649,13 @@ void CCreatureHandler::loadCreatures()
 			loadToIt (dump2, buf, it, 3); //crop comment
 		} while (it < buf.size());
 
- 		BOOST_FOREACH(CCreature *c, creatures)
- 		{
- 			if (it = c->level < 7)
- 				std::copy(commonBonuses[it-1].begin(), commonBonuses[it-1].end(), c->bonuses.begin());
- 			else
- 				std::copy(commonBonuses[7].begin(), commonBonuses[7].end(), c->bonuses.begin()); //common for tiers 8+
- 		}
+//  		BOOST_FOREACH(CCreature *c, creatures)
+//  		{
+//  			if (it = c->level < 7)
+//  				std::copy(commonBonuses[it-1].begin(), commonBonuses[it-1].end(), c->bonuses.begin());
+//  			else
+//  				std::copy(commonBonuses[7].begin(), commonBonuses[7].end(), c->bonuses.begin()); //common for tiers 8+
+//  		}
 	} //end of stack experience
 }