Skip to content

Commit 2c522d3

Browse files
committed
- fix compile/link for linux amd64
1 parent 9865bc0 commit 2c522d3

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

src_rebuild/Game/C/map.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ void PVSDecode(char *output, char *celldata, ushort sz, int havanaCorruptCellBod
503503

504504
// decode byte-swapped array
505505
for (i = 0; i < sz; i++)
506-
((ushort*)nybblearray)[i] = M_SHRT_2((unsigned char)celldata[i], (unsigned char)celldata[i] >> 4) & 0xf0f;
506+
((ushort*)nybblearray)[i] = M_SHRT_2((u_char)celldata[i], (u_char)celldata[i] >> 4) & 0xf0f;
507507

508508
pixelIndex = 0;
509509
symIndex = 0;
@@ -520,7 +520,7 @@ void PVSDecode(char *output, char *celldata, ushort sz, int havanaCorruptCellBod
520520
{
521521
symIndex = ni * 2;
522522
spod:
523-
sym = M_SHRT_2(PVSEncodeTable[symIndex], PVSEncodeTable[symIndex + 1]);
523+
sym = M_SHRT_2((u_char)PVSEncodeTable[symIndex], (u_char)PVSEncodeTable[symIndex + 1]);
524524
}
525525
else
526526
{

src_rebuild/Game/C/targets.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ void DrawStopZone(VECTOR *pPosition)
277277
{
278278
VECTOR* pVector;
279279
POLY_FT4* pPoly;
280-
long* pOut;
280+
int* pOut;
281281
SVECTOR temp;
282282
long p;
283283
long flag;
@@ -297,7 +297,7 @@ void DrawStopZone(VECTOR *pPosition)
297297
pVector = pStopZonePt;
298298

299299
pPoly = (POLY_FT4*)current->primptr;
300-
pOut = (long*)&pPoly->x0;
300+
pOut = (int*)&pPoly->x0;
301301

302302
gte_SetRotMatrix(&identity);
303303
gte_SetTransVector(&dummy);
@@ -326,12 +326,12 @@ void DrawStopZone(VECTOR *pPosition)
326326

327327
RotTransPers(&temp, pOut, &p, &flag);
328328

329-
if (pOut == (long*)&pPoly->x0)
330-
pOut = (long*)&pPoly->x1;
329+
if (pOut == (int*)&pPoly->x0)
330+
pOut = (int*)&pPoly->x1;
331331
else if (pOut == (long*)&pPoly->x1)
332-
pOut = (long*)&pPoly->x2;
332+
pOut = (int*)&pPoly->x2;
333333
else
334-
pOut = (long*)&pPoly->x3;
334+
pOut = (int*)&pPoly->x3;
335335

336336
pVector++;
337337
}

0 commit comments

Comments
 (0)