# HG changeset patch # User Gloval # Date 1361917576 -14400 # Node ID b6bdfaa3ae0f836bdcd9a396ec3b7b9f15e4b7c5 # Parent 4bd56919f075428fe495135e5596df8bd3ec018f# Parent 98f0d3c19de2d2b7e4f15530a781474dd57f7037 Merge diff -r 4bd56919f075 -r b6bdfaa3ae0f mm7_3.cpp --- 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) { diff -r 4bd56919f075 -r b6bdfaa3ae0f mm7_6.cpp --- a/mm7_6.cpp Wed Feb 27 02:25:31 2013 +0400 +++ b/mm7_6.cpp Wed Feb 27 02:26:16 2013 +0400 @@ -7900,7 +7900,7 @@ //----- (0042EB8D) -------------------------------------------------------- void GUIMessageQueue::AddMessageImpl(UIMessageType msg, int param, unsigned int a4, const char *file, int line) { - Log::Warning(L"%s @ (%S %u)", UIMessage2String(msg), file, line); + //Log::Warning(L"%s @ (%S %u)", UIMessage2String(msg), file, line); if (uNumMessages < 40) { files[uNumMessages] = file;