diff options
| author | /dev/humancontroller <devhc@example.com> | 2017-04-13 11:30:00 +0000 |
|---|---|---|
| committer | /dev/humancontroller <devhc@example.com> | 2017-04-15 17:24:16 +0200 |
| commit | 979776bf1d7319218d84dd488ed69a45a854dce1 (patch) | |
| tree | 8ff840394f86f0ab7e8c6a832cf0f023b6c5d351 | |
| parent | 997dca8b0297aa186931a84e9f9838b2867f7f1e (diff) | |
fix/silence a couple of compiler warnings
| -rw-r--r-- | src/cgame/cg_mem.c | 2 | ||||
| -rw-r--r-- | src/game/g_mem.c | 2 | ||||
| -rw-r--r-- | src/ui/ui_players.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/cgame/cg_mem.c b/src/cgame/cg_mem.c index 6cf5ddd..5e03d44 100644 --- a/src/cgame/cg_mem.c +++ b/src/cgame/cg_mem.c @@ -48,7 +48,7 @@ void *CG_Alloc( int size ) char *endptr; int *ptr; - allocsize = ( size + sizeof(int) + ROUNDBITS ) & ~ROUNDBITS; // Round to 32-byte boundary + allocsize = (int)( ( (size_t)size + (size_t)sizeof(int) + (size_t)ROUNDBITS ) & ~(size_t)ROUNDBITS ); // Round to 32-byte boundary ptr = NULL; smallest = NULL; diff --git a/src/game/g_mem.c b/src/game/g_mem.c index ea8e438..690e136 100644 --- a/src/game/g_mem.c +++ b/src/game/g_mem.c @@ -48,7 +48,7 @@ void *G_Alloc( int size ) char *endptr; int *ptr; - allocsize = ( size + sizeof(int) + ROUNDBITS ) & ~ROUNDBITS; // Round to 32-byte boundary + allocsize = (int)( ( (size_t)size + (size_t)sizeof(int) + (size_t)ROUNDBITS ) & ~(size_t)ROUNDBITS ); // Round to 32-byte boundary ptr = NULL; smallest = NULL; diff --git a/src/ui/ui_players.c b/src/ui/ui_players.c index 5dbfdd3..acf14b5 100644 --- a/src/ui/ui_players.c +++ b/src/ui/ui_players.c @@ -1194,7 +1194,7 @@ qboolean UI_RegisterClientModelname( playerInfo_t *pi, const char *modelSkinName } } - if (headModelName && headModelName[0] == '*' ) { + if (headModelName[0] == '*' ) { Com_sprintf( filename, sizeof( filename ), "models/players/heads/%s/%s.md3", &headModelName[1], &headModelName[1] ); } else { |