# HG changeset patch # User Ritor1 # Date 1364876962 -21600 # Node ID 4004fb0bf60cd4c64af17261faf173207cd145e6 # Parent 7eb081d32614f559569cbfe75bbe89b2177f6257# Parent caa86b11dcddd05ed7f3a3abce03f382c0052922 Слияние diff -r caa86b11dcdd -r 4004fb0bf60c mm7_5.cpp --- a/mm7_5.cpp Tue Apr 02 01:09:37 2013 +0600 +++ b/mm7_5.cpp Tue Apr 02 10:29:22 2013 +0600 @@ -376,7 +376,6 @@ case UIMSG_BuyInShop_Identify_Repair: UIShop_Buy_Identify_Repair(); continue; - case UIMSG_ClickNPCTopic: ClickNPCTopic(uMessageParam); continue;