summaryrefslogtreecommitdiff
path: root/ZAPD/ZCollision.h
diff options
context:
space:
mode:
authorlouist103 <louist103@gmail.com>2022-08-04 16:58:10 -0400
committerlouist103 <louist103@gmail.com>2022-08-04 16:58:10 -0400
commit338b79d1c4a4e8d13d9924865f8d4ed72af11fdd (patch)
treeb7363abfd2760c83be7d787914cc6bfebc466a21 /ZAPD/ZCollision.h
parent27a8620dc7b72395dbb64907da11c4050077a10d (diff)
Surface types
Diffstat (limited to 'ZAPD/ZCollision.h')
-rw-r--r--ZAPD/ZCollision.h15
1 files changed, 2 insertions, 13 deletions
diff --git a/ZAPD/ZCollision.h b/ZAPD/ZCollision.h
index 6a49484..35c6321 100644
--- a/ZAPD/ZCollision.h
+++ b/ZAPD/ZCollision.h
@@ -4,20 +4,9 @@
#include "ZFile.h"
#include "ZResource.h"
#include "ZRoom/ZRoom.h"
+#include "ZSurfaceType.h"
#include "ZVector.h"
-#if 0
-class PolygonEntry
-{
-public:
- uint16_t type;
- uint16_t vtxA, vtxB, vtxC;
- uint16_t a, b, c, d;
-
- PolygonEntry(const std::vector<uint8_t>& rawData, uint32_t rawDataIndex);
-};
-#endif
-
class WaterBoxHeader
{
public:
@@ -82,7 +71,7 @@ public:
std::vector<ZVector> vertices;
std::vector<ZCollisionPoly> polygons;
- std::vector<uint64_t> polygonTypes;
+ std::vector<ZSurfaceType> polygonTypes;
std::vector<WaterBoxHeader> waterBoxes;
CameraDataList* camData = nullptr;