Mercurial > mm7

changeset 308:6d584c95dcf8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Gloval
date Wed, 20 Feb 2013 00:28:52 +0400
parents 72faa54ff319 (current diff) e33f5a1cdc46 (diff)
children 53b9b07ab9ec 4c2cdda88562
files Actor.cpp Indoor.cpp mm7_3.cpp
diffstat 7 files changed, 25 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/Actor.cpp	Wed Feb 20 00:26:17 2013 +0400
+++ b/Actor.cpp	Wed Feb 20 00:28:52 2013 +0400
@@ -3216,7 +3216,7 @@
   v3 = 60 * v1->pSpriteIDs[5];
   v1->uCurrentActionTime = 0;
   v1->uAIState = Dying;
-  v1->uCurrentActionAnimation = 5;
+  v1->uCurrentActionAnimation = ANIM_Dying;
   LOWORD(v3) = *(__int16 *)((char *)&v2->uAnimLength + v3);
   v1->sCurrentHP = 0;
   v1->uCurrentActionLength = 8 * v3;
@@ -4168,7 +4168,7 @@
   this->uActorRadius = 32;
   this->uActorHeight = 128;
   this->uAIState = Standing;
-  this->uCurrentActionAnimation = 0;
+  this->uCurrentActionAnimation = ANIM_Standing;
   this->uMovementSpeed = 200;
   this->uCarriedItemID = 0;
   this->uGroup = 0;
--- a/Indoor.cpp	Wed Feb 20 00:26:17 2013 +0400
+++ b/Indoor.cpp	Wed Feb 20 00:28:52 2013 +0400
@@ -4004,7 +4004,7 @@
           || (v56 = _46CEC3_get_floor_level(v0->vPosition.x, v0->vPosition.y, v0->vPosition.z, v5, &uFaceID), v56 == -30000) )
           goto LABEL_123;
       }
-      if ( v0->uCurrentActionAnimation == 1 )
+      if ( v0->uCurrentActionAnimation == ANIM_Walking)
       {
         v6 = v0->uMovementSpeed;
         v7 = HIDWORD(v0->pActorBuffs[7].uExpireTime) == 0;
--- a/Items.h	Wed Feb 20 00:26:17 2013 +0400
+++ b/Items.h	Wed Feb 20 00:28:52 2013 +0400
@@ -56,6 +56,7 @@
   ITEM_SPELLBOOK_LIGHT_SUN_BURST = 0x1E6,
   ITEM_SPELLBOOK_LIGHT_DIVINE_INTERVENTION = 0x1E7,
   ITEM_ARTIFACT_PUCK = 0x1F4,
+  ITEM_ARTIFACT_SPLITTER = 506,//1FA
   ITEM_RELIC_MEKORIGS_HAMMER = 0x210,
 };
 
--- a/mm7_1.cpp	Wed Feb 20 00:26:17 2013 +0400
+++ b/mm7_1.cpp	Wed Feb 20 00:28:52 2013 +0400
@@ -2397,8 +2397,9 @@
   _this = ecx0;
   var88 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu);
   v82 = pFontComic;
-  if ( v1->uItemID )
-  {
+  if (!v1->uItemID)
+    return;
+
     v79.Hint = 0;
     v79.uFrameWidth = 384;
     v79.uFrameHeight = 180;
@@ -2784,7 +2785,6 @@
     }
     sprintf(v64, v46, v50, v55, v60);
     goto LABEL_65;
-  }
 }
 // 4E455C: using guessed type int dword_4E455C;
 // 506128: using guessed type int areWeLoadingTexture;
@@ -2924,7 +2924,7 @@
   else
   {
     memcpy(&pMonsterInfoUI_Doll, v3, sizeof(pMonsterInfoUI_Doll));
-    pMonsterInfoUI_Doll.uCurrentActionAnimation = 7;
+    pMonsterInfoUI_Doll.uCurrentActionAnimation = ANIM_Bored;
     pMonsterInfoUI_Doll.uCurrentActionTime = 0;
     v8 = rand();
     v3 = v121;
@@ -2934,27 +2934,24 @@
   if ( (signed int)pMonsterInfoUI_Doll.uCurrentActionTime > (signed __int16)v9 )
   {
     pMonsterInfoUI_Doll.uCurrentActionTime = 0;
-    if ( pMonsterInfoUI_Doll.uCurrentActionAnimation == 7 || pMonsterInfoUI_Doll.uCurrentActionAnimation == 2 )
-    {
-      pMonsterInfoUI_Doll.uCurrentActionAnimation = 0;
+    if ( pMonsterInfoUI_Doll.uCurrentActionAnimation == ANIM_Bored || pMonsterInfoUI_Doll.uCurrentActionAnimation == ANIM_AtkMelee)
+    {
+      pMonsterInfoUI_Doll.uCurrentActionAnimation = ANIM_Standing;
       pMonsterInfoUI_Doll.uCurrentActionLength = rand() % 128 + 128;
     }
     else
     {
       rand();
-      pMonsterInfoUI_Doll.uCurrentActionAnimation = 7;
+      pMonsterInfoUI_Doll.uCurrentActionAnimation = ANIM_Bored;
       if ( (pMonsterInfoUI_Doll.pMonsterInfo.uID < 115 || pMonsterInfoUI_Doll.pMonsterInfo.uID > 186)
         && (pMonsterInfoUI_Doll.pMonsterInfo.uID < 232 || pMonsterInfoUI_Doll.pMonsterInfo.uID > 249)
         && rand() % 30 < 100 )
-        pMonsterInfoUI_Doll.uCurrentActionAnimation = 2;
-      pMonsterInfoUI_Doll.uCurrentActionLength = 8
-                                               * pSpriteFrameTable->pSpriteSFrames[v3->pSpriteIDs[(signed __int16)pMonsterInfoUI_Doll.uCurrentActionAnimation]].uAnimLength;
-    }
-  }
-  v10 = pSpriteFrameTable->GetFrame(
-          v3->pSpriteIDs[(signed __int16)pMonsterInfoUI_Doll.uCurrentActionAnimation],
-          pMonsterInfoUI_Doll.uCurrentActionTime);
-  v11 = pSprites_LOD[v10->pHwSpriteIDs[0]].pSpriteHeaders;//40 * v10->pHwSpriteIDs[0] + 7218180;
+        pMonsterInfoUI_Doll.uCurrentActionAnimation = ANIM_AtkMelee;
+      pMonsterInfoUI_Doll.uCurrentActionLength = 8 * pSpriteFrameTable->pSpriteSFrames[v3->pSpriteIDs[(signed __int16)pMonsterInfoUI_Doll.uCurrentActionAnimation]].uAnimLength;
+    }
+  }
+  v10 = pSpriteFrameTable->GetFrame( v3->pSpriteIDs[(signed __int16)pMonsterInfoUI_Doll.uCurrentActionAnimation], pMonsterInfoUI_Doll.uCurrentActionTime);
+  v11 = &pSprites_LOD->pSpriteHeaders[v10->pHwSpriteIDs[0]];//40 * v10->pHwSpriteIDs[0] + 7218180;
   v106.pTarget = pRenderer->pTargetSurface;
   v106.pTargetZ = pRenderer->pActiveZBuffer;
   v106.uTargetPitch = pRenderer->uTargetSurfacePitch;
@@ -3095,7 +3092,7 @@
 		{
 		  v108 = (unsigned __int16 *)pDesc.lpSurface;
 		  a2 = (Player *)v124;
-		  if ( v124 < v119 )
+  		  if ( v124 < v119 )
 		  {
 			v109 = 2 * pRenderer->uTargetSurfacePitch;
 			v29 = (int)a4;
--- a/mm7_3.cpp	Wed Feb 20 00:26:17 2013 +0400
+++ b/mm7_3.cpp	Wed Feb 20 00:28:52 2013 +0400
@@ -1017,7 +1017,7 @@
       v0->uAIState = Removed;
       goto LABEL_121;
     }
-    if ( v0->uCurrentActionAnimation == 1 )
+    if ( v0->uCurrentActionAnimation == ANIM_Walking )
     {
       v8 = v0->uMovementSpeed;
       v9 = HIDWORD(v0->pActorBuffs[7].uExpireTime) == 0;
--- a/mm7_5.cpp	Wed Feb 20 00:26:17 2013 +0400
+++ b/mm7_5.cpp	Wed Feb 20 00:28:52 2013 +0400
@@ -2280,7 +2280,7 @@
             }
             if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 )
             {
-              pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)113;
+              pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = UIMSG_Escape;
               pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = v0;
               *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0;
               ++pMessageQueue_50CBD0->uNumMessages;
@@ -3503,9 +3503,9 @@
           sub_41C0B8_set_status_string(pTmpBuf);
           continue;
         case UIMSG_ShowStatus_Food:
-          v173 = (char *)pParty->uNumFoodRations;
-          v157 = pGlobalTXT_LocalizationStrings[501];// You have %lu food"
-          goto _sprintex_2args_draw_status_and_continue;
+          sprintfex(pTmpBuf, pGlobalTXT_LocalizationStrings[501], pParty->uNumFoodRations); // "You have %lu food"
+          sub_41C0B8_set_status_string(pTmpBuf);
+          continue;
         case UIMSG_ShowStatus_Player:
           pPlayer5 = pPlayers[uMessageParam];
           sprintfex(pTmpBuf, pGlobalTXT_LocalizationStrings[429], pPlayer5->pName, pClassNames[pPlayer5->classType]);// "%s the %s"
--- a/mm7_6.cpp	Wed Feb 20 00:26:17 2013 +0400
+++ b/mm7_6.cpp	Wed Feb 20 00:28:52 2013 +0400
@@ -7970,7 +7970,7 @@
     Vec3_int_::Normalize(&a3.x, &a3.y, &a3.z);
 
     DamageMonsterFromParty((8 * (uActiveCharacter - 1)) | OBJECT_Player, target_id, &a3);
-    if (player->WearsItem(506, 1) || player->WearsItem(506, 0))
+    if (player->WearsItem(ITEM_ARTIFACT_SPLITTER, 1) || player->WearsItem(ITEM_ARTIFACT_SPLITTER, 0))
           _42FA66_do_explosive_impact(
             actor->vPosition.x,
             actor->vPosition.y,