From d34a6d7666a32c880636d79766e5f7e84123f8fa Mon Sep 17 00:00:00 2001
From: Kenix3 <kenixwhisperwind@gmail.com>
Date: Wed, 10 Aug 2022 22:55:38 -0400
Subject: [PATCH] Fixes error in LUS where there were multiple Vertex classes
 declared.

---
 libultraship/libultraship/Model.cpp | 6 +++---
 libultraship/libultraship/Model.h   | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libultraship/libultraship/Model.cpp b/libultraship/libultraship/Model.cpp
index 9e37de177..c59f38e8b 100644
--- a/libultraship/libultraship/Model.cpp
+++ b/libultraship/libultraship/Model.cpp
@@ -2,7 +2,7 @@
 
 namespace Ship
 {
-    Vertex::Vertex()
+    ModelVertex::ModelVertex()
     {
         pos = Vec3f(0, 0, 0);
         normal = Vec3f(0, 0, 0);
@@ -10,7 +10,7 @@ namespace Ship
         uv = Vec2f(0, 0);
     }
 
-    Vertex::Vertex(BinaryReader* reader)
+    ModelVertex::ModelVertex(BinaryReader* reader)
     {
         pos = reader->ReadVec3f();
         normal = reader->ReadVec3f();
@@ -36,7 +36,7 @@ namespace Ship
         uvCoords = reader->ReadUInt32();
         boneWeights = reader->ReadUInt32();
 
-        Vertex* vtxData = new Vertex[numVerts];
+        ModelVertex* vtxData = new ModelVertex[numVerts];
         uint32_t* indicesData = new uint32_t[numPolys];
 
         if (vertices != 0)
diff --git a/libultraship/libultraship/Model.h b/libultraship/libultraship/Model.h
index f66ca7b84..241a2932a 100644
--- a/libultraship/libultraship/Model.h
+++ b/libultraship/libultraship/Model.h
@@ -43,15 +43,15 @@ namespace Ship
         void ParseFileBinary(BinaryReader* reader, Resource* res) override;
     };
 
-    struct Vertex
+    struct ModelVertex
     {
         Vec3f pos;
         Vec3f normal;
         Color3b color;
         Vec2f uv;
 
-        Vertex();
-        Vertex(BinaryReader* reader);
+        ModelVertex();
+        ModelVertex(BinaryReader* reader);
     };
 
     class Model : public Resource
@@ -62,7 +62,7 @@ namespace Ship
         uint32_t numVerts;
         uint32_t numPolys;
 
-        Vertex* vertices;
+        ModelVertex* vertices;
         Vec2f* boneWeights;
         uint32_t* indices;
     };