TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Switch libmve to C++ casts

Browse source
This commit is contained in:
Kp 2016-09-04 00:02:52 +00:00
parent c5d154b6e0
commit ea153a60fa
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
d2x-rebirth/libmve/decoder16.cpp
View file

@ -25,14 +25,14 @@ static void dispatchDecoder16(unsigned short **pFrame, unsigned char codeType, c
void decodeFrame16(unsigned char *pFrame, const unsigned char *pMap, int mapRemain, const unsigned char *pData, int dataRemain)
{
unsigned short offset;
unsigned short *FramePtr = (unsigned short *)pFrame;
auto FramePtr = reinterpret_cast<uint16_t *>(pFrame);
int length;
int op;
int i, j;
int xb, yb;
backBuf1 = (unsigned short *)g_vBackBuf1;
backBuf2 = (unsigned short *)g_vBackBuf2;
backBuf1 = reinterpret_cast<uint16_t *>(g_vBackBuf1);
backBuf2 = reinterpret_cast<uint16_t *>(g_vBackBuf2);
xb = g_width >> 3;
yb = g_height >> 3;
@ -362,8 +362,8 @@ static void dispatchDecoder16(unsigned short **pFrame, unsigned char codeType, c
--*pDataRemain;
break;
case 0x5:
x = (char)*(*pData)++;
y = (char)*(*pData)++;
x = static_cast<char>(*(*pData)++);
y = static_cast<char>(*(*pData)++);
copyFrame(*pFrame, *pFrame + (backBuf2 - backBuf1) + x + y*g_width);
*pDataRemain -= 2;
break;

4
d2x-rebirth/libmve/decoder8.cpp
View file

@ -298,8 +298,8 @@ static void dispatchDecoder(unsigned char **pFrame, unsigned char codeType, cons
as a signed 8-bit value, and the second being the y offset as a
signed 8-bit value.
*/
x = (signed char)*(*pData)++;
y = (signed char)*(*pData)++;
x = static_cast<int8_t>(*(*pData)++);
y = static_cast<int8_t>(*(*pData)++);
copyFrame(*pFrame, *pFrame + (g_vBackBuf2 - g_vBackBuf1) + x + y*g_width);
*pFrame += 8;
*pDataRemain -= 2;