q3aql/Serious-Engine
q3aql/Serious-Engine
1
0
Fork 0
mirror of https://github.com/ptitSeb/Serious-Engine synced 2024-11-22 02:20:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use ASSERTALWAYS(msg) instead of ASSERT(false && msg)

Browse Source 
Thanks @SLAwww

(The first parameter to _assert is actually the message, not the
expression to evaluate, so "false &&" doesn't belong in there.)

Conflicts:
	Sources/EntitiesMP/Summoner.es
This commit is contained in:
Emil Laine 2016-04-23 23:32:03 +03:00 committed by Daniel Gibson
parent fe23b05aa2
commit 24d61d1ccc
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Engine/Base/Assert.h
View File

@ -83,7 +83,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#define BREAKPOINT \
if (1) { \
SAFEBREAKPOINT; \
_assert(false && "hard-coded breakpoint (CroTeam)",__FILE__,__LINE__); \
_assert("hard-coded breakpoint (CroTeam)",__FILE__,__LINE__); \
} else NOTHING
/* CT DEBUG macro -- the expression is executed only in debug version */

2
Sources/EntitiesMP/Common/Particles.cpp
View File

@ -527,7 +527,7 @@ void Particles_ViewerLocal(CEntity *penView)
break;
default:
ASSERT(false && "Unknown environment particle type!");
ASSERTALWAYS("Unknown environment particle type!");
break;
}
// for those EPHs that are not rendered, clear possible

2
Sources/EntitiesMP/Grunt.es
View File

@ -99,7 +99,7 @@ functions:
} else if (m_gtType==GT_COMMANDER) {
return &eiGruntSoldier;
} else {
ASSERT(false && "Unknown grunt type!");
ASSERTALWAYS("Unknown grunt type!");
return NULL;
}
};

2
Sources/EntitiesMP/GruntSka.es
View File

@ -280,7 +280,7 @@ functions:
} else if (m_gtType==GT_COMMANDER) {
return &eiGruntSoldier;
} else {
ASSERT(false && "Unknown grunt type!");
ASSERTALWAYS("Unknown grunt type!");
return NULL;
}
};

2
Sources/EntitiesMP/PlayerWeapons.es
View File

@ -3442,7 +3442,7 @@ functions:
return (WeaponType)i;
}
}
ASSERT(false && "Non-existant weapon in remap array!");
ASSERTALWAYS("Non-existant weapon in remap array!");
return (WeaponType)0;
}

2
Sources/EntitiesMP/Summoner.es
View File

@ -618,7 +618,7 @@ functions:
pen = &m_penGroup03Template01;
iCount = IRnd()%m_iGroup03Count+1;
} else {
ASSERT(false && "Invalid group!");
ASSERTALWAYS("Invalid group!");
iCount = 0; // DG: this should have a deterministic value in case this happens after all!
}
ASSERT(iCount>0);