1
This commit is contained in:
parent
d373f5e8b7
commit
ce7c8403bf
@ -30,7 +30,7 @@ bool Movement::UpdatePosition()
|
|||||||
curr_point.curr_pos.AddGlmVec3(curr_point.dir * owner_->GetSpeed());
|
curr_point.curr_pos.AddGlmVec3(curr_point.dir * owner_->GetSpeed());
|
||||||
owner_->SetPos(curr_point.curr_pos);
|
owner_->SetPos(curr_point.curr_pos);
|
||||||
owner_->room->map_instance->CheckTerrain(owner_, curr_point.same_polys_flags, curr_point.spec_polys);
|
owner_->room->map_instance->CheckTerrain(owner_, curr_point.same_polys_flags, curr_point.spec_polys);
|
||||||
if (owner_->IsHuman()) {
|
if (owner_->IsHuman() && owner_->room->BattleStarted()) {
|
||||||
owner_->AsHuman()->stats->IncMoveDistance(owner_->GetSpeed());
|
owner_->AsHuman()->stats->IncMoveDistance(owner_->GetSpeed());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2889,13 +2889,6 @@ void Room::AddToPostBattleAutoFreeList(a8::XTimerWp timer)
|
|||||||
if (timer.expired()) {
|
if (timer.expired()) {
|
||||||
A8_ABORT();
|
A8_ABORT();
|
||||||
}
|
}
|
||||||
// 999
|
|
||||||
#if 1
|
|
||||||
#else
|
|
||||||
if (post_battle_auto_free_list_.find(timer) != post_battle_auto_free_list_.end()) {
|
|
||||||
A8_ABORT();
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
post_battle_auto_free_list_.push_back(timer);
|
post_battle_auto_free_list_.push_back(timer);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -365,6 +365,7 @@ void Team::GenBattleReportData(Human* player, a8::MutableXObject* params)
|
|||||||
} else {
|
} else {
|
||||||
member_pb->SetVal("skin_id", 0);
|
member_pb->SetVal("skin_id", 0);
|
||||||
}
|
}
|
||||||
|
member_pb->SetVal("move_distance", hum->stats->move_distance);
|
||||||
|
|
||||||
member_pb->SetVal("hero_id", hum->meta->id());
|
member_pb->SetVal("hero_id", hum->meta->id());
|
||||||
member_pb->SetVal("hero_uniid", hum->hero_uniid);
|
member_pb->SetVal("hero_uniid", hum->hero_uniid);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user