mm7: Outdoor.cpp comparison

Merge

comparison

equal deleted inserted replaced

-:58b71c1af7d8
+:8c45cac1c5e1
 // 5187E4: using guessed type int uNumSpritesDrawnThisFrame;
 //----- (0044C1E8) --------------------------------------------------------
 bool ODMFace::HasEventHint()
 {
-signed int v1; // eax@1
+signed int event_index; // eax@1
-EventIndex *v2; // esi@2
+_evt_raw* start_evt;
-bool result; // eax@5
+_evt_raw* end_evt;
-signed int v4; // eax@6
+event_index = 0;
-v1 = 0;
+if ( (uLevelEVT_NumEvents - 1) <= 0 )
-if ( (signed int)(uLevelEVT_NumEvents - 1) <= 0 )
+return false;
-goto LABEL_5;
+while ( pLevelEVT_Index[event_index].uEventID != this->sCogTriggeredID )
-v2 = pLevelEVT_Index;
+{
-while ( v2->uEventID != this->sCogTriggeredID )
+++event_index;
-{
+if ( event_index >= (signed int)(uLevelEVT_NumEvents - 1) )
-++v1;
+return false;
-++v2;
+}
-if ( v1 >= (signed int)(uLevelEVT_NumEvents - 1) )
+end_evt=(_evt_raw*)&pLevelEVT[pLevelEVT_Index[event_index+1].uEventOffsetInEVT];
-goto LABEL_5;
+start_evt=(_evt_raw*)&pLevelEVT[pLevelEVT_Index[event_index].uEventOffsetInEVT];
-}
+if ( (end_evt->_e_type != EVENT_Exit) || (start_evt->_e_type!= EVENT_MouseOver) )
-v4 = v1;
+return false;
-if ( pLevelEVT[pLevelEVT_Index[v4 + 1].uEventOffsetInEVT + 4] != 1
-|| pLevelEVT[pLevelEVT_Index[v4].uEventOffsetInEVT + 4] != 4 )
-LABEL_5:
-result = 0;
 else
-result = 1;
+return true;
-return result;
+}
-}

Mercurial > mm7