teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 17:01:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Parentheses around ternary conditions so CppCheck will stfu

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7036 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2018-10-07 05:23:00 +00:00
parent 008056763a
commit 2f410776ec
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
source/duke3d/src/gamevars.cpp
View file

@ -344,7 +344,7 @@ void Gv_ResetVars(void) /* this is called during a new game and nowhere else */
{
if (aGameVars[i].szLabel != NULL)
Gv_NewVar(aGameVars[i].szLabel,
aGameVars[i].flags & GAMEVAR_NODEFAULT ? aGameVars[i].global : aGameVars[i].defaultValue,
(aGameVars[i].flags & GAMEVAR_NODEFAULT) ? aGameVars[i].global : aGameVars[i].defaultValue,
aGameVars[i].flags);
}
@ -655,7 +655,7 @@ int __fastcall Gv_GetVar(int gameVar, int spriteNum, int playerNum)
case GAMEVAR_INT32PTR: returnValue = *(int32_t *)var.global; break;
case GAMEVAR_INT16PTR: returnValue = *(int16_t *)var.global; break;
case GAMEVAR_UINT8PTR: returnValue = *(char *)var.global; break;
case GAMEVAR_Q16PTR: returnValue = var.flags & GAMEVAR_SPECIAL ? *(int32_t *)var.global : fix16_to_int(*(fix16_t *)var.global); break;
case GAMEVAR_Q16PTR: returnValue = (var.flags & GAMEVAR_SPECIAL) ? *(int32_t *)var.global : fix16_to_int(*(fix16_t *)var.global); break;
default: EDUKE32_UNREACHABLE_SECTION(returnValue = 0; break);
}
@ -811,7 +811,7 @@ void __fastcall Gv_SetVar(int const gameVar, int const newValue, int const sprit
case GAMEVAR_INT32PTR: *((int32_t *)var.global) = (int32_t)newValue; break;
case GAMEVAR_INT16PTR: *((int16_t *)var.global) = (int16_t)newValue; break;
case GAMEVAR_UINT8PTR: *((uint8_t *)var.global) = (uint8_t)newValue; break;
case GAMEVAR_Q16PTR: *(fix16_t *)var.global = var.flags & GAMEVAR_SPECIAL ? (int32_t)newValue : fix16_from_int((int16_t)newValue);
case GAMEVAR_Q16PTR: *(fix16_t *)var.global = (var.flags & GAMEVAR_SPECIAL) ? (int32_t)newValue : fix16_from_int((int16_t)newValue);
break;
}
}
@ -824,7 +824,7 @@ badvarid:
badindex:
CON_ERRPRINTF("Gv_SetVar(): invalid index (%d) for gamevar %s from sprite %d, player %d\n",
var.flags & GAMEVAR_PERACTOR ? spriteNum : playerNum,
(var.flags & GAMEVAR_PERACTOR) ? spriteNum : playerNum,
var.szLabel,vm.spriteNum,vm.playerNum);
}
@ -1010,7 +1010,7 @@ int __fastcall Gv_GetVarX(int gameVar)
case GAMEVAR_INT32PTR: returnValue = (*(int32_t *)var.global); break;
case GAMEVAR_INT16PTR: returnValue = (*(int16_t *)var.global); break;
case GAMEVAR_UINT8PTR: returnValue = (*(uint8_t *)var.global); break;
case GAMEVAR_Q16PTR: returnValue = var.flags & GAMEVAR_SPECIAL ? *(int32_t *)var.global : fix16_to_int(*(fix16_t *)var.global); break;
case GAMEVAR_Q16PTR: returnValue = (var.flags & GAMEVAR_SPECIAL) ? *(int32_t *)var.global : fix16_to_int(*(fix16_t *)var.global); break;
}
}
@ -1065,7 +1065,7 @@ void __fastcall Gv_GetManyVars(int const numVars, int32_t * const outBuf)
case GAMEVAR_INT32PTR: value = *(int32_t *)var.global; break;
case GAMEVAR_INT16PTR: value = *(int16_t *)var.global; break;
case GAMEVAR_UINT8PTR: value = *(uint8_t *)var.global; break;
case GAMEVAR_Q16PTR: value = var.flags & GAMEVAR_SPECIAL ? *(int32_t *)var.global : fix16_to_int(*(fix16_t *)var.global); break;
case GAMEVAR_Q16PTR: value = (var.flags & GAMEVAR_SPECIAL) ? *(int32_t *)var.global : fix16_to_int(*(fix16_t *)var.global); break;
}
}
@ -1098,14 +1098,14 @@ void __fastcall Gv_SetVarX(int const gameVar, int const newValue)
case GAMEVAR_INT32PTR: *(int32_t *)var.global = (int32_t)newValue; break;
case GAMEVAR_INT16PTR: *(int16_t *)var.global = (int16_t)newValue; break;
case GAMEVAR_UINT8PTR: *(uint8_t *)var.global = (uint8_t)newValue; break;
case GAMEVAR_Q16PTR: *(fix16_t *)var.global = var.flags & GAMEVAR_SPECIAL ? (int32_t)newValue : fix16_from_int((int16_t)newValue); break;
case GAMEVAR_Q16PTR: *(fix16_t *)var.global = (var.flags & GAMEVAR_SPECIAL) ? (int32_t)newValue : fix16_from_int((int16_t)newValue); break;
}
return;
badindex:
CON_ERRPRINTF("Gv_SetVar(): invalid index (%d) for gamevar %s\n",
var.flags & GAMEVAR_PERACTOR ? vm.spriteNum : vm.playerNum,
(var.flags & GAMEVAR_PERACTOR) ? vm.spriteNum : vm.playerNum,
var.szLabel);
}