# HG changeset patch # User Grumpy7 # Date 1369686327 -7200 # Node ID a1fd8045ffb14d1b4ec5725b32726b4912a9eedf # Parent 4339bb88c4f53d6e32257ac030f7aca568e5a419 probably erroneous semicolons removed, mace and staff stun chance work as they should diff -r 4339bb88c4f5 -r a1fd8045ffb1 Texture.cpp --- 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) ) diff -r 4339bb88c4f5 -r a1fd8045ffb1 mm7_5.cpp --- 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; diff -r 4339bb88c4f5 -r a1fd8045ffb1 mm7_6.cpp --- 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;