Skip to content

Commit

Permalink
misc: fixed some compiler warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
saukko28 authored and rmarquis committed May 13, 2019
1 parent 1fccfc3 commit 6becb8d
Show file tree
Hide file tree
Showing 8 changed files with 73 additions and 60 deletions.
20 changes: 15 additions & 5 deletions src/cgame/cg_draw_hud.c
Expand Up @@ -936,11 +936,21 @@ static void CG_DrawWeapRecharge(rectDef_t *rect)
// Draw power bar // Draw power bar
switch (cg.snap->ps.stats[STAT_PLAYER_CLASS]) switch (cg.snap->ps.stats[STAT_PLAYER_CLASS])
{ {
case PC_ENGINEER: chargeTime = cg.engineerChargeTime[cg.snap->ps.persistant[PERS_TEAM] - 1]; break; case PC_ENGINEER:
case PC_MEDIC: chargeTime = cg.medicChargeTime[cg.snap->ps.persistant[PERS_TEAM] - 1]; break; chargeTime = cg.engineerChargeTime[cg.snap->ps.persistant[PERS_TEAM] - 1];
case PC_FIELDOPS: chargeTime = cg.fieldopsChargeTime[cg.snap->ps.persistant[PERS_TEAM] - 1]; break; break;
case PC_COVERTOPS: chargeTime = cg.covertopsChargeTime[cg.snap->ps.persistant[PERS_TEAM] - 1]; break; case PC_MEDIC:
default: chargeTime = cg.soldierChargeTime[cg.snap->ps.persistant[PERS_TEAM] - 1]; break; chargeTime = cg.medicChargeTime[cg.snap->ps.persistant[PERS_TEAM] - 1];
break;
case PC_FIELDOPS:
chargeTime = cg.fieldopsChargeTime[cg.snap->ps.persistant[PERS_TEAM] - 1];
break;
case PC_COVERTOPS:
chargeTime = cg.covertopsChargeTime[cg.snap->ps.persistant[PERS_TEAM] - 1];
break;
default:
chargeTime = cg.soldierChargeTime[cg.snap->ps.persistant[PERS_TEAM] - 1];
break;
} }


// display colored charge bar if charge bar isn't full enough // display colored charge bar if charge bar isn't full enough
Expand Down
80 changes: 41 additions & 39 deletions src/cgame/cg_popupmessages.c
Expand Up @@ -342,46 +342,48 @@ pmListItem_t *CG_FindFreePMItem(void)
*/ */
static qboolean CG_CheckPMItemFilter(popupMessageType_t type) static qboolean CG_CheckPMItemFilter(popupMessageType_t type)
{ {
switch (type) { switch (type)
case PM_CONNECT: {
if (cg_popupFilter.integer & POPUP_FILTER_CONNECT) case PM_CONNECT:
{ if (cg_popupFilter.integer & POPUP_FILTER_CONNECT)
return qtrue; {
} return qtrue;
case PM_TEAM: }
if (cg_popupFilter.integer & POPUP_FILTER_TEAMJOIN) case PM_TEAM:
{ if (cg_popupFilter.integer & POPUP_FILTER_TEAMJOIN)
return qtrue; {
} return qtrue;
break; }
case PM_MESSAGE: break;
case PM_DYNAMITE: case PM_MESSAGE:
case PM_CONSTRUCTION: case PM_DYNAMITE:
case PM_MINES: case PM_CONSTRUCTION:
case PM_OBJECTIVE: case PM_MINES:
case PM_DESTRUCTION: case PM_OBJECTIVE:
if (cg_popupFilter.integer & POPUP_FILTER_MISSION) case PM_DESTRUCTION:
{ if (cg_popupFilter.integer & POPUP_FILTER_MISSION)
return qtrue; {
} return qtrue;
break; }
case PM_AMMOPICKUP: break;
case PM_HEALTHPICKUP: case PM_AMMOPICKUP:
case PM_WEAPONPICKUP: case PM_HEALTHPICKUP:
if (cg_popupFilter.integer & POPUP_FILTER_PICKUP) case PM_WEAPONPICKUP:
{ if (cg_popupFilter.integer & POPUP_FILTER_PICKUP)
return qtrue; {
} return qtrue;
break; }
case PM_DEATH: break;
if (cg_popupFilter.integer & POPUP_FILTER_DEATH) case PM_DEATH:
{ if (cg_popupFilter.integer & POPUP_FILTER_DEATH)
return qtrue; {
} return qtrue;
break; }
default: break;
break; default:
break;
} }
return qfalse;
} }


/** /**
Expand Down
2 changes: 1 addition & 1 deletion src/game/g_etbot_interface.cpp
Expand Up @@ -6340,7 +6340,7 @@ int Bot_Interface_Shutdown()


////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////


void Bot_Interface_ConsoleCommand() void Bot_Interface_ConsoleCommand(void)
{ {
enum { BuffSize=32 }; enum { BuffSize=32 };
char buffer[BuffSize] = {}; char buffer[BuffSize] = {};
Expand Down
2 changes: 1 addition & 1 deletion src/game/g_etbot_interface.h
Expand Up @@ -72,7 +72,7 @@ int Bot_Interface_Shutdown();


void Bot_Interface_Update(); void Bot_Interface_Update();


void Bot_Interface_ConsoleCommand(); void Bot_Interface_ConsoleCommand(void);


qboolean Bot_Util_AllowPush(int weaponId); qboolean Bot_Util_AllowPush(int weaponId);
qboolean Bot_Util_CheckForSuicide(gentity_t *ent); qboolean Bot_Util_CheckForSuicide(gentity_t *ent);
Expand Down
20 changes: 10 additions & 10 deletions src/game/g_svcmds.c
Expand Up @@ -860,7 +860,7 @@ void Svcmd_ResetMatch_f(qboolean fDoReset, qboolean fDoRestart)
/** /**
* @brief Svcmd_ResetMatch * @brief Svcmd_ResetMatch
*/ */
void Svcmd_ResetMatch() void Svcmd_ResetMatch(void)
{ {
Svcmd_ResetMatch_f(qtrue, qtrue); Svcmd_ResetMatch_f(qtrue, qtrue);
} }
Expand Down Expand Up @@ -915,15 +915,15 @@ void Svcmd_ShuffleTeamsXP_f(qboolean restart)
/** /**
* @brief Svcmd_ShuffleTeamsXP * @brief Svcmd_ShuffleTeamsXP
*/ */
void Svcmd_ShuffleTeamsXP() void Svcmd_ShuffleTeamsXP(void)
{ {
Svcmd_ShuffleTeamsXP_f(qtrue); Svcmd_ShuffleTeamsXP_f(qtrue);
} }


/** /**
* @brief Svcmd_ShuffleTeamsXPNoRestart * @brief Svcmd_ShuffleTeamsXPNoRestart
*/ */
void Svcmd_ShuffleTeamsXPNoRestart() void Svcmd_ShuffleTeamsXPNoRestart(void)
{ {
Svcmd_ShuffleTeamsXP_f(qfalse); Svcmd_ShuffleTeamsXP_f(qfalse);
} }
Expand Down Expand Up @@ -958,15 +958,15 @@ void Svcmd_ShuffleTeamsSR_f(qboolean restart)
/** /**
* @brief Svcmd_ShuffleTeamsSR * @brief Svcmd_ShuffleTeamsSR
*/ */
void Svcmd_ShuffleTeamsSR() void Svcmd_ShuffleTeamsSR(void)
{ {
Svcmd_ShuffleTeamsSR_f(qtrue); Svcmd_ShuffleTeamsSR_f(qtrue);
} }


/** /**
* @brief Svcmd_ShuffleTeamsSRPNoRestart * @brief Svcmd_ShuffleTeamsSRPNoRestart
*/ */
void Svcmd_ShuffleTeamsSRNoRestart() void Svcmd_ShuffleTeamsSRNoRestart(void)
{ {
Svcmd_ShuffleTeamsSR_f(qfalse); Svcmd_ShuffleTeamsSR_f(qfalse);
} }
Expand Down Expand Up @@ -1053,7 +1053,7 @@ extern int FindClientByName(const char *name);
* @brief Svcmd_RevivePlayer * @brief Svcmd_RevivePlayer
* @param[in] name * @param[in] name
*/ */
void Svcmd_RevivePlayer() void Svcmd_RevivePlayer(void)
{ {
int clientNum; int clientNum;
gentity_t *player; gentity_t *player;
Expand Down Expand Up @@ -2026,7 +2026,7 @@ void G_UpdateSvCvars(void)
/** /**
* @brief CC_cvarempty * @brief CC_cvarempty
*/ */
void CC_cvarempty() void CC_cvarempty(void)
{ {
Com_Memset(level.svCvars, 0, sizeof(level.svCvars)); Com_Memset(level.svCvars, 0, sizeof(level.svCvars));
level.svCvarsCount = 0; level.svCvarsCount = 0;
Expand Down Expand Up @@ -2464,7 +2464,7 @@ void Svcmd_CSInfo_f(void)
/** /**
* @brief Svcmd_Ref_f * @brief Svcmd_Ref_f
*/ */
void Svcmd_Ref_f() void Svcmd_Ref_f(void)
{ {
char cmd[MAX_TOKEN_CHARS]; char cmd[MAX_TOKEN_CHARS];


Expand All @@ -2486,7 +2486,7 @@ void Svcmd_Ref_f()
* *
* @todo FIXME this 'say' condition is never reached?! * @todo FIXME this 'say' condition is never reached?!
*/ */
void Svcmd_Say_f() void Svcmd_Say_f(void)
{ {
if (g_dedicated.integer) if (g_dedicated.integer)
{ {
Expand All @@ -2497,7 +2497,7 @@ void Svcmd_Say_f()
/** /**
* @brief Svcmd_Chat_f * @brief Svcmd_Chat_f
*/ */
void Svcmd_Chat_f() void Svcmd_Chat_f(void)
{ {
if (g_dedicated.integer) if (g_dedicated.integer)
{ {
Expand Down
1 change: 1 addition & 0 deletions src/qcommon/q_shared.h
Expand Up @@ -85,6 +85,7 @@


#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(disable : 4018) // signed/unsigned mismatch #pragma warning(disable : 4018) // signed/unsigned mismatch
#pragma warning(disable : 4068) // unknown pragma warning
#pragma warning(disable : 4244) // number conversion (possible loss of data) #pragma warning(disable : 4244) // number conversion (possible loss of data)
#pragma warning(disable : 4305) // truncation from const double to float #pragma warning(disable : 4305) // truncation from const double to float
#pragma warning(disable : 4711) // selected for automatic inline expansion #pragma warning(disable : 4711) // selected for automatic inline expansion
Expand Down
2 changes: 1 addition & 1 deletion src/sdl/sdl_input.c
Expand Up @@ -735,7 +735,7 @@ struct
/** /**
* @brief Prints joystick info to console * @brief Prints joystick info to console
*/ */
void IN_PrintJoystickInfo_f() void IN_PrintJoystickInfo_f(void)
{ {
if (!in_joystick->integer) if (!in_joystick->integer)
{ {
Expand Down
6 changes: 3 additions & 3 deletions src/tinygettext/po_parser.cpp
Expand Up @@ -372,9 +372,9 @@ POParser::parse()
// skip UTF-8 intro that some text editors produce // skip UTF-8 intro that some text editors produce
// see http://en.wikipedia.org/wiki/Byte-order_mark // see http://en.wikipedia.org/wiki/Byte-order_mark
if (current_line.size() >= 3 && if (current_line.size() >= 3 &&
current_line[0] == static_cast<char>(0xef) && current_line[0] == static_cast<unsigned char>(0xef) &&
current_line[1] == static_cast<char>(0xbb) && current_line[1] == static_cast<unsigned char>(0xbb) &&
current_line[2] == static_cast<char>(0xbf)) current_line[2] == static_cast<unsigned char>(0xbf))
{ {
current_line = current_line.substr(3); current_line = current_line.substr(3);
} }
Expand Down

0 comments on commit 6becb8d

Please sign in to comment.