EESAST
/
THUAI6
Not watched
1
0
Fork 0
Code
Releases 3 Wiki evaluate Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain HPC
Browse Source

🐞 fix(fix sight bug):

tags/0.1.0
wihn2021 2 years ago
parent
e026154d3d
commit
3f5fc6d8fa
1 changed files with 64 additions and 72 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +64
    -72
      CAPI/API/src/logic.cpp

+ 64
- 72
CAPI/API/src/logic.cpp View File

@@ -218,62 +218,58 @@ void Logic::LoadBuffer(protobuf::MessageToClient& message)
{ {
if (deltaY > 0) if (deltaY > 0)
{ {
for (int i = this->currentState->butcherSelf->x; i < itr->x() && !barrier; i += dx)
for (int j = this->currentState->butcherSelf->y; j < itr->y(); j += dy)
for (int i = this->currentState->butcherSelf->x, j = this->currentState->butcherSelf->y; i < itr->x() && !barrier && j < itr->y(); i += dx, j += dy)
{
int x_cell = IAPI::GridToCell(i);
int y_cell = IAPI::GridToCell(j);
if (this->currentState->gamemap[x_cell][y_cell] == THUAI6::PlaceType::Wall)
{ {
int x_cell = IAPI::GridToCell(i);
int y_cell = IAPI::GridToCell(j);
if (this->currentState->gamemap[x_cell][y_cell] == THUAI6::PlaceType::Wall)
{
barrier = true;
break;
}
barrier = true;
break;
} }
}
} }
else else
{ {
for (int i = this->currentState->butcherSelf->x; i < itr->x() && !barrier; i += dx)
for (int j = this->currentState->butcherSelf->y; j > itr->y(); j += dy)
for (int i = this->currentState->butcherSelf->x, j = this->currentState->butcherSelf->y; i < itr->x() && !barrier && j > itr->y(); i += dx, j += dy)
{
int x_cell = IAPI::GridToCell(i);
int y_cell = IAPI::GridToCell(j);
if (this->currentState->gamemap[x_cell][y_cell] == THUAI6::PlaceType::Wall)
{ {
int x_cell = IAPI::GridToCell(i);
int y_cell = IAPI::GridToCell(j);
if (this->currentState->gamemap[x_cell][y_cell] == THUAI6::PlaceType::Wall)
{
barrier = true;
break;
}
barrier = true;
break;
} }
}
} }
} }
else else
{ {
if (deltaY > 0) if (deltaY > 0)
{ {
for (int i = this->currentState->butcherSelf->x; i > itr->x() && !barrier; i += dx)
for (int j = this->currentState->butcherSelf->y; j < itr->y(); j += dy)
for (int i = this->currentState->butcherSelf->x, j = this->currentState->butcherSelf->y; i > itr->x() && !barrier && j < itr->y(); i += dx, j += dy)
{
int x_cell = IAPI::GridToCell(i);
int y_cell = IAPI::GridToCell(j);
if (this->currentState->gamemap[x_cell][y_cell] == THUAI6::PlaceType::Wall)
{ {
int x_cell = IAPI::GridToCell(i);
int y_cell = IAPI::GridToCell(j);
if (this->currentState->gamemap[x_cell][y_cell] == THUAI6::PlaceType::Wall)
{
barrier = true;
break;
}
barrier = true;
break;
} }
}
} }
else else
{ {
for (int i = this->currentState->butcherSelf->x; i > itr->x() && !barrier; i += dx)
for (int j = this->currentState->butcherSelf->y; j > itr->y(); j += dy)
for (int i = this->currentState->butcherSelf->x, j = this->currentState->butcherSelf->y; i > itr->x() && !barrier && j > itr->y(); i += dx, j += dy)
{
int x_cell = IAPI::GridToCell(i);
int y_cell = IAPI::GridToCell(j);
if (this->currentState->gamemap[x_cell][y_cell] == THUAI6::PlaceType::Wall)
{ {
int x_cell = IAPI::GridToCell(i);
int y_cell = IAPI::GridToCell(j);
if (this->currentState->gamemap[x_cell][y_cell] == THUAI6::PlaceType::Wall)
{
barrier = true;
break;
}
barrier = true;
break;
} }
}
} }
} }
if (barrier) if (barrier)
@@ -317,62 +313,58 @@ void Logic::LoadBuffer(protobuf::MessageToClient& message)
{ {
if (deltaY > 0) if (deltaY > 0)
{ {
for (int i = this->currentState->humanSelf->x; i < itr->x() && !barrier; i += dx)
for (int j = this->currentState->humanSelf->y; j < itr->y(); j += dy)
for (int i = this->currentState->humanSelf->x, j = this->currentState->humanSelf->y; i < itr->x() && j < itr->y() && !barrier; i += dx, j += dy)
{
int x_cell = IAPI::GridToCell(i);
int y_cell = IAPI::GridToCell(j);
if (this->currentState->gamemap[x_cell][y_cell] == THUAI6::PlaceType::Wall)
{ {
int x_cell = IAPI::GridToCell(i);
int y_cell = IAPI::GridToCell(j);
if (this->currentState->gamemap[x_cell][y_cell] == THUAI6::PlaceType::Wall)
{
barrier = true;
break;
}
barrier = true;
break;
} }
}
} }
else else
{ {
for (int i = this->currentState->humanSelf->x; i < itr->x() && !barrier; i += dx)
for (int j = this->currentState->humanSelf->y; j > itr->y(); j += dy)
for (int i = this->currentState->humanSelf->x, j = this->currentState->humanSelf->y; i < itr->x() && j > itr->y() && !barrier; i += dx, j += dy)
{
int x_cell = IAPI::GridToCell(i);
int y_cell = IAPI::GridToCell(j);
if (this->currentState->gamemap[x_cell][y_cell] == THUAI6::PlaceType::Wall)
{ {
int x_cell = IAPI::GridToCell(i);
int y_cell = IAPI::GridToCell(j);
if (this->currentState->gamemap[x_cell][y_cell] == THUAI6::PlaceType::Wall)
{
barrier = true;
break;
}
barrier = true;
break;
} }
}
} }
} }
else else
{ {
if (deltaY > 0) if (deltaY > 0)
{ {
for (int i = this->currentState->humanSelf->x; i > itr->x() && !barrier; i += dx)
for (int j = this->currentState->humanSelf->y; j < itr->y(); j += dy)
for (int i = this->currentState->humanSelf->x, j = this->currentState->humanSelf->y; i > itr->x() && j < itr->y() && !barrier; i += dx, j += dy)
{
int x_cell = IAPI::GridToCell(i);
int y_cell = IAPI::GridToCell(j);
if (this->currentState->gamemap[x_cell][y_cell] == THUAI6::PlaceType::Wall)
{ {
int x_cell = IAPI::GridToCell(i);
int y_cell = IAPI::GridToCell(j);
if (this->currentState->gamemap[x_cell][y_cell] == THUAI6::PlaceType::Wall)
{
barrier = true;
break;
}
barrier = true;
break;
} }
}
} }
else else
{ {
for (int i = this->currentState->humanSelf->x; i > itr->x() && !barrier; i += dx)
for (int j = this->currentState->humanSelf->y; j > itr->y(); j += dy)
for (int i = this->currentState->humanSelf->x, j = this->currentState->humanSelf->y; i > itr->x() && j > itr->y() && !barrier; i += dx, j += dy)
{
int x_cell = IAPI::GridToCell(i);
int y_cell = IAPI::GridToCell(j);
if (this->currentState->gamemap[x_cell][y_cell] == THUAI6::PlaceType::Wall)
{ {
int x_cell = IAPI::GridToCell(i);
int y_cell = IAPI::GridToCell(j);
if (this->currentState->gamemap[x_cell][y_cell] == THUAI6::PlaceType::Wall)
{
barrier = true;
break;
}
barrier = true;
break;
} }
}
} }
} }
if (barrier) if (barrier)


Write Preview
Loading…
Cancel
Save