Mercurial > mm7

changeset 1108:a1fd8045ffb1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
probably erroneous semicolons removed, mace and staff stun chance work as they should
author Grumpy7
date Mon, 27 May 2013 22:25:27 +0200
parents 4339bb88c4f5
children 23a9ea8f380f cf6cd674c398
files Texture.cpp mm7_5.cpp mm7_6.cpp
diffstat 3 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Texture.cpp	Mon May 27 22:07:53 2013 +0200
+++ b/Texture.cpp	Mon May 27 22:25:27 2013 +0200
@@ -278,7 +278,7 @@
     {
       v3->pTextures[i].uTextureID = pBitmaps_LOD->LoadTexture(v3->pTextures[i].pTextureName, TEXTURE_DEFAULT);
 
-      if (v3->pTextures[i].uTextureID != -1);
+      if (v3->pTextures[i].uTextureID != -1)
         pBitmaps_LOD->pTextures[v3->pTextures[i].uTextureID].palette_id2 = pPaletteManager->LoadPalette(pBitmaps_LOD->pTextures[v3->pTextures[i].uTextureID].palette_id1);
       //result = (unsigned int)v3->pTextures;
       //if ( !(*(char *)(result + i * 20 + 18) & 1) )
--- a/mm7_5.cpp	Mon May 27 22:07:53 2013 +0200
+++ b/mm7_5.cpp	Mon May 27 22:25:27 2013 +0200
@@ -4445,7 +4445,7 @@
         case PLAYER_SKILL_STAFF:
           if (main_hand_mastery >= 3)
           {
-            if (rand() % 100 < player->GetActualSkillLevel(PLAYER_SKILL_STAFF) & 0x3F)  // stun chance when mastery >= 3
+            if (rand() % 100 < (player->GetActualSkillLevel(PLAYER_SKILL_STAFF) & 0x3F))  // stun chance when mastery >= 3
               hit_will_stun = true;
           }
         break;
@@ -4453,12 +4453,12 @@
         case PLAYER_SKILL_MACE:
           if (main_hand_mastery >= 3)
           {
-            if (rand() % 100 < player->GetActualSkillLevel(PLAYER_SKILL_MACE) & 0x3F)
+            if (rand() % 100 < (player->GetActualSkillLevel(PLAYER_SKILL_MACE) & 0x3F))
               hit_will_stun = true;
           }
           if (main_hand_mastery >= 4)
           {
-            if (rand() % 100 < player->GetActualSkillLevel(PLAYER_SKILL_MACE) & 0x3F)
+            if (rand() % 100 < (player->GetActualSkillLevel(PLAYER_SKILL_MACE) & 0x3F))
               hit_will_paralyze = true;
           }
         break;
--- a/mm7_6.cpp	Mon May 27 22:07:53 2013 +0200
+++ b/mm7_6.cpp	Mon May 27 22:25:27 2013 +0200
@@ -2148,7 +2148,7 @@
             a5 |= 0x0002;
             break;
           }
-          else if ((player->pActiveSkills[PLAYER_SKILL_SPIRIT] & 0x1C0) == 0);
+          else if ((player->pActiveSkills[PLAYER_SKILL_SPIRIT] & 0x1C0) == 0)
             //goto LABEL_25;
           {
             a5 |= 0x0002;