mirror of
https://github.com/ptitSeb/Serious-Engine
synced 2024-11-22 10:20:26 +01:00
Fix ASSERT(<string_literal>)
That would never trigger the ASSERT. Now they always do. Conflicts: Sources/EntitiesMP/Summoner.es
This commit is contained in:
parent
0b24c2f06c
commit
fe23b05aa2
|
@ -83,7 +83,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
#define BREAKPOINT \
|
#define BREAKPOINT \
|
||||||
if (1) { \
|
if (1) { \
|
||||||
SAFEBREAKPOINT; \
|
SAFEBREAKPOINT; \
|
||||||
_assert("hard-coded breakpoint (CroTeam)",__FILE__,__LINE__); \
|
_assert(false && "hard-coded breakpoint (CroTeam)",__FILE__,__LINE__); \
|
||||||
} else NOTHING
|
} else NOTHING
|
||||||
|
|
||||||
/* CT DEBUG macro -- the expression is executed only in debug version */
|
/* CT DEBUG macro -- the expression is executed only in debug version */
|
||||||
|
|
|
@ -527,7 +527,7 @@ void Particles_ViewerLocal(CEntity *penView)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
ASSERT("Unknown environment particle type!");
|
ASSERT(false && "Unknown environment particle type!");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
// for those EPHs that are not rendered, clear possible
|
// for those EPHs that are not rendered, clear possible
|
||||||
|
|
|
@ -99,7 +99,7 @@ functions:
|
||||||
} else if (m_gtType==GT_COMMANDER) {
|
} else if (m_gtType==GT_COMMANDER) {
|
||||||
return &eiGruntSoldier;
|
return &eiGruntSoldier;
|
||||||
} else {
|
} else {
|
||||||
ASSERT("Unknown grunt type!");
|
ASSERT(false && "Unknown grunt type!");
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -280,7 +280,7 @@ functions:
|
||||||
} else if (m_gtType==GT_COMMANDER) {
|
} else if (m_gtType==GT_COMMANDER) {
|
||||||
return &eiGruntSoldier;
|
return &eiGruntSoldier;
|
||||||
} else {
|
} else {
|
||||||
ASSERT("Unknown grunt type!");
|
ASSERT(false && "Unknown grunt type!");
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -3442,7 +3442,7 @@ functions:
|
||||||
return (WeaponType)i;
|
return (WeaponType)i;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ASSERT("Non-existant weapon in remap array!");
|
ASSERT(false && "Non-existant weapon in remap array!");
|
||||||
return (WeaponType)0;
|
return (WeaponType)0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -618,7 +618,7 @@ functions:
|
||||||
pen = &m_penGroup03Template01;
|
pen = &m_penGroup03Template01;
|
||||||
iCount = IRnd()%m_iGroup03Count+1;
|
iCount = IRnd()%m_iGroup03Count+1;
|
||||||
} else {
|
} else {
|
||||||
ASSERT("Invalid group!");
|
ASSERT(false && "Invalid group!");
|
||||||
iCount = 0; // DG: this should have a deterministic value in case this happens after all!
|
iCount = 0; // DG: this should have a deterministic value in case this happens after all!
|
||||||
}
|
}
|
||||||
ASSERT(iCount>0);
|
ASSERT(iCount>0);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user