Throw out my dirty preprocessor abuse to prevent duplication of a few characters in favour of code reability (apparently for MSVC as well)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4634 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2008-04-15 18:32:51 +00:00
parent 983e48834c
commit d854beb5d5
1 changed files with 12 additions and 12 deletions

View File

@ -231,11 +231,11 @@ BOOL droidCheckReferences(DROID *psVictimDroid)
{
if ((DROID *)psStruct->psTarget[i] == psVictimDroid)
{
ASSERT(!"Illegal reference to droid", "Illegal reference to droid"
#ifdef DEBUG
" from %s line %d", psStruct->targetFunc[i], psStruct->targetLine[i]);
#ifdef NDEBUG
debug(LOG_ERROR, "droidCheckReferences: Illegal reference to droid");
#else
);
ASSERT(!"Illegal reference to droid", "Illegal reference to droid from %s line %d",
psStruct->targetFunc[i], psStruct->targetLine[i]);
#endif
return false;
}
@ -245,11 +245,11 @@ BOOL droidCheckReferences(DROID *psVictimDroid)
{
if ((DROID *)psDroid->psTarget == psVictimDroid && psVictimDroid != psDroid)
{
ASSERT(!"Illegal reference to droid", "Illegal reference to droid"
#ifdef DEBUG
" from %s line %d", psDroid->targetFunc, psDroid->targetLine);
#ifdef NDEBUG
debug(LOG_ERROR, "droidCheckReferences: Illegal reference to droid");
#else
);
ASSERT(!"Illegal reference to droid", "Illegal reference to droid from %s line %d",
psDroid->targetFunc, psDroid->targetLine);
#endif
return false;
}
@ -257,11 +257,11 @@ BOOL droidCheckReferences(DROID *psVictimDroid)
{
if ((DROID *)psDroid->psActionTarget[i] == psVictimDroid && psVictimDroid != psDroid)
{
ASSERT(!"Illegal reference to droid", "Illegal action reference to droid"
#ifdef DEBUG
" from %s line %d", psDroid->actionTargetFunc[i], psDroid->actionTargetLine[i]);
#ifdef NDEBUG
debug(LOG_ERROR, "droidCheckReferences: Illegal action reference to droid");
#else
);
ASSERT(!"Illegal reference to droid", "Illegal action reference to droid from %s line %d",
psDroid->actionTargetFunc[i], psDroid->actionTargetLine[i]);
#endif
return false;
}