Mercurial > mm7
comparison mm7_3.cpp @ 431:8c45cac1c5e1
Merge
author | Nomad |
---|---|
date | Sun, 24 Feb 2013 00:55:51 +0200 |
parents | 58b71c1af7d8 24936a5ff8ca |
children | 0eaed3e0d75f |
comparison
equal
deleted
inserted
replaced
430:58b71c1af7d8 | 431:8c45cac1c5e1 |
---|---|
14463 v13 = v12->sCogTriggeredID; | 14463 v13 = v12->sCogTriggeredID; |
14464 if ( v13 ) | 14464 if ( v13 ) |
14465 { | 14465 { |
14466 if ( !(BYTE2(v12->uAttributes) & 0x10) ) | 14466 if ( !(BYTE2(v12->uAttributes) & 0x10) ) |
14467 { | 14467 { |
14468 v14 = _444732_GetEventHintString(v13); | 14468 v14 = GetEventHintString(v13); |
14469 v15 = v14; | 14469 v15 = v14; |
14470 if ( v14 ) | 14470 if ( v14 ) |
14471 { | 14471 { |
14472 if ( _strcmpi(v14, "") ) | 14472 if ( _strcmpi(v14, "") ) |
14473 v21 = (char *)v15; | 14473 v21 = (char *)v15; |
14564 v12 = v11->sCogTriggeredID; | 14564 v12 = v11->sCogTriggeredID; |
14565 if ( v12 ) | 14565 if ( v12 ) |
14566 { | 14566 { |
14567 if ( !(BYTE2(v11->uAttributes) & 0x10) ) | 14567 if ( !(BYTE2(v11->uAttributes) & 0x10) ) |
14568 { | 14568 { |
14569 v13 = _444732_GetEventHintString(v12); | 14569 v13 = GetEventHintString(v12); |
14570 v14 = v13; | 14570 v14 = v13; |
14571 if ( v13 ) | 14571 if ( v13 ) |
14572 { | 14572 { |
14573 if ( _strcmpi(v13, "") ) | 14573 if ( _strcmpi(v13, "") ) |
14574 v17 = v14; | 14574 v17 = v14; |