Mercurial > mm7

changeset 1514:965af46e8793

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename LevelDecoration::field_16_event_id to LevelDecoration::uEventID.
author yoctozepto
date Tue, 03 Sep 2013 15:09:07 +0200
parents 4055b09160ae
children 46f6fc6f72fd
files CastSpellInfo.cpp Indoor.cpp Level/Decoration.h Outdoor.cpp UI/UiGame.cpp Viewport.cpp Vis.cpp mm7_2.cpp mm7_4.cpp mm7_5.cpp
diffstat 10 files changed, 15 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/CastSpellInfo.cpp	Mon Sep 02 22:08:21 2013 +0200
+++ b/CastSpellInfo.cpp	Tue Sep 03 15:09:07 2013 +0200
@@ -2984,7 +2984,7 @@
 						break;
 					}
 					OpenedTelekinesis = true;
-					if ( pLevelDecorations[v445].field_16_event_id )
+					if ( pLevelDecorations[v445].uEventID )
 					{
 						EventProcessor(v448, a2, 1);
 						LODWORD(v727) = 1;
--- a/Indoor.cpp	Mon Sep 02 22:08:21 2013 +0200
+++ b/Indoor.cpp	Tue Sep 03 15:09:07 2013 +0200
@@ -3897,7 +3897,7 @@
         }
       }
 
-      if (!pDecortaion->field_16_event_id)
+      if (!pDecortaion->uEventID)
       {
         if (pDecortaion->IsInteractive())
         {
@@ -6155,7 +6155,7 @@
 
     case OBJECT_Decoration:
       v8 = &pLevelDecorations[PID_ID(a1)];
-      v9 = v8->field_16_event_id;
+      v9 = v8->uEventID;
       if ( v9 )
       {
         EventProcessor(v9, a1, 1);
--- a/Level/Decoration.h	Mon Sep 02 22:08:21 2013 +0200
+++ b/Level/Decoration.h	Tue Sep 03 15:09:07 2013 +0200
@@ -29,7 +29,7 @@
   Vec3_int_ vPosition;
   int32_t field_10_y_rot;
   uint16_t uCog;
-  int16_t field_16_event_id;
+  uint16_t uEventID;
   uint16_t uTriggerRange;
   int16_t field_1A;
   int16_t _idx_in_stru123;
--- a/Outdoor.cpp	Mon Sep 02 22:08:21 2013 +0200
+++ b/Outdoor.cpp	Tue Sep 03 15:09:07 2013 +0200
@@ -2718,7 +2718,7 @@
       }
       if ( v8 && decor->uCog == 20 )
         decor->uFlags |= LEVEL_DECORATION_OBELISK_CHEST;
-      if ( !decor->field_16_event_id )
+      if ( !decor->uEventID )
       {
         if ( decor->IsInteractive() )
         {
--- a/UI/UiGame.cpp	Mon Sep 02 22:08:21 2013 +0200
+++ b/UI/UiGame.cpp	Tue Sep 03 15:09:07 2013 +0200
@@ -1287,7 +1287,7 @@
         {
           v23 = &pLevelDecorations[v19];
           v24 = v23;
-          v25 = v23->field_16_event_id;
+          v25 = v23->uEventID;
           if ( !v25 )
           {
             if ( v23->IsInteractive() )
--- a/Viewport.cpp	Mon Sep 02 22:08:21 2013 +0200
+++ b/Viewport.cpp	Tue Sep 03 15:09:07 2013 +0200
@@ -533,7 +533,7 @@
       pIcons_LOD->SyncLoadedFilesCount();
       return;
     }
-    if ( !pLevelDecorations[(signed int)(unsigned __int16)v0 >> 3].field_16_event_id )
+    if ( !pLevelDecorations[(signed int)(unsigned __int16)v0 >> 3].uEventID )
     {
       if ( pLevelDecorations[(signed int)(unsigned __int16)v0 >> 3].IsInteractive() )
       {
@@ -544,7 +544,7 @@
       }
       return;
     }
-    pEventID = pLevelDecorations[(signed int)(unsigned __int16)v0 >> 3].field_16_event_id;
+    pEventID = pLevelDecorations[(signed int)(unsigned __int16)v0 >> 3].uEventID;
   }
   if ( PID_TYPE(v0) == OBJECT_BModel && HIWORD(v0) < clickable_distance)
   {
--- a/Vis.cpp	Mon Sep 02 22:08:21 2013 +0200
+++ b/Vis.cpp	Tue Sep 03 15:09:07 2013 +0200
@@ -1433,7 +1433,7 @@
           MessageBoxA(nullptr, "Unsupported \"exclusion if no event\" type in CVis::is_part_of_selection", "E:\\WORK\\MSDEV\\MM7\\MM7\\Code\\Vis.cpp:207", 0);
           return true;
         }
-        if (pLevelDecorations[object_idx].uCog || pLevelDecorations[object_idx].field_16_event_id)
+        if (pLevelDecorations[object_idx].uCog || pLevelDecorations[object_idx].uEventID)
           return true;
         return pLevelDecorations[object_idx].IsInteractive();
       }
--- a/mm7_2.cpp	Mon Sep 02 22:08:21 2013 +0200
+++ b/mm7_2.cpp	Tue Sep 03 15:09:07 2013 +0200
@@ -1786,7 +1786,7 @@
   {
     auto decor = &pLevelDecorations[i];
 
-    if (!decor->field_16_event_id)
+    if (!decor->uEventID)
     {
       if (decor->IsInteractive())
       {
@@ -6156,7 +6156,7 @@
   }
   v25 = &pLevelDecorations[v20];
   v26 = v25;
-  v27 = v25->field_16_event_id;
+  v27 = v25->uEventID;
   if ( v27 )
   {
     v23 = GetEventHintString(v27);
--- a/mm7_4.cpp	Mon Sep 02 22:08:21 2013 +0200
+++ b/mm7_4.cpp	Tue Sep 03 15:09:07 2013 +0200
@@ -58,14 +58,14 @@
     if (v1->uFlags & LEVEL_DECORATION_TRIGGERED_BY_TOUCH
         && v1->vPosition.GetDistanceTo(pParty->vPosition) < v1->uTriggerRange)
     {
-      EventProcessor(v1->field_16_event_id, PID(OBJECT_Decoration,i), 1);
+      EventProcessor(v1->uEventID, PID(OBJECT_Decoration,i), 1);
     }
     else if (v1->uFlags & LEVEL_DECORATION_TRIGGERED_BY_MONSTER)
     {
       for (size_t j = 0; j < uNumActors; j++)
       {
         if (v1->vPosition.GetDistanceTo(pActors[j].vPosition) < v1->uTriggerRange)
-          EventProcessor(v1->field_16_event_id, 0, 1);
+          EventProcessor(v1->uEventID, 0, 1);
       }
     }
     else if (v1->uFlags & LEVEL_DECORATION_TRIGGERED_BY_OBJECT)
@@ -73,7 +73,7 @@
       for (size_t j = 0; j < uNumSpriteObjects; j++)
       {
         if (v1->vPosition.GetDistanceTo(pSpriteObjects[j].vPosition) < v1->uTriggerRange)
-          EventProcessor(v1->field_16_event_id, 0, 1);
+          EventProcessor(v1->uEventID, 0, 1);
       }
     }
   }
--- a/mm7_5.cpp	Mon Sep 02 22:08:21 2013 +0200
+++ b/mm7_5.cpp	Tue Sep 03 15:09:07 2013 +0200
@@ -1824,7 +1824,7 @@
           }
           if ( v45 == 5 )
           {
-            v48 = pLevelDecorations[v46].field_16_event_id == 0;
+            v48 = pLevelDecorations[v46].uEventID == 0;
           }
           else
           {