server/game2002
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove warning

Browse Source
This commit is contained in:
aozhiwei 2019-07-11 11:39:42 +08:00
parent b782a52206
commit 24d27555af
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/gameserver/obstacle.cc
View File

@ -244,4 +244,5 @@ void Obstacle::Explosion()
self_collider_->rad = old_rad; self_collider_->rad = old_rad;
} }
explosioned = true; explosioned = true;
room->RemoveObjectLater(this);
} }

10
server/gameserver/player.cc
View File

@ -33,13 +33,6 @@ void Player::Initialize()
health = meta->i->health(); health = meta->i->health();
max_energy_shield = energy_shield; max_energy_shield = energy_shield;
skin_meta = MetaMgr::Instance()->GetTank(SkinId()); skin_meta = MetaMgr::Instance()->GetTank(SkinId());
#if 0
if (skin_meta) {
skill_meta = MetaMgr::Instance()->GetSkill(skin_meta->i->skill_id());
} else {
skill_meta = nullptr;
}
#endif
RecalcBuff(); RecalcBuff();
} }
@ -664,7 +657,6 @@ void Player::ProcPrepareItems(const ::google::protobuf::RepeatedField< ::google:
void Player::_CMMove(f8::MsgHdr& hdr, const cs::CMMove& msg) void Player::_CMMove(f8::MsgHdr& hdr, const cs::CMMove& msg)
{ {
bool has_move_dir = msg.has_move_dir();
moving = false; moving = false;
if (msg.has_move_dir()) { if (msg.has_move_dir()) {
if (std::abs(msg.move_dir().x()) > FLT_EPSILON || if (std::abs(msg.move_dir().x()) > FLT_EPSILON ||
@ -747,8 +739,6 @@ void Player::UpdateDropWeapon()
Weapon* weapon = &weapons[drop_weapon_idx]; Weapon* weapon = &weapons[drop_weapon_idx];
int weapon_id = weapon->weapon_id; int weapon_id = weapon->weapon_id;
int weapon_lv = weapon->weapon_lv; int weapon_lv = weapon->weapon_lv;
int weapon_ammo = weapon->ammo;
MetaData::Equip* weapon_meta = weapon->meta;
if (weapon->weapon_id != 0) { if (weapon->weapon_id != 0) {
if (weapon->weapon_idx == 0) { if (weapon->weapon_idx == 0) {
if (weapon->weapon_id != default_weapon.weapon_id) { if (weapon->weapon_id != default_weapon.weapon_id) {

4
server/gameserver/player.h
View File

@ -32,10 +32,10 @@ class Player : public Human
int moved_frames = 0; int moved_frames = 0;
bool select_weapon = false; bool select_weapon = false;
int selected_weapon_idx = 0; size_t selected_weapon_idx = 0;
bool drop_weapon = false; bool drop_weapon = false;
int drop_weapon_idx = 0; size_t drop_weapon_idx = 0;
bool cancel_action = false; bool cancel_action = false;