diff --git a/Credits.cpp b/Credits.cpp index 9d31ec96..c5d854f3 100644 --- a/Credits.cpp +++ b/Credits.cpp @@ -793,7 +793,7 @@ BOOLEAN AddCreditNode( UINT32 uiType, UINT32 uiFlags, STR16 pString ) //if if( uiType == CRDT_NODE_NONE) { - //Assert( 0 ); + Assert( 0 ); return( TRUE ); } diff --git a/JA2.suo b/JA2.suo index 7260a739..c65887cf 100644 Binary files a/JA2.suo and b/JA2.suo differ diff --git a/JA2.vcproj b/JA2.vcproj index d6d643ed..c7f629e6 100644 --- a/JA2.vcproj +++ b/JA2.vcproj @@ -43,7 +43,7 @@ = 1 && sSectorX <= 16 ); - //Assert( sSectorY >= 1 && sSectorY <= 16 ); + Assert( sSectorX >= 1 && sSectorX <= 16 ); + Assert( sSectorY >= 1 && sSectorY <= 16 ); pSector = &SectorInfo[ SECTOR( sSectorX, sSectorY ) ]; ubNumTroops = (UINT8)(pSector->ubNumAdmins + pSector->ubNumTroops + pSector->ubNumElites); diff --git a/Strategic/Strategic Movement.cpp b/Strategic/Strategic Movement.cpp index 6997f545..49065614 100644 --- a/Strategic/Strategic Movement.cpp +++ b/Strategic/Strategic Movement.cpp @@ -3253,14 +3253,14 @@ BOOLEAN PlayersBetweenTheseSectors( INT16 sSource, INT16 sDest, INT32 *iCountEnt if( gpBattleGroup ) { - //Assert( gfPreBattleInterfaceActive ); + Assert( gfPreBattleInterfaceActive ); sBattleSector = (INT16)SECTOR( gpBattleGroup->ubSectorX, gpBattleGroup->ubSectorY ); } // debug only if ( gfDisplayPotentialRetreatPaths == TRUE ) { - //Assert( gfPreBattleInterfaceActive ); + Assert( gfPreBattleInterfaceActive ); } @@ -3771,7 +3771,7 @@ BOOLEAN LoadPlayerGroupList( HWFILE hFile, GROUP **pGroup ) sTempID = GetSoldierIDFromMercID( pTemp->ubProfileID ); //Should never happen - //Assert( sTempID != -1 ); + Assert( sTempID != -1 ); pTemp->ubID = (UINT8) sTempID; pTemp->pSoldier = &Menptr[ pTemp->ubID ]; diff --git a/Strategic/strategicmap.cpp b/Strategic/strategicmap.cpp index bbde02e2..d9021bb3 100644 --- a/Strategic/strategicmap.cpp +++ b/Strategic/strategicmap.cpp @@ -2660,7 +2660,7 @@ void JumpIntoAdjacentSector( UINT8 ubTacticalDirection, UINT8 ubJumpCode, INT16 pGroup = GetGroup( ubPrevGroupID ); Assert( pGroup ); Assert( pGroup->fPlayer ); - //Assert( pGroup->ubGroupSize ); + Assert( pGroup->ubGroupSize ); pPlayer = pGroup->pPlayerList; while( pPlayer ) { diff --git a/Tactical/ArmsDealerInvInit.cpp b/Tactical/ArmsDealerInvInit.cpp index 531e3804..16bd7c2e 100644 --- a/Tactical/ArmsDealerInvInit.cpp +++ b/Tactical/ArmsDealerInvInit.cpp @@ -1459,7 +1459,7 @@ UINT8 GetDealerItemCategoryNumber( UINT16 usItemIndex ) // WANNE: commented the assert out, because we always get the assertion in debug mode! // should never be trying to locate an item that's not covered in the table! - //Assert( FALSE ); + Assert( FALSE ); return( 0 ); } diff --git a/Tactical/Campaign.cpp b/Tactical/Campaign.cpp index d742d486..6f2150bd 100644 --- a/Tactical/Campaign.cpp +++ b/Tactical/Campaign.cpp @@ -65,8 +65,8 @@ void StatChange(SOLDIERTYPE *pSoldier, UINT8 ubStat, UINT16 usNumChances, UINT8 if (pSoldier == NULL || pSoldier->bActive == FALSE) return; // THIS SHOULD NEVER HAPPEN - //Assert(pSoldier != NULL); - //Assert(pSoldier->bActive); + Assert(pSoldier != NULL); + Assert(pSoldier->bActive); // ignore non-player soldiers if (!PTR_OURTEAM) diff --git a/Tactical/Inventory Choosing.cpp b/Tactical/Inventory Choosing.cpp index 9b7412ed..52a09ebe 100644 --- a/Tactical/Inventory Choosing.cpp +++ b/Tactical/Inventory Choosing.cpp @@ -2638,7 +2638,7 @@ UINT16 SelectStandardArmyGun( UINT8 uiGunLevel ) } - //Assert(usGunIndex); + Assert(usGunIndex); return(usGunIndex); }