diff options
author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-04-15 21:24:55 +0200 |
---|---|---|
committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-04-15 21:24:55 +0200 |
commit | ef4175cdfae6a6981738e15cb0009d8e47ed7c80 (patch) | |
tree | 5237140b62274b63b9a98ef65aec92df804eb1f6 /src/game-server/state.cpp | |
parent | 0f1449567d5a2ccab9ff6fdc9975150299482834 (diff) | |
download | manaserv-ef4175cdfae6a6981738e15cb0009d8e47ed7c80.tar.gz manaserv-ef4175cdfae6a6981738e15cb0009d8e47ed7c80.tar.bz2 manaserv-ef4175cdfae6a6981738e15cb0009d8e47ed7c80.tar.xz manaserv-ef4175cdfae6a6981738e15cb0009d8e47ed7c80.zip |
Moved functions to entity members where appropriate
Some functions were skipped for now because they may need a new name
or change of behavior. Changes:
chr_warp entity:warp
chr_get_inventory entity:inventory
chr_inv_change entity:inv_change
chr_inv_count entity:inv_count
chr_get_equipment entity:equipment
chr_equip_slot entity:equip_slot
chr_equip_item entity:equip_item
chr_unequip_slot entity:unequip_slot
chr_unequip_item entity:unequip_item
chr_get_level entity:level
chr_get_exp entity:xp
chr_give_exp entity:give_xp
chr_get_rights entity:rights
chr_set_hair_style entity:set_hair_style
chr_get_hair_style entity:hair_style
chr_set_hair_color entity:set_hair_color
chr_get_hair_color entity:hair_color
chr_get_kill_count entity:kill_count
chr_give_special entity:give_special
chr_has_special entity:has_special
chr_take_special entity:take_special
chr_set_special_recharge_speed entity:set_special_recharge_speed
chr_get_special_recharge_speed entity:special_recharge_speed
chr_set_special_mana entity:set_special_mana
chr_get_special_mana entity:special_mana
chr_kick entity:kick
exp_for_level xp_for_level
monster_get_id entity:monster_id
monster_change_anger entity:change_anger
monster_drop_anger entity:drop_anger
monster_get_angerlist entity:angerlist
being_apply_status entity:apply_status
being_remove_status entity:remove_status
being_has_status entity:has_status
being_set_status_time entity:set_status_time
being_get_status_time entity:status_time
being_get_gender entity:gender
being_set_gender entity:set_gender
being_type entity:type
being_walk entity:walk
being_say entity:say
being_damage entity:damage
being_heal entity:heal
being_get_name entity:name
being_get_action entity:action
being_set_action entity:set_action
being_get_direction entity:direction
being_set_direction entity:set_direction
being_apply_attribute_modifier entity:apply_attribute_modifier
being_remove_attribute_modifier entity:remove_attribute_modifier
being_set_base_attribute entity:set_base_attribute
being_get_modified_attribute entity:modified_attribute
being_get_base_attribute entity:base_attribute
being_set_walkmask entity:set_walkmask
being_get_walkmask entity:walkmask
being_get_mapid entity:mapid
chat_message entity:message
being_register entity:register
chr_shake_screen entity:shake_screen
chr_create_text_particle entity:show_text_particle
- entity:position
posX entity:x
posY entity:y
monster_get_name monsterclass:name
item_get_name itemclass:name
Diffstat (limited to 'src/game-server/state.cpp')
-rw-r--r-- | src/game-server/state.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game-server/state.cpp b/src/game-server/state.cpp index 10869669..58d848de 100644 --- a/src/game-server/state.cpp +++ b/src/game-server/state.cpp @@ -823,18 +823,18 @@ void GameState::enqueueWarp(Entity *ptr, enqueueEvent(ptr, event); } -void GameState::sayAround(Entity *obj, const std::string &text) +void GameState::sayAround(Entity *entity, const std::string &text) { - Point speakerPosition = obj->getComponent<ActorComponent>()->getPosition(); + Point speakerPosition = entity->getComponent<ActorComponent>()->getPosition(); int visualRange = Configuration::getValue("game_visualRange", 448); - for (CharacterIterator i(obj->getMap()->getAroundActorIterator(obj, visualRange)); i; ++i) + for (CharacterIterator i(entity->getMap()->getAroundActorIterator(entity, visualRange)); i; ++i) { const Point &point = (*i)->getComponent<ActorComponent>()->getPosition(); if (speakerPosition.inRangeOf(point, visualRange)) { - sayTo(*i, obj, text); + sayTo(*i, entity, text); } } } |