Mercurial > mm7

changeset 1502:ee5c98a437d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanup of LevelDecoration. (3)
author yoctozepto
date Sun, 01 Sep 2013 19:39:05 +0200
parents 5e601a07010d
children 4ce525fe9ea9 c76c0f6974bc
files Level/Decoration.cpp Level/Decoration.h
diffstat 2 files changed, 11 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/Level/Decoration.cpp	Sun Sep 01 17:41:00 2013 +0600
+++ b/Level/Decoration.cpp	Sun Sep 01 19:39:05 2013 +0200
@@ -1,8 +1,5 @@
-#include <assert.h>
-
 #include "Decoration.h"
 #include "../Party.h"
-#include "../mm7_data.h" // for _449B57_test_bit
 
 //----- (004583B0) --------------------------------------------------------
 LevelDecoration::LevelDecoration()
--- a/Level/Decoration.h	Sun Sep 01 17:41:00 2013 +0600
+++ b/Level/Decoration.h	Sun Sep 01 19:39:05 2013 +0200
@@ -1,10 +1,8 @@
 #pragma once
 
-#include <cstdint>
+#include "../mm7_data.h"
 
-#include "../VectorTypes.h"
-
-enum LEVEL_DECORATION_FLAGS
+enum LEVEL_DECORATION_FLAGS: uint16
 {
   LEVEL_DECORATION_TRIGGERED_BY_TOUCH = 0x01,
   LEVEL_DECORATION_TRIGGERED_BY_MONSTER = 0x02,
@@ -24,16 +22,15 @@
   bool IsInteractive();
   bool IsObeliskChestActive();
 
-
-  uint16_t uDecorationDescID;
-  uint16_t uFlags;
+  uint16 uDecorationDescID;
+  uint16 uFlags;
   Vec3_int_ vPosition;
-  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;
+  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;
 };
 #pragma pack(pop)