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:31:09 +08:00
parent bc2151140b
commit b782a52206
6 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/gameserver/collider.cc
View File

@ -28,6 +28,8 @@ bool ColliderComponent::IntersectSegment(a8::Vec2& p0, a8::Vec2& p1)
a_circle->rad);
}
break;
default:
break;
}
return false;
}
@ -62,6 +64,8 @@ bool ColliderComponent::Intersect(ColliderComponent* b)
b_circle->rad);
}
break;
default:
break;
}
};
break;
@ -121,9 +125,13 @@ bool ColliderComponent::Intersect(ColliderComponent* b)
b_circle->rad);
}
break;
default:
break;
}
}
break;
default:
break;
}
return false;
}
@ -157,6 +165,8 @@ bool ColliderComponent::CalcSafePoint(ColliderComponent* b, a8::Vec2& new_pos)
new_pos);
}
break;
default:
break;
}
}
break;
@ -186,6 +196,8 @@ bool ColliderComponent::CalcSafePoint(ColliderComponent* b, a8::Vec2& new_pos)
new_pos);
}
break;
default:
break;
}
}
break;

2
server/gameserver/entity.cc
View File

@ -103,6 +103,8 @@ void Entity::FindLocationWithTarget(Entity* target)
}
}
break;
default:
break;
}
if (building) {
break;

9
server/gameserver/human.cc
View File

@ -1734,10 +1734,15 @@ void Human::ProcSkillPhase(MetaData::SkillPhase* phase)
if (obstacle) {
obstacle->master_id = entity_uniid;
room->xtimer.AddDeadLineTimerAndAttach(SERVER_FRAME_RATE * 5,
a8::XParams(),
a8::XParams()
.SetSender(obstacle),
[] (const a8::XParams& param)
{
Obstacle* obstacle = (Obstacle*)param.sender.GetUserData();
if (!obstacle->dead) {
obstacle->dead = true;
obstacle->Explosion();
}
},
&obstacle->xtimer_attacher.timer_list_);
}

2
server/gameserver/human.h
View File

@ -119,7 +119,7 @@ class Human : public Entity
std::map<int, int> skin_configs;
bool use_skill = false;
int curr_skill_phase = 0;
size_t curr_skill_phase = 0;
int skill_target_id = 0;
a8::Vec2 skill_dir;
a8::Vec2 skill_target_pos;

8
server/gameserver/obstacle.cc
View File

@ -162,6 +162,9 @@ void Obstacle::GetCircleBox(CircleCollider& circle_box)
void Obstacle::Explosion()
{
if (explosioned) {
return;
}
float old_rad = self_collider_->rad;
if (self_collider_) {
self_collider_->rad = meta->i->damage_dia();
@ -231,8 +234,8 @@ void Obstacle::Explosion()
}
}
break;
default:
break;
default:
break;
}
}
@ -240,4 +243,5 @@ void Obstacle::Explosion()
if (self_collider_) {
self_collider_->rad = old_rad;
}
explosioned = true;
}

1
server/gameserver/obstacle.h
View File

@ -33,6 +33,7 @@ class Obstacle : public Entity
Building* building = nullptr;
int door_house_uniid = 0;
int master_id = 0;
bool explosioned = false;
const metatable::DoorObjJson* door_state0 = nullptr;
const metatable::DoorObjJson* door_state1 = nullptr;