mm7: Player.cpp comparison

comparison Player.cpp @ 1554:e303d8a9bcdc

Merge

author	Grumpy7
date	Sat, 07 Sep 2013 21:14:48 +0200
parents	b98812ead5d9 c4ab816fcc5e
children	9c4cf5b07e98

comparison

equal deleted inserted replaced

-:b98812ead5d9
+:e303d8a9bcdc
 #ifdef _MSC_VER
 #define _CRT_SECURE_NO_WARNINGS
 #endif
-#include <assert.h>
 #include "stru6.h"
 #include "Player.h"
 #include "PlayerFrameTable.h"
 #include "AudioPlayer.h"
 #include "Party.h"
 //----- (004B8142) --------------------------------------------------------
 int Player::GetBuyingPrice(unsigned int uRealValue, float price_multiplier)
 {
 uint price = (uint)(((100 - GetMerchant()) * (uRealValue * price_multiplier)) / 100);
-assert (price > 0);
+Assert (price > 0);
 if (price < uRealValue)
 price = uRealValue;
 return price;
 }
 return(_449B57_test_bit((unsigned __int8 *)this->_achieved_awards_bits, 77));
 case 0x23u:
 return(_449B57_test_bit((unsigned __int8 *)this->_achieved_awards_bits, 79));
 break;
 default:
-assert("Should not be able to get here" && false);
+Error("Should not be able to get here (%u)", uClass);
 break;
 }
 return false;
 }
 }
 if ( !areWeLoadingTexture )
 {
 texture->Release();
 pIcons_LOD->SyncLoadedFilesCount();
 }
-if ( slotHeight == 0 || slotWidth == 0)
-{
+assert("Items should have nonzero dimensions");
-assert("Items should have nonzero dimensions" && false);
-return 1;
-}
 if ( (slotWidth + uSlot % INVETORYSLOTSWIDTH) <= INVETORYSLOTSWIDTH && (slotHeight + uSlot / INVETORYSLOTSWIDTH) <= INVETORYSLOTSHEIGHT )
 {
 for (unsigned int x = 0; x < slotWidth; x++)
 {
 for (unsigned int y = 0; y < slotHeight; y++)
 return 5;
 if ( !(equipType == EQUIP_REAGENT || equipType == EQUIP_POTION || equipType == EQUIP_MESSAGE_SCROLL))
 return 4;
 break;
 default:
-assert(false);
+Error("(%u)", building_type);
 break;
 }
 if (pItem->Stolen())
 return 6;
 break;
 case 5:
 price = this->GetPriceRepair(itemValue, multiplier);
 break;
 default:
-assert(false);
+Assert("(%u)", ShopMenuType);
 break;
 }
 if ( merchantLevel )
 {
 if (price == itemValue)
 armour_recovery_multipliers[2] = 0.5f;
 armour_recovery_multipliers[3] = 0;
 }
 else
 {
-assert(false && "Unknown armour type"); // what kind of armour is that?
+Error("Unknown armour type"); // what kind of armour is that?
 armour_recovery_multipliers[0] = 1.0f;
 armour_recovery_multipliers[1] = 1.0f;
 armour_recovery_multipliers[2] = 1.0f;
 armour_recovery_multipliers[3] = 1.0f;
 }
 }
 //----- (0048E96A) --------------------------------------------------------
 void Player::SetRecoveryTime(signed int rec)
 {
-assert(rec >= 0);
+Assert(rec >= 0);
 if (rec > uTimeToRecovery)
 uTimeToRecovery = rec;
 if (pPlayers[uActiveCharacter] == this && !some_active_character)
 case 1: return mult1;
 case 2: return mult2;
 case 3: return mult3;
 case 4: return mult4;
 }
-assert(false);
+Error("(%u)", masteryLvl);
 return 0;
 }
 //----- (00490109) --------------------------------------------------------
 // faces are:  0  1  2  3   human males
 //             4  5  6  7   human females
 case 0x13u:
 case 0x15u:
 case 0x18u:
 return SEX_FEMALE;
 }
-assert(false);
+Error("(%u)", this->uVoiceID);
 return SEX_MALE;
 }
 //----- (00490188) --------------------------------------------------------
 void Player::SetInitialStats()
 statToChange = &this->uSpeed;
 break;
 case 6:
 statToChange = &this->uLuck;
 default:
-assert(false);
+Error("(%u)", eAttribute);
-return;
-break;
 }
 if ( *statToChange < baseValue )
 {
 tmp = baseStep;
 baseStep = droppedStep;
 {
 currPlayerId = i - 1;
 break;
 }
 }
-assert(currPlayerId != -1);
+Assert(currPlayerId != -1);
 if ( var_type > VAR_AutoNotes )
 {
 if ( var_type <= VAR_GoldInBank )
 {
 if ( var_type == VAR_GoldInBank )
 break;
 case VAR_DarkResistanceBonus:
 this->sResDarkBonus = (unsigned __int8)var_value;
 break;
 case VAR_PhysicalResistanceBonus:
-assert("VAR_PhysicalResistanceBonus variable unsupported" && false);
+Assert("VAR_PhysicalResistanceBonus variable unsupported" && false);
 return;
 break;
 case VAR_MagicResistanceBonus:
 this->sResMagicBonus = (unsigned __int8)var_value;
 break;
 default:
-assert("Unexpected var_type" && false);
+Assert("Unexpected var_type: %u", var_type);
 return;
 break;
 }
 goto LABEL_111;
 }
 case 313:
 		  result = (bool)pValue;
 pParty->uNumArenaLordWins -= (char)pValue;
 break;
 }
-assert(false && "Function not returning any value!");
+Error("Function not returning any value! (%u)", VarNum);
 }
 else
 {
 if ( (signed int)VarNum >= 123 )
 {
 //if ( !a1 )
 //{
 //pPlayers = &::pPlayers[1];
 //v5 = 604;
 //while ( 1 )
-assert ( a1 > 0 && a1 < 5 );
+Assert ( a1 > 0 && a1 < 5 );
 for ( uint i = 1; i < 5; ++i )
 {
 //item_flag = Player_has_item(604, *pPlayers, 0);
 if ( !Player_has_item(604, ::pPlayers[i], 0) )
 return false;

Mercurial > mm7

comparison Player.cpp @ 1554:e303d8a9bcdc