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

Patch 1.01 Merge branch 'master' of https://github.com/electronicarts/CnC_Remastered_Collection

Browse Source 
# Conflicts, ignored these upstream changes:
#	REDALERT/MiscAsm.cpp
#	REDALERT/WIN32LIB/DrawMisc.cpp
This commit is contained in:
Justin Marshall
2020-06-22 17:19:05 -07:00
parent f53249cb24 cd8bc9228e
commit 21f30aad44
68 changed files with 1189 additions and 571 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/TIBERIANDAWN/DRIVE.CPP
+10 -4
View File
@@ -521,8 +521,8 @@ void DriveClass::Assign_Destination(TARGET target)
** facility is currently not involved with some other unit (radio or unloading).
*/
if (b && *b == STRUCT_REPAIR) {
if (b->In_Radio_Contact()) {
target = 0;
if (b->In_Radio_Contact() && (b->Contact_With_Whom() != this)) {
ArchiveTarget = target;
} else {
/*
@@ -1598,12 +1598,18 @@ void DriveClass::Mark_Track(COORDINATE headto, MarkType type)
if (TrackIndex < cellidx && cellidx != -1) {
COORDINATE offset = Smooth_Turn(ptr[cellidx].Offset, &dir);
Map[Coord_Cell(offset)].Flag.Occupy.Vehicle = value;
CELL cell = Coord_Cell(offset);
if ((unsigned)cell < MAP_CELL_TOTAL) {
Map[cell].Flag.Occupy.Vehicle = value;
}
}
}
}
}
Map[Coord_Cell(headto)].Flag.Occupy.Vehicle = value;
CELL cell = Coord_Cell(headto);
if ((unsigned)cell < MAP_CELL_TOTAL) {
Map[cell].Flag.Occupy.Vehicle = value;
}
}
}