Mercurial > mm7
comparison mm7_2.cpp @ 431:8c45cac1c5e1
Merge
author | Nomad |
---|---|
date | Sun, 24 Feb 2013 00:55:51 +0200 |
parents | 58b71c1af7d8 24936a5ff8ca |
children | 137c59c3dbc4 |
comparison
equal
deleted
inserted
replaced
430:58b71c1af7d8 | 431:8c45cac1c5e1 |
---|---|
15694 goto LABEL_41; | 15694 goto LABEL_41; |
15695 v22 = pOutdoor->pBModels[(dword_720020_zvalues[v18] & 0xFFFFu) >> 9].pFaces[((dword_720020_zvalues[v18] & 0xFFFFu) >> 3) & 0x3F].sCogTriggeredID; | 15695 v22 = pOutdoor->pBModels[(dword_720020_zvalues[v18] & 0xFFFFu) >> 9].pFaces[((dword_720020_zvalues[v18] & 0xFFFFu) >> 3) & 0x3F].sCogTriggeredID; |
15696 } | 15696 } |
15697 if ( v22 ) | 15697 if ( v22 ) |
15698 { | 15698 { |
15699 v23 = _444732_GetEventHintString(v22); | 15699 v23 = GetEventHintString(v22); |
15700 if ( v23 ) | 15700 if ( v23 ) |
15701 goto LABEL_36; | 15701 goto LABEL_36; |
15702 } | 15702 } |
15703 } | 15703 } |
15704 LABEL_41: | 15704 LABEL_41: |
15709 v25 = &pLevelDecorations[v20]; | 15709 v25 = &pLevelDecorations[v20]; |
15710 v26 = v25; | 15710 v26 = v25; |
15711 v27 = v25->field_16_event_id; | 15711 v27 = v25->field_16_event_id; |
15712 if ( v27 ) | 15712 if ( v27 ) |
15713 { | 15713 { |
15714 v23 = _444732_GetEventHintString(v27); | 15714 v23 = GetEventHintString(v27); |
15715 if ( !v23 ) | 15715 if ( !v23 ) |
15716 return v19; | 15716 return v19; |
15717 goto LABEL_36; | 15717 goto LABEL_36; |
15718 } | 15718 } |
15719 if ( v25->IsInteractive() ) | 15719 if ( v25->IsInteractive() ) |