From d6567e606e6acb472f2b64f700834f8fc1ef41ff Mon Sep 17 00:00:00 2001
From: Marc-Antoine Lortie <marc-antoine.lortie@outlook.com>
Date: Fri, 31 Jan 2020 18:14:26 -0500
Subject: [PATCH] Fixed wrong changes applied during merge.

---
 code/MDL/HalfLife/HL1MDLLoader.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/MDL/HalfLife/HL1MDLLoader.cpp b/code/MDL/HalfLife/HL1MDLLoader.cpp
index 6d5f283af..c18528e59 100644
--- a/code/MDL/HalfLife/HL1MDLLoader.cpp
+++ b/code/MDL/HalfLife/HL1MDLLoader.cpp
@@ -345,8 +345,8 @@ void HL1MDLLoader::read_texture(const Texture_HL1 *ptexture,
         uint8_t *data, uint8_t *pal, aiTexture *pResult,
         aiColor3D &last_palette_color) {
     pResult->mFilename = ptexture->name;
-    pResult->mWidth = outwidth;
-    pResult->mHeight = outheight;
+    pResult->mWidth = static_cast<unsigned int>(ptexture->width);
+    pResult->mHeight = static_cast<unsigned int>(ptexture->height);
     pResult->achFormatHint[0] = 'r';
     pResult->achFormatHint[1] = 'g';
     pResult->achFormatHint[2] = 'b';