1
This commit is contained in:
parent
a4a8586f36
commit
955f76da1a
@ -19,6 +19,7 @@
|
|||||||
#include "mt/PveGeminiContent.h"
|
#include "mt/PveGeminiContent.h"
|
||||||
#include "mt/Text.h"
|
#include "mt/Text.h"
|
||||||
#include "mt/SafeArea.h"
|
#include "mt/SafeArea.h"
|
||||||
|
#include "mt/SafeAreaSafePoint.h"
|
||||||
|
|
||||||
void Incubator::Init()
|
void Incubator::Init()
|
||||||
{
|
{
|
||||||
@ -493,7 +494,6 @@ void Incubator::NextWave()
|
|||||||
void Incubator::ShowHand()
|
void Incubator::ShowHand()
|
||||||
{
|
{
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
glm::vec3 center;
|
|
||||||
if (hold_humans_.empty()) {
|
if (hold_humans_.empty()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -503,9 +503,6 @@ void Incubator::ShowHand()
|
|||||||
glm::vec3 point = glm::vec3(room->GetGasData().new_area_meta->GetLastArea()->x1(),
|
glm::vec3 point = glm::vec3(room->GetGasData().new_area_meta->GetLastArea()->x1(),
|
||||||
6.0f,
|
6.0f,
|
||||||
room->GetGasData().new_area_meta->GetLastArea()->y1());
|
room->GetGasData().new_area_meta->GetLastArea()->y1());
|
||||||
#ifdef DEBUG
|
|
||||||
center = point;
|
|
||||||
#endif
|
|
||||||
Global::Instance()->verify_set_pos = 1;
|
Global::Instance()->verify_set_pos = 1;
|
||||||
hum->GetMutablePos().FromGlmVec3(point);
|
hum->GetMutablePos().FromGlmVec3(point);
|
||||||
Global::Instance()->verify_set_pos = 0;
|
Global::Instance()->verify_set_pos = 0;
|
||||||
@ -535,15 +532,4 @@ void Incubator::ShowHand()
|
|||||||
},
|
},
|
||||||
&room->xtimer_attacher_);
|
&room->xtimer_attacher_);
|
||||||
hold_humans_.clear();
|
hold_humans_.clear();
|
||||||
#ifdef DEBUG1
|
|
||||||
room->TraversePlayerList
|
|
||||||
(
|
|
||||||
[this, center] (Player* hum)
|
|
||||||
{
|
|
||||||
hum->GetMutablePos().FromGlmVec3(center);
|
|
||||||
a8::XPrintf("showhand %f %f %f\n", {center.x, center.y, center.z});
|
|
||||||
room->grid_service->MoveCreature(hum);
|
|
||||||
hum->GetMovement()->ClearPath();
|
|
||||||
});
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user