summaryrefslogtreecommitdiff
path: root/ZAP2/ZTexture.cpp
diff options
context:
space:
mode:
authorNicholas Estelami <NEstelami@users.noreply.github.com>2020-10-31 02:06:52 -0400
committerNicholas Estelami <NEstelami@users.noreply.github.com>2020-10-31 02:06:52 -0400
commitfe5ada6d325f2e120e078bc35f71b82e41026dcb (patch)
tree4183a59cd3bc3431923f523c27ee3ebde77076c6 /ZAP2/ZTexture.cpp
parent68c25a0b51e6797efcb6498a9300c493443d7b71 (diff)
Fixed several matching issues.
Diffstat (limited to 'ZAP2/ZTexture.cpp')
-rw-r--r--ZAP2/ZTexture.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/ZAP2/ZTexture.cpp b/ZAP2/ZTexture.cpp
index 84cc0f9..76946ea 100644
--- a/ZAP2/ZTexture.cpp
+++ b/ZAP2/ZTexture.cpp
@@ -409,7 +409,7 @@ void ZTexture::PrepareRawDataRGBA16(string rgbaPath)
uint8_t alphaBit = (bmpRgba[(((y * width) + x) * 4) + 3] != 0);
- short data = (short)((r << 11) + (g << 6) + (b << 1) + alphaBit);
+ uint16_t data = (uint16_t)((r << 11) + (g << 6) + (b << 1) + alphaBit);
rawData[pos + 0] = (uint8_t)((data & 0xFF00) >> 8);
rawData[pos + 1] = (uint8_t)((data & 0x00FF));