Mercurial > mm7
comparison mm7_3.cpp @ 485:b6bdfaa3ae0f
Merge
author | Gloval |
---|---|
date | Wed, 27 Feb 2013 02:26:16 +0400 |
parents | 4bd56919f075 9898e6b413d8 |
children | a3939d5067c4 dddedef7a98e |
comparison
equal
deleted
inserted
replaced
484:4bd56919f075 | 485:b6bdfaa3ae0f |
---|---|
15133 } | 15133 } |
15134 else strcpy(v14->pButtonName, topic); | 15134 else strcpy(v14->pButtonName, topic); |
15135 } | 15135 } |
15136 else if (v16 == 21) | 15136 else if (v16 == 21) |
15137 { | 15137 { |
15138 __debugbreak(); // learn conditions of this event | 15138 //__debugbreak(); // learn conditions of this event |
15139 auto topic = pNPCTopics[pNPC->evt_C - 1].pTopic;//(&dword_721660)[8 * v23]; | 15139 auto topic = pNPCTopics[pNPC->evt_C - 1].pTopic;//(&dword_721660)[8 * v23]; |
15140 if (!topic) | 15140 if (!topic) |
15141 { | 15141 { |
15142 v14->pButtonName[0] = 0; | 15142 v14->pButtonName[0] = 0; |
15143 v14->uControlParam = 0; | 15143 v14->uControlParam = 0; |
15144 } | 15144 } |
15145 else strcpy(v14->pButtonName, topic); | 15145 else strcpy(v14->pButtonName, topic); |
15146 } | 15146 } |
15147 else if (v16 == 22) | 15147 else if (v16 == 22) |
15148 { | 15148 { |
15149 __debugbreak(); // learn conditions of this event | 15149 //__debugbreak(); // learn conditions of this event |
15150 auto topic = pNPCTopics[pNPC->evt_D - 1].pTopic;//(&dword_721660)[8 * v23]; | 15150 auto topic = pNPCTopics[pNPC->evt_D - 1].pTopic;//(&dword_721660)[8 * v23]; |
15151 if (!topic) | 15151 if (!topic) |
15152 { | 15152 { |
15153 v14->pButtonName[0] = 0; | 15153 v14->pButtonName[0] = 0; |
15154 v14->uControlParam = 0; | 15154 v14->uControlParam = 0; |
15155 } | 15155 } |
15156 else strcpy(v14->pButtonName, topic); | 15156 else strcpy(v14->pButtonName, topic); |
15157 } | 15157 } |
15158 else if (v16 == 23) | 15158 else if (v16 == 23) |
15159 { | 15159 { |
15160 __debugbreak(); // learn conditions of this event | 15160 //__debugbreak(); // learn conditions of this event |
15161 auto topic = pNPCTopics[pNPC->evt_E - 1].pTopic;//(&dword_721660)[8 * v23]; | 15161 auto topic = pNPCTopics[pNPC->evt_E - 1].pTopic;//(&dword_721660)[8 * v23]; |
15162 if (!topic) | 15162 if (!topic) |
15163 { | 15163 { |
15164 v14->pButtonName[0] = 0; | 15164 v14->pButtonName[0] = 0; |
15165 v14->uControlParam = 0; | 15165 v14->uControlParam = 0; |