mirror of
https://github.com/jmarshall23/CnC_Remastered_Collection.git
synced 2026-08-17 08:50:29 +02:00
Patch 1.01 Merge branch 'master' of https://github.com/electronicarts/CnC_Remastered_Collection
# Conflicts, ignored these upstream changes: # REDALERT/MiscAsm.cpp # REDALERT/WIN32LIB/DrawMisc.cpp
This commit is contained in:
+11
-1
@@ -142,6 +142,8 @@ void CellClass::Code_Pointers(void)
|
||||
Overlapper[index] = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
assert(CTFFlag == NULL);
|
||||
}
|
||||
|
||||
|
||||
@@ -177,6 +179,8 @@ void CellClass::Decode_Pointers(void)
|
||||
assert(Overlapper[index] != NULL);
|
||||
}
|
||||
}
|
||||
|
||||
CTFFlag = NULL;
|
||||
}
|
||||
|
||||
|
||||
@@ -480,8 +484,14 @@ void DisplayClass::Decode_Pointers(void)
|
||||
*=============================================================================================*/
|
||||
void MapClass::Code_Pointers(void)
|
||||
{
|
||||
CELL cell;
|
||||
|
||||
for (cell = 0; cell < MAP_CELL_TOTAL; cell++) {
|
||||
(*this)[cell].Flag_Destroy();
|
||||
}
|
||||
|
||||
CellClass * cellptr = &(*this)[(CELL)0];
|
||||
for (CELL cell = 0; cell < MAP_CELL_TOTAL; cell++) {
|
||||
for (cell = 0; cell < MAP_CELL_TOTAL; cell++) {
|
||||
cellptr->Code_Pointers();
|
||||
cellptr++;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user