Mercurial > mm7
diff mm7_3.cpp @ 485:b6bdfaa3ae0f
Merge
author | Gloval |
---|---|
date | Wed, 27 Feb 2013 02:26:16 +0400 |
parents | 4bd56919f075 9898e6b413d8 |
children | a3939d5067c4 dddedef7a98e |
line wrap: on
line diff
--- a/mm7_3.cpp Wed Feb 27 02:25:31 2013 +0400 +++ b/mm7_3.cpp Wed Feb 27 02:26:16 2013 +0400 @@ -15135,7 +15135,7 @@ } else if (v16 == 21) { - __debugbreak(); // learn conditions of this event + //__debugbreak(); // learn conditions of this event auto topic = pNPCTopics[pNPC->evt_C - 1].pTopic;//(&dword_721660)[8 * v23]; if (!topic) { @@ -15146,7 +15146,7 @@ } else if (v16 == 22) { - __debugbreak(); // learn conditions of this event + //__debugbreak(); // learn conditions of this event auto topic = pNPCTopics[pNPC->evt_D - 1].pTopic;//(&dword_721660)[8 * v23]; if (!topic) { @@ -15157,7 +15157,7 @@ } else if (v16 == 23) { - __debugbreak(); // learn conditions of this event + //__debugbreak(); // learn conditions of this event auto topic = pNPCTopics[pNPC->evt_E - 1].pTopic;//(&dword_721660)[8 * v23]; if (!topic) {