# HG changeset patch
# User Nomad
# Date 1367410216 -7200
# Node ID eb3bb0f2e1b9eb630d2272e781b2d2ffd6eda85e
# Parent  0d96349d8c87359805377f816fd96ec9958c1491# Parent  7cbe4f80e3221bba1d85d0a51c45cc832014b1f4
Merge

diff -r 0d96349d8c87 -r eb3bb0f2e1b9 mm7_2.cpp
--- a/mm7_2.cpp	Wed May 01 14:09:49 2013 +0200
+++ b/mm7_2.cpp	Wed May 01 14:10:16 2013 +0200
@@ -6860,6 +6860,79 @@
           for (uint i = 0; i < 4; ++i)
             pParty->pPlayers[i].uSkillPoints = 50;
         return 0;
+
+        case 40044://condition Afraid/fear
+          pPlayers[uActiveCharacter]->pConditions[3] = 1;
+        return 0;
+
+        case 40043://condition Asleep
+          pPlayers[uActiveCharacter]->pConditions[2] = 1;
+        return 0;
+
+        case 40037://condition Curse
+          pPlayers[uActiveCharacter]->pConditions[0] = 1;
+        return 0;
+
+        case 40036://condition Disease1
+          pPlayers[uActiveCharacter]->pConditions[7] = 1;
+        return 0;
+
+        case 40035://condition Disease2
+          pPlayers[uActiveCharacter]->pConditions[9] = 1;
+        return 0;
+
+        case 40034://condition Disease3
+          pPlayers[uActiveCharacter]->pConditions[11] = 1;
+        return 0;
+
+        case 40041://condition Dead
+          pPlayers[uActiveCharacter]->pConditions[14] = 1;
+        return 0;
+
+        case 40039://condition Drunk
+          pPlayers[uActiveCharacter]->pConditions[4] = 1;
+        return 0;
+
+        case 40042://condition Eradicated
+          pPlayers[uActiveCharacter]->pConditions[16] = 1;
+        return 0;
+
+        case 40038://condition Isane
+          pPlayers[uActiveCharacter]->pConditions[5] = 1;
+        return 0;
+
+        case 40045://condition Paralized
+          pPlayers[uActiveCharacter]->pConditions[12] = 1;
+        return 0;
+
+        case 40033://condition Poison1
+          pPlayers[uActiveCharacter]->pConditions[6] = 1;
+        return 0;
+
+        case 40032://condition Poison2
+          pPlayers[uActiveCharacter]->pConditions[8] = 1;
+        return 0;
+
+        case 40031://condition Poison3
+          pPlayers[uActiveCharacter]->pConditions[10] = 1;
+        return 0;
+
+        case 40029://condition Stone
+          pPlayers[uActiveCharacter]->pConditions[15] = 1;
+        return 0;
+
+        case 40040://condition Unconscious
+          pPlayers[uActiveCharacter]->pConditions[13] = 1;
+        return 0;
+
+        case 40030://condition Weak
+          pPlayers[uActiveCharacter]->pConditions[1] = 1;
+        return 0;
+
+        case 40073://condition Zombie
+          pPlayers[uActiveCharacter]->pConditions[17] = 1;
+        return 0;
+
       }
     }
     return DefWindowProcA(hWnd, Msg, wParam, lParam);