From 1e7386c638b819065791f85e09976697a39cc868 Mon Sep 17 00:00:00 2001 From: megamage Date: Tue, 1 Sep 2009 17:21:22 -0500 Subject: [8442] Change some unit flag names. Author: NoFantasy --HG-- branch : trunk --- src/game/Unit.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/game/Unit.cpp') diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index cfe4fc26efa..e46f9ed9b55 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -10616,7 +10616,7 @@ bool Unit::isAttackableByAOE() const return false; if(HasFlag(UNIT_FIELD_FLAGS, - UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NOT_ATTACKABLE_2)) + UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE)) return false; if(GetTypeId()==TYPEID_PLAYER && ((Player *)this)->isGameMaster()) @@ -14057,14 +14057,14 @@ bool Unit::SetCharmedBy(Unit* charmer, CharmType type) switch(type) { case CHARM_TYPE_VEHICLE: - SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_24); + SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PLAYER_CONTROLLED); ((Player*)charmer)->SetClientControl(this, 1); ((Player*)charmer)->SetViewpoint(this, true); ((Player*)charmer)->VehicleSpellInitialize(); break; case CHARM_TYPE_POSSESS: addUnitState(UNIT_STAT_POSSESSED); - SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_24); + SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PLAYER_CONTROLLED); charmer->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE); ((Player*)charmer)->SetClientControl(this, 1); ((Player*)charmer)->SetViewpoint(this, true); @@ -14130,7 +14130,7 @@ void Unit::RemoveCharmedBy(Unit *charmer) if(type == CHARM_TYPE_POSSESS) { clearUnitState(UNIT_STAT_POSSESSED); - RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_24); + RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PLAYER_CONTROLLED); } if(GetTypeId() == TYPEID_UNIT) -- cgit v1.2.3