Mercurial > mm7

diff Level/Decoration.h @ 1512:af57b3b76fe4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clean and decouple. (1)
author yoctozepto
date Mon, 02 Sep 2013 15:23:09 +0200
parents ee5c98a437d9
children 4055b09160ae
line wrap: on
line diff
--- a/Level/Decoration.h	Mon Sep 02 17:39:31 2013 +0600
+++ b/Level/Decoration.h	Mon Sep 02 15:23:09 2013 +0200
@@ -1,8 +1,10 @@
 #pragma once
 
-#include "../mm7_data.h"
+#include <cstdint>
 
-enum LEVEL_DECORATION_FLAGS: uint16
+#include "../VectorTypes.h"
+
+enum LEVEL_DECORATION_FLAGS: uint16_t
 {
   LEVEL_DECORATION_TRIGGERED_BY_TOUCH = 0x01,
   LEVEL_DECORATION_TRIGGERED_BY_MONSTER = 0x02,
@@ -22,15 +24,15 @@
   bool IsInteractive();
   bool IsObeliskChestActive();
 
-  uint16 uDecorationDescID;
-  uint16 uFlags;
+  uint16_t uDecorationDescID;
+  uint16_t uFlags;
   Vec3_int_ vPosition;
-  int32 field_10_y_rot;
-  uint16 uCog;
-  int16 field_16_event_id;
-  int16 field_18;
-  int16 field_1A;
-  int16 _idx_in_stru123;
-  int16 field_1E;
+  int32_t field_10_y_rot;
+  uint16_t uCog;
+  int16_t field_16_event_id;
+  int16_t field_18;
+  int16_t field_1A;
+  int16_t _idx_in_stru123;
+  int16_t field_1E;
 };
 #pragma pack(pop)