Mercurial > mm7

changeset 485:b6bdfaa3ae0f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Gloval
date Wed, 27 Feb 2013 02:26:16 +0400
parents 4bd56919f075 (current diff) 98f0d3c19de2 (diff)
children 7887a9cf9e7b 89e360b3a0fd 00ce82758c72
files mm7_3.cpp
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
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)
       {
--- 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;