diff options
| -rw-r--r-- | NorthstarDLL/core/math/vector.h | 7 | ||||
| -rw-r--r-- | NorthstarDLL/scripts/scriptdatatables.cpp | 4 |
2 files changed, 2 insertions, 9 deletions
diff --git a/NorthstarDLL/core/math/vector.h b/NorthstarDLL/core/math/vector.h index 112fabdf..8684908f 100644 --- a/NorthstarDLL/core/math/vector.h +++ b/NorthstarDLL/core/math/vector.h @@ -13,13 +13,6 @@ union Vector3 float raw[3]; - Vector3() : x(0), y(0), z(0) {} - Vector3(float x, float y, float z) : x(x), y(y), z(z) {} - Vector3(float* pRawFloats) // assumes float[3] => vector - { - memcpy(raw, pRawFloats, sizeof(this)); - } - void MakeValid() { for (auto& fl : raw) diff --git a/NorthstarDLL/scripts/scriptdatatables.cpp b/NorthstarDLL/scripts/scriptdatatables.cpp index 8aa52fdb..532624f3 100644 --- a/NorthstarDLL/scripts/scriptdatatables.cpp +++ b/NorthstarDLL/scripts/scriptdatatables.cpp @@ -765,8 +765,8 @@ std::string DataTableToString(Datatable* datatable) case DatatableType::VECTOR: { - Vector3 pVector((float*)pUntypedVal); - sCSVString += fmt::format("<{},{},{}>", pVector.x, pVector.y, pVector.z); + Vector3* pVector = (Vector3*)(pUntypedVal); + sCSVString += fmt::format("<{},{},{}>", pVector->x, pVector->y, pVector->z); break; } |