Mercurial > mm7

changeset 483:98f0d3c19de2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Nomad
date Tue, 26 Feb 2013 20:30:26 +0200
parents 9898e6b413d8 (diff) 5b6e2021c6fe (current diff)
children b6bdfaa3ae0f
files
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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)
       {
--- 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;