diff options
| author | /dev/humancontroller <devhc@example.com> | 2015-02-14 01:41:26 +0100 |
|---|---|---|
| committer | /dev/humancontroller <devhc@example.com> | 2017-02-07 17:34:58 +0100 |
| commit | 5b7d7124f8702f55d2c0594d5e9c12c2c80dab1d (patch) | |
| tree | 5bce3ccee0125a4b2e5dce3faa842d7c8153a85a | |
| parent | 67b417c41984ad49d1c13f31832eaa5fa825bd3b (diff) | |
silence some MSVC warnings
| -rw-r--r-- | src/cgame/cg_draw.c | 10 | ||||
| -rw-r--r-- | src/qcommon/q_math.c | 16 | ||||
| -rw-r--r-- | src/renderergl1/tr_backend.c | 2 |
3 files changed, 14 insertions, 14 deletions
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c index 9528fed7..ee604e76 100644 --- a/src/cgame/cg_draw.c +++ b/src/cgame/cg_draw.c @@ -683,15 +683,15 @@ static void CG_DrawPlayerAmmoValue( rectDef_t *rect, vec4_t color ) len = strlen( text ); if( len <= 4 ) - scale = 0.50; + scale = 0.50f; else if( len <= 6 ) - scale = 0.43; + scale = 0.43f; else if( len == 7 ) - scale = 0.36; + scale = 0.36f; else if( len == 8 ) - scale = 0.33; + scale = 0.33f; else - scale = 0.31; + scale = 0.31f; CG_AlignText( rect, text, scale, 0.0f, 0.0f, ALIGN_RIGHT, VALIGN_CENTER, &tx, &ty ); UI_Text_Paint( tx + 1, ty, scale, color, text, 0, 0, ITEM_TEXTSTYLE_NORMAL ); diff --git a/src/qcommon/q_math.c b/src/qcommon/q_math.c index f6e215b9..c34eff26 100644 --- a/src/qcommon/q_math.c +++ b/src/qcommon/q_math.c @@ -50,14 +50,14 @@ vec4_t colorDkGrey = {0.25, 0.25, 0.25, 1}; vec4_t g_color_table[8] = { - {0.2, 0.2, 0.2, 1.0}, - {1.0, 0.0, 0.0, 1.0}, - {0.0, 1.0, 0.0, 1.0}, - {1.0, 1.0, 0.0, 1.0}, - {0.0, 0.0, 1.0, 1.0}, - {0.0, 1.0, 1.0, 1.0}, - {1.0, 0.0, 1.0, 1.0}, - {1.0, 1.0, 1.0, 1.0}, + {0.2f, 0.2f, 0.2f, 1.0f}, + {1.0f, 0.0f, 0.0f, 1.0f}, + {0.0f, 1.0f, 0.0f, 1.0f}, + {1.0f, 1.0f, 0.0f, 1.0f}, + {0.0f, 0.0f, 1.0f, 1.0f}, + {0.0f, 1.0f, 1.0f, 1.0f}, + {1.0f, 0.0f, 1.0f, 1.0f}, + {1.0f, 1.0f, 1.0f, 1.0f}, }; diff --git a/src/renderergl1/tr_backend.c b/src/renderergl1/tr_backend.c index 7cd455e8..a547fbb3 100644 --- a/src/renderergl1/tr_backend.c +++ b/src/renderergl1/tr_backend.c @@ -668,7 +668,7 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) { } if (r_drawSun->integer) { - RB_DrawSun(0.1, tr.sunShader); + RB_DrawSun(0.1f, tr.sunShader); } // darken down any stencil shadows |