- fixed: MD2 vertex indices were signed shorts but should be unsigned.

- fixed a few warnings from Visual C++ 2015.
This commit is contained in:
Christoph Oelckers 2015-05-07 11:36:31 +02:00
parent 9b331b1713
commit a59824cd88
5 changed files with 7 additions and 7 deletions

View file

@ -123,7 +123,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS( GME
if( MSVC ) if( MSVC )
# Eliminate unreferenced functions and data # Eliminate unreferenced functions and data
# Perform identical COMDAT folding # Perform identical COMDAT folding
set( REL_LINKER_FLAGS "/opt:ref /opt:icf /nodefaultlib:msvcrt /TSAWARE" ) set( REL_LINKER_FLAGS "/opt:ref /opt:icf /nodefaultlib:msvcrt /TSAWARE /LARGEADDRESSAWARE" )
# String pooling # String pooling
# Function-level linking # Function-level linking

View file

@ -50,8 +50,8 @@ protected:
struct FTriangle struct FTriangle
{ {
short vertexIndices[3]; unsigned short vertexIndices[3];
short textureIndices[3]; unsigned short textureIndices[3];
}; };

View file

@ -3277,8 +3277,8 @@ void D3DFB::FillSimplePoly(FTexture *texture, FVector2 *points, int npoints,
return; return;
} }
cosrot = cos(rot); cosrot = (float)cos(rot);
sinrot = sin(rot); sinrot = (float)sin(rot);
CheckQuadBatch(npoints - 2, npoints); CheckQuadBatch(npoints - 2, npoints);
quad = &QuadExtra[QuadBatchPos]; quad = &QuadExtra[QuadBatchPos];