summaryrefslogtreecommitdiff
path: root/ZAPD/ZCollision.h
diff options
context:
space:
mode:
authorlouist103 <35883445+louist103@users.noreply.github.com>2022-06-02 13:20:36 -0400
committerGitHub <noreply@github.com>2022-06-02 13:20:36 -0400
commitf54f2fa96bfc476a15fcc3ebcd6124bc19164fcd (patch)
tree1f3eff4a540daef6a8679ba2b78c4580185d73dd /ZAPD/ZCollision.h
parent87cb648b4311d20673452111edaf4d38a5290c28 (diff)
Extract palette data from external file (#249)
* WIP * Done * Fix * Fixes * More fixes * Fixes for backgrounds. * Roman's fixes and format. * Update docs and use tinyxml function for validation. * Update docs/zapd_extraction_xml_reference.md Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * move tlut texture data to stack variable Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Diffstat (limited to 'ZAPD/ZCollision.h')
-rw-r--r--ZAPD/ZCollision.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/ZAPD/ZCollision.h b/ZAPD/ZCollision.h
index 7481a85..6a49484 100644
--- a/ZAPD/ZCollision.h
+++ b/ZAPD/ZCollision.h
@@ -1,10 +1,10 @@
#pragma once
+#include "ZCollisionPoly.h"
#include "ZFile.h"
#include "ZResource.h"
#include "ZRoom/ZRoom.h"
#include "ZVector.h"
-#include "ZCollisionPoly.h"
#if 0
class PolygonEntry