devZoGok/PlanetFleet
1
0
Fork 0
mirror of https://github.com/devZoGok/PlanetFleet.git synced 2026-08-26 19:43:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

corrected foreign unit minimap display

Browse Source
This commit is contained in:
devZoGok
2024-09-20 20:31:30 +03:00
parent f41f49c1f6
commit bcca140055
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
minimapButton.cpp
+11 -9
View File
@@ -18,13 +18,9 @@ namespace battleship{
using namespace vb01;
using namespace std;
MinimapButton::MinimapButton(Vector3 pos, Vector2 size, string ip) : Button(pos, size, "minimap", "", -1, true, ip){
content = new Node();
rectNode->attachChild(content);
}
MinimapButton::MinimapButton(Vector3 pos, Vector2 size, string ip) : Button(pos, size, "minimap", "", -1, true, ip){}
MinimapButton::~MinimapButton(){
}
MinimapButton::~MinimapButton(){}
void MinimapButton::update(){
Button::update();
@@ -55,6 +51,7 @@ namespace battleship{
int pxId = 0, numIter = 0;
u8 *oldImageData = activeState->getOldMinimapImage();
int unitPxRadius = 1;
for(u8 *p = asset->image; p != asset->image + size; p += numChannels, pxId += numChannels, numIter++){
Vector2 coords = Vector2(
@@ -68,7 +65,9 @@ namespace battleship{
};
for(pair<Unit*, Vector2> unitPair : unitMinimapPos){
if(unitPair.first->getPlayer() == mainPlayer && unitPair.second == coords){
Vector2 coordDiff = unitPair.second - coords;
if(unitPair.first->getPlayer() == mainPlayer && fabs(coordDiff.x) <= unitPxRadius && fabs(coordDiff.y) <= unitPxRadius){
Vector3 plCol = mainPlayer->getColor();
pxCol[0] = plCol.x * 255;
pxCol[1] = plCol.y * 255;
@@ -82,12 +81,15 @@ namespace battleship{
bool foreignUnit = false;
Player *pl = nullptr;
for(pair<Unit*, Vector2> up : unitMinimapPos)
if(up.first->getPlayer() != mainPlayer && up.second == coords){
for(pair<Unit*, Vector2> up : unitMinimapPos){
Vector2 coordDiff = up.second - coords;
if(up.first->getPlayer() != mainPlayer && fabs(coordDiff.x) <= unitPxRadius && fabs(coordDiff.y) <= unitPxRadius){
foreignUnit = true;
pl = up.first->getPlayer();
break;
}
}
if(foreignUnit){
Vector3 plCol = pl->getColor();
minimapButton.h
-1
View File
@@ -15,7 +15,6 @@ namespace battleship{
void onClick();
void update();
private:
vb01::Node *content = nullptr;
};
}