mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 13:37:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[8571] Avoid use ^ bitmask operation for bool values compare in general.

Browse source 
Also drop HandleSet32Bit logn unused and wrong coded chat command code.
This commit is contained in:
VladimirMangos 2009-09-30 19:30:18 +04:00
parent b2e32f4ff9
commit 47bf1dbce6
10 changed files with 10 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sql/mangos.sql
View file

@ -3016,8 +3016,6 @@ INSERT INTO `mangos_string` VALUES
(570,'The uint32 value of %u in %u is: %u',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(571,'Get %u float Value:[OPCODE]:%u [VALUE]:%f',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(572,'The float of %u value in %u is: %f',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(573,'.Set32Bit:[OPCODE]:%u [VALUE]:%u',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(574,'You set Bit of Field:%u to Value: %u',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(575,'.Mod32Value:[OPCODE]:%u [VALUE]:%i',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(576,'You modified the value of Field:%u to Value: %u',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(577,'You are now invisible.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),

1
sql/updates/9999_01_mangos_mangos_string.sql Normal file
View file

@ -0,0 +1 @@
DELETE FROM mangos_string WHERE entry IN(573,574);

1
src/game/Chat.h
View file

@ -491,7 +491,6 @@ class ChatHandler
bool HandleWaterwalkCommand(const char* args);
//! Development Commands
bool HandleSet32Bit(const char* args);
bool HandleSaveAllCommand(const char* args);
Player* getSelectedPlayer();

2
src/game/ItemHandler.cpp
View file

@ -1299,7 +1299,7 @@ void WorldSession::HandleSocketOpcode(WorldPacket& recv_data)
_player->ApplyEnchantment(itemTarget,EnchantmentSlot(enchant_slot),true);
bool SocketBonusToBeActivated = itemTarget->GemsFitSockets();//current socketbonus state
if(SocketBonusActivated ^ SocketBonusToBeActivated) //if there was a change...
if(SocketBonusActivated != SocketBonusToBeActivated) //if there was a change...
{
_player->ApplyEnchantment(itemTarget,BONUS_ENCHANTMENT_SLOT,false);
itemTarget->SetEnchantment(BONUS_ENCHANTMENT_SLOT, (SocketBonusToBeActivated ? itemTarget->GetProto()->socketBonus : 0), 0, 0);

4
src/game/Language.h
View file

@ -533,8 +533,8 @@ enum MangosStrings
LANG_GET_UINT_FIELD = 570,
LANG_GET_FLOAT = 571, //log
LANG_GET_FLOAT_FIELD = 572,
LANG_SET_32BIT = 573, //log
LANG_SET_32BIT_FIELD = 574,
// 573, //not used
// 574, //not used
LANG_CHANGE_32BIT = 575, //log
LANG_CHANGE_32BIT_FIELD = 576,

25
src/game/Level3.cpp
View file

@ -70,7 +70,6 @@ bool ChatHandler::HandleReloadAllCommand(const char*)
HandleReloadReservedNameCommand("");
HandleReloadMangosStringCommand("");
HandleReloadGameTeleCommand("");
HandleReloadBattleEventCommand("");
return true;
}
@ -4144,30 +4143,6 @@ bool ChatHandler::HandleChangeWeather(const char* args)
return true;
}
bool ChatHandler::HandleSet32Bit(const char* args)
{
if(!*args)
return false;
char* px = strtok((char*)args, " ");
char* py = strtok(NULL, " ");
if (!px || !py)
return false;
uint32 Opcode = (uint32)atoi(px);
uint32 Value = (uint32)atoi(py);
if (Value > 32) //uint32 = 32 bits
return false;
sLog.outDebug(GetMangosString(LANG_SET_32BIT), Opcode, Value);
m_session->GetPlayer( )->SetUInt32Value( Opcode , 2^Value );
PSendSysMessage(LANG_SET_32BIT_FIELD, Opcode,1);
return true;
}
bool ChatHandler::HandleTeleAddCommand(const char * args)
{
if(!*args)

2
src/game/Player.cpp
View file

@ -17734,7 +17734,7 @@ void Player::CorrectMetaGemEnchants(uint8 exceptslot, bool apply)
//was enchant active with/without item?
bool wasactive = EnchantmentFitsRequirements(condition, apply ? exceptslot : -1);
//should it now be?
if(wasactive ^ EnchantmentFitsRequirements(condition, apply ? -1 : exceptslot))
if(wasactive != EnchantmentFitsRequirements(condition, apply ? -1 : exceptslot))
{
// ignore item gem conditions
//if state changed, (dis)apply enchant

2
src/game/SpellAuras.cpp
View file

@ -6259,7 +6259,7 @@ void Aura::HandleSchoolAbsorb(bool apply, bool Real)
void Aura::PeriodicTick()
{
if (!m_target->isAlive() ^ IsDeathOnlySpell(GetSpellProto()))
if (!m_target->isAlive() != IsDeathOnlySpell(GetSpellProto()))
return;
switch(m_modifier.m_auraname)

4
src/game/Unit.cpp
View file

@ -4069,7 +4069,7 @@ void Unit::RemoveArenaAuras(bool onleave)
if ( !(iter->second->GetSpellProto()->AttributesEx4 & (1<<21)) // don't remove stances, shadowform, pally/hunter auras
&& !iter->second->IsPassive() // don't remove passive auras
&& (!(iter->second->GetSpellProto()->Attributes & SPELL_ATTR_UNAFFECTED_BY_INVULNERABILITY) || !(iter->second->GetSpellProto()->Attributes & SPELL_ATTR_UNK8)) // not unaffected by invulnerability auras or not having that unknown flag (that seemed the most probable)
&& (iter->second->IsPositive() ^ onleave)) // remove positive buffs on enter, negative buffs on leave
&& (iter->second->IsPositive() != onleave)) // remove positive buffs on enter, negative buffs on leave
RemoveAura(iter);
else
++iter;
@ -9398,7 +9398,7 @@ bool Unit::isTargetableForAttack(bool inverseAlive /*=false*/) const
if (HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE))
return false;
if (!(isAlive() ^ inverseAlive))
if (!(isAlive() != inverseAlive))
return false;
return IsInWorld() && !hasUnitState(UNIT_STAT_DIED)&& !isInFlight() /*&& !isStealth()*/;

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "8570"
#define REVISION_NR "8571"
#endif // __REVISION_NR_H__