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

Cleaned up cdata.

Browse Source
This commit is contained in:
Justin Marshall
2020-07-23 13:37:21 -07:00
parent 2c94154079
commit b72170fd11
6 changed files with 22 additions and 1210 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/redalert/cdata.cpp
+1 -1037
View File
File diff suppressed because it is too large Load Diff
code/redalert/defines.h
-156
View File
@@ -2000,8 +2000,6 @@ typedef enum TemplateType : unsigned short {
TEMPLATE_ROADS4,
TEMPLATE_ROADS5,
TEMPLATE_ROADS6,
TEMPLATE_ROADS7,
TEMPLATE_ROADS8,
TEMPLATE_BRIDGE_1A,
TEMPLATE_BRIDGE_1B,
TEMPLATE_BRIDGE_1C,
@@ -2014,166 +2012,12 @@ typedef enum TemplateType : unsigned short {
TEMPLATE_BRIDGE_3D,
TEMPLATE_BRIDGE_3E,
TEMPLATE_BRIDGE_3F,
TEMPLATE_F01,
TEMPLATE_F02,
TEMPLATE_F03,
TEMPLATE_F04,
TEMPLATE_F05,
TEMPLATE_F06,
// Custom interior pieces.
TEMPLATE_ARRO0001,
TEMPLATE_ARRO0002,
TEMPLATE_ARRO0003,
TEMPLATE_ARRO0004,
TEMPLATE_ARRO0005,
TEMPLATE_ARRO0006,
TEMPLATE_ARRO0007,
TEMPLATE_ARRO0008,
TEMPLATE_ARRO0009,
TEMPLATE_ARRO0010,
TEMPLATE_ARRO0011,
TEMPLATE_ARRO0012,
TEMPLATE_ARRO0013,
TEMPLATE_ARRO0014,
TEMPLATE_ARRO0015,
TEMPLATE_FLOR0001,
TEMPLATE_FLOR0002,
TEMPLATE_FLOR0003,
TEMPLATE_FLOR0004,
TEMPLATE_FLOR0005,
TEMPLATE_FLOR0006,
TEMPLATE_FLOR0007,
TEMPLATE_GFLR0001,
TEMPLATE_GFLR0002,
TEMPLATE_GFLR0003,
TEMPLATE_GFLR0004,
TEMPLATE_GFLR0005,
TEMPLATE_GSTR0001,
TEMPLATE_GSTR0002,
TEMPLATE_GSTR0003,
TEMPLATE_GSTR0004,
TEMPLATE_GSTR0005,
TEMPLATE_GSTR0006,
TEMPLATE_GSTR0007,
TEMPLATE_GSTR0008,
TEMPLATE_GSTR0009,
TEMPLATE_GSTR0010,
TEMPLATE_GSTR0011,
TEMPLATE_LWAL0001,
TEMPLATE_LWAL0002,
TEMPLATE_LWAL0003,
TEMPLATE_LWAL0004,
TEMPLATE_LWAL0005,
TEMPLATE_LWAL0006,
TEMPLATE_LWAL0007,
TEMPLATE_LWAL0008,
TEMPLATE_LWAL0009,
TEMPLATE_LWAL0010,
TEMPLATE_LWAL0011,
TEMPLATE_LWAL0012,
TEMPLATE_LWAL0013,
TEMPLATE_LWAL0014,
TEMPLATE_LWAL0015,
TEMPLATE_LWAL0016,
TEMPLATE_LWAL0017,
TEMPLATE_LWAL0018,
TEMPLATE_LWAL0019,
TEMPLATE_LWAL0020,
TEMPLATE_LWAL0021,
TEMPLATE_LWAL0022,
TEMPLATE_LWAL0023,
TEMPLATE_LWAL0024,
TEMPLATE_LWAL0025,
TEMPLATE_LWAL0026,
TEMPLATE_LWAL0027,
TEMPLATE_STRP0001,
TEMPLATE_STRP0002,
TEMPLATE_STRP0003,
TEMPLATE_STRP0004,
TEMPLATE_STRP0005,
TEMPLATE_STRP0006,
TEMPLATE_STRP0007,
TEMPLATE_STRP0008,
TEMPLATE_STRP0009,
TEMPLATE_STRP0010,
TEMPLATE_STRP0011,
TEMPLATE_WALL0001,
TEMPLATE_WALL0002,
TEMPLATE_WALL0003,
TEMPLATE_WALL0004,
TEMPLATE_WALL0005,
TEMPLATE_WALL0006,
TEMPLATE_WALL0007,
TEMPLATE_WALL0008,
TEMPLATE_WALL0009,
TEMPLATE_WALL0010,
TEMPLATE_WALL0011,
TEMPLATE_WALL0012,
TEMPLATE_WALL0013,
TEMPLATE_WALL0014,
TEMPLATE_WALL0015,
TEMPLATE_WALL0016,
TEMPLATE_WALL0017,
TEMPLATE_WALL0018,
TEMPLATE_WALL0019,
TEMPLATE_WALL0020,
TEMPLATE_WALL0021,
TEMPLATE_WALL0022,
TEMPLATE_WALL0023,
TEMPLATE_WALL0024,
TEMPLATE_WALL0025,
TEMPLATE_WALL0026,
TEMPLATE_WALL0027,
TEMPLATE_WALL0028,
TEMPLATE_WALL0029,
TEMPLATE_WALL0030,
TEMPLATE_WALL0031,
TEMPLATE_WALL0032,
TEMPLATE_WALL0033,
TEMPLATE_WALL0034,
TEMPLATE_WALL0035,
TEMPLATE_WALL0036,
TEMPLATE_WALL0037,
TEMPLATE_WALL0038,
TEMPLATE_WALL0039,
TEMPLATE_WALL0040,
TEMPLATE_WALL0041,
TEMPLATE_WALL0042,
TEMPLATE_WALL0043,
TEMPLATE_WALL0044,
TEMPLATE_WALL0045,
TEMPLATE_WALL0046,
TEMPLATE_WALL0047,
TEMPLATE_WALL0048,
TEMPLATE_WALL0049,
TEMPLATE_BRIDGE1H,
TEMPLATE_BRIDGE2H,
TEMPLATE_BRIDGE_1AX,
TEMPLATE_BRIDGE_2AX,
TEMPLATE_BRIDGE1X,
TEMPLATE_BRIDGE2X,
// jmarshall
//TEMPLATE_XTRA0001,
//TEMPLATE_XTRA0002,
//TEMPLATE_XTRA0003,
//TEMPLATE_XTRA0004,
//TEMPLATE_XTRA0005,
//TEMPLATE_XTRA0006,
//TEMPLATE_XTRA0007,
//TEMPLATE_XTRA0008,
//TEMPLATE_XTRA0009,
//TEMPLATE_XTRA0010,
//TEMPLATE_XTRA0011,
//TEMPLATE_XTRA0012,
//TEMPLATE_XTRA0013,
//TEMPLATE_XTRA0014,
//TEMPLATE_XTRA0015,
//TEMPLATE_XTRA0016,
// jmarshall end
#ifdef FIXIT_ANTS
TEMPLATE_HILL01,
#endif
TEMPLATE_COUNT,
code/redalert/display.cpp
+1 -1
View File
@@ -599,7 +599,7 @@ void DisplayClass::Set_View_Dimensions(int x, int y, int width, int height)
}
if (cellDisplayCache == NULL) {
cellDisplayCache = new CellCache_t[MAP_CELL_W * MAP_CELL_H];
cellDisplayCache = new CellCache_t[MAP_CELL_W * MAP_CELL_H * 2];
}
numCachedDisplayCells = 0;
code/redalert/mapedit.cpp
+5 -1
View File
@@ -84,6 +84,8 @@ extern int UnknownKey; // in menus.cpp
char MapEditClass::HealthBuf[20];
std::vector<ObjectTypeClass const*> MapEditClass::Objects[NUM_EDIT_CLASSES];
/***************************************************************************
* MapEditClass::MapEditClass -- class constructor *
* *
@@ -271,7 +273,9 @@ void MapEditClass::Clear_List(void)
** Set # object type ptrs to 0, set NumType for each type to 0
*/
for (int i = 0; i < NUM_EDIT_CLASSES; i++) {
Objects[i].clear();
if (Objects[i].size() > 0) {
Objects[i].clear();
}
}
}
code/redalert/mapedit.h
+1 -1
View File
@@ -264,7 +264,7 @@ class MapEditClass : public MouseClass
*/
// ScenarioVarType ScenVar;
std::vector<ObjectTypeClass const*> Objects[NUM_EDIT_CLASSES];
static std::vector<ObjectTypeClass const*> Objects[NUM_EDIT_CLASSES];
/*
** Last-selected object to place, and last-selected house of object
code/redalert/reinf.cpp
+14 -14
View File
@@ -438,20 +438,20 @@ bool Do_Reinforcements(TeamTypeClass const * teamtype)
CELL cell = Map.Calculated_Cell(source, teamtype->Origin, -1, object->Techno_Type_Class()->Speed);
#ifdef FIXIT_ANTS
/*
** For the ants, they will pop out of the ant hill directly.
*/
if (teamtype->Origin != -1 && object->What_Am_I() == RTTI_UNIT &&
(*((UnitClass*)object) == UNIT_ANT1 ||
*((UnitClass*)object) == UNIT_ANT2 ||
*((UnitClass*)object) == UNIT_ANT3)) {
CELL newcell = Scen.Waypoint[teamtype->Origin];
if (newcell != -1) {
if (Map[newcell].TType == TEMPLATE_HILL01) {
cell = newcell;
}
}
}
///*
//** For the ants, they will pop out of the ant hill directly.
//*/
//if (teamtype->Origin != -1 && object->What_Am_I() == RTTI_UNIT &&
// (*((UnitClass*)object) == UNIT_ANT1 ||
// *((UnitClass*)object) == UNIT_ANT2 ||
// *((UnitClass*)object) == UNIT_ANT3)) {
// CELL newcell = Scen.Waypoint[teamtype->Origin];
// if (newcell != -1) {
// if (Map[newcell].TType == TEMPLATE_HILL01) {
// cell = newcell;
// }
// }
//}
#endif
CELL newcell = cell;