dhewm/dhewm3-sdk
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3-sdk.git synced 2025-04-06 01:21:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix or at least comment on some valid compiler warnings

Browse source 
(this target = NULL thing is less dangerous than it looks because it
 just always uses the else-case, but pretty misleading and possibly
 leads to bugs further down the function when target is used again)
This commit is contained in:
Daniel Gibson 2021-12-19 05:53:01 +01:00
parent c639df99d1
commit dcf3a3d392
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
game/Player.cpp
View file

@ -8320,8 +8320,8 @@ idPlayer::SetChargeMoveState
==============
*/
void idPlayer::SetChargeMoveState( void ) {
//const function_t *newstate = GetScriptFunction( "ChargeMoveF" );
const function_t *newstate;
//const function_t *newstate = GetScriptFunction( "ChargeMoveF" );
const function_t *newstate = NULL; // DG: make sure this is initialized, so if(newstate) check below works reliably
if (chargeDir == 1){
newstate = GetScriptFunction( "ChargeMoveU" );
}
@ -12319,4 +12319,4 @@ bool idPlayer::EvaluateKick( void ) {
return damaged;
}
//rev 2019 from rivensin end
//rev 2019 from rivensin end

2
game/Weapon.cpp
View file

@ -4140,6 +4140,8 @@ void idWeapon::Event_LaunchProjectiles( int num_projectiles, float spread, float
if(num_projectiles > 1){ //Example: spread = 90, num projs = 5
ang = 2*spread/(num_projectiles-1); //Spread step: 2* 90 /(5-1) = 45 degrees
ang = ang/180.0f; //normalized from 0 to 1: 45/180 = 0.5 --> % of 180 degrees to use: 0, 0.25, -0.25, 0.5, -0.5
} else { // DG: make sure ang is initialized, I hope doing the same as WP_FIREMODE_DEFAULT makes at least a bit sense
ang = idMath::Sin( spreadRad * gameLocal.random.RandomFloat() );
}
}
//ivan end

2
game/ai/AI.cpp
View file

@ -4668,7 +4668,7 @@ idProjectile *idAI::LaunchProjectile( const char *jointname, idEntity *target, b
*/
noAim = spawnArgs.GetInt( "noaim" );
if ( noAim > 0 ) {
if ( target = NULL ) {
if ( target = NULL ) { // FIXME: DG: this is not good
tmp = target->GetPhysics()->GetAbsBounds().GetCenter() - muzzle;
tmp.Normalize();
axis = tmp.ToMat3();

1
game/ai/AI_bot.cpp
View file

@ -1376,6 +1376,7 @@ idProjectile *idAI_Bot::LaunchProjectile( const char *jointname, idEntity *targe
noAim = spawnArgs.GetInt( "noaim" );
if ( noAim > 0 ) {
// FIXME: DG: the following line is not good
if ( target = NULL ) { //rev 202 reverted back to = NULL. != NULL broke noaim from working. i am sure this is the wrong way to do this. :p
tmp = target->GetPhysics()->GetAbsBounds().GetCenter() - muzzle;
tmp.Normalize();