# HG changeset patch # User Nomad # Date 1361903426 -7200 # Node ID 98f0d3c19de2d2b7e4f15530a781474dd57f7037 # Parent 9898e6b413d89ffa9fb036e18dee347a1554d751# Parent 5b6e2021c6fefdbc96bc6c55e1d68d9f6cf847d8 Merge diff -r 5b6e2021c6fe -r 98f0d3c19de2 mm7_3.cpp --- a/mm7_3.cpp Tue Feb 26 17:24:53 2013 +0600 +++ b/mm7_3.cpp Tue Feb 26 20:30:26 2013 +0200 @@ -15134,7 +15134,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) { @@ -15145,7 +15145,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) { @@ -15156,7 +15156,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 5b6e2021c6fe -r 98f0d3c19de2 mm7_6.cpp --- a/mm7_6.cpp Tue Feb 26 17:24:53 2013 +0600 +++ b/mm7_6.cpp Tue Feb 26 20:30:26 2013 +0200 @@ -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;