hans/CnC_Remastered_Collection
1
0
Fork 0
mirror of https://github.com/jmarshall23/CnC_Remastered_Collection.git synced 2026-08-12 08:00:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

BigOverlays will now affect pathfinding.

Browse Source
This commit is contained in:
Justin Marshall
2020-07-24 20:25:54 -07:00
parent 908f6c9c3e
commit 618a31fb8c
8 changed files with 135 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/redalert/cell.cpp
+26 -6
View File
@@ -131,6 +131,12 @@ CellClass::CellClass(void) :
IsVisibleByPlayerMask(0),
CTFFlag(NULL)
{
x_screen_pos = 0;
y_screen_pos = 0;
x_world_pos = 0;
y_world_pos = 0;
bigOverlay = NULL;
for (int zone = MZONE_FIRST; zone < MZONE_COUNT; zone++) {
Zones[zone] = 0;
}
@@ -469,6 +475,10 @@ bool CellClass::Is_Clear_To_Build(SpeedType loco) const
*/
if (ScenarioInit) return(true);
if (bigOverlay != NULL) {
return false;
}
/*
** If there is an object there, then don't allow building.
*/
@@ -1110,6 +1120,12 @@ void CellClass::Draw_It(int x, int y, bool objects)
return;
}
// jmarshall - debug mechanism
if (bigOverlay != NULL) {
GL_SetColor(0.35, 0.35, 0.35);
}
// jmarshall end
CellCount++;
/*
@@ -1166,13 +1182,13 @@ void CellClass::Draw_It(int x, int y, bool objects)
*/
if (ttype->Get_Image_Data()) {
// jmarshall - hd image should always be valid even if loading legacy assets
int xx = x;
int yy = y;
ConvertCoordsToIsometric(xx, yy);
lastRenderX = xx;
lastRenderY = yy;
x_screen_pos = x;
y_screen_pos = y;
ConvertCoordsToIsometric(x_screen_pos, y_screen_pos);
lastRenderX = x_screen_pos;
lastRenderY = y_screen_pos;
int ticon = icon;
LogicPage->Draw_Stamp(ttype->Get_HDImage_Data(), icon, xx, yy, NULL, WINDOW_TACTICAL);
LogicPage->Draw_Stamp(ttype->Get_HDImage_Data(), icon, x_screen_pos, y_screen_pos, NULL, WINDOW_TACTICAL);
// jmarshall end
//if (remap) {
// LogicPage->Remap(x+Map.TacPixelX, y+Map.TacPixelY, ICON_PIXEL_W, ICON_PIXEL_H, remap);
@@ -3016,6 +3032,10 @@ bool CellClass::Is_Clear_To_Move(SpeedType loco, bool ignoreinfantry, bool ignor
return(true);
}
if (bigOverlay != NULL) {
return false;
}
/*
** If a zone was specified, then see if the cell is in a legal
** zone to allow movement.