diff options
| author | megamage <none@none> | 2009-09-01 17:21:22 -0500 |
|---|---|---|
| committer | megamage <none@none> | 2009-09-01 17:21:22 -0500 |
| commit | 1e7386c638b819065791f85e09976697a39cc868 (patch) | |
| tree | 97335c5c9aef5434b887119492a436e456978890 /src/game/Unit.cpp | |
| parent | 176a710e72b6e9c81e6b84967faae17d9f84f3af (diff) | |
[8442] Change some unit flag names. Author: NoFantasy
--HG--
branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
| -rw-r--r-- | src/game/Unit.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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) |