Mercurial > mm7

diff SpriteObject.cpp @ 1483:223605b325b3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Thu, 29 Aug 2013 12:04:55 +0600
parents 7ef4b64f6329
children c4ab816fcc5e
line wrap: on
line diff
--- a/SpriteObject.cpp	Thu Aug 29 12:04:33 2013 +0600
+++ b/SpriteObject.cpp	Thu Aug 29 12:04:55 2013 +0600
@@ -997,7 +997,7 @@
   int dir_z; // [sp+10h] [bp-8h]@1
   DAMAGE_TYPE pDamageType; // [sp+14h] [bp-4h]@14
 
-  pMapInfo = &pMapStats->pInfos[pMapStats->GetMapInfo(pCurrentMapName.data())];
+  pMapInfo = &pMapStats->pInfos[pMapStats->GetMapInfo(pCurrentMapName)];
   dir_x = abs(pParty->vPosition.x - this->vPosition.x);
   dir_y = abs(pParty->vPosition.y - this->vPosition.y);
   dir_z = abs(pParty->vPosition.z + pParty->sEyelevel - this->vPosition.z);