From b72170fd11588f0b6ecac2d5fc54e49ba9e68f06 Mon Sep 17 00:00:00 2001 From: Justin Marshall Date: Thu, 23 Jul 2020 13:37:21 -0700 Subject: [PATCH] Cleaned up cdata. --- code/redalert/cdata.cpp | 1038 +------------------------------------ code/redalert/defines.h | 156 ------ code/redalert/display.cpp | 2 +- code/redalert/mapedit.cpp | 6 +- code/redalert/mapedit.h | 2 +- code/redalert/reinf.cpp | 28 +- 6 files changed, 22 insertions(+), 1210 deletions(-) diff --git a/code/redalert/cdata.cpp b/code/redalert/cdata.cpp index b79143f..b31c019 100644 --- a/code/redalert/cdata.cpp +++ b/code/redalert/cdata.cpp @@ -1187,900 +1187,6 @@ static TemplateTypeClass const RiverCliff04( TXT_RIVER ); -static TemplateTypeClass const F01( - TEMPLATE_F01, - THEATERF_TEMPERATE|THEATERF_SNOW, - "F01", - TXT_RIVER -); -static TemplateTypeClass const F02( - TEMPLATE_F02, - THEATERF_TEMPERATE|THEATERF_SNOW, - "F02", - TXT_RIVER -); -static TemplateTypeClass const F03( - TEMPLATE_F03, - THEATERF_TEMPERATE|THEATERF_SNOW, - "F03", - TXT_RIVER -); -static TemplateTypeClass const F04( - TEMPLATE_F04, - THEATERF_TEMPERATE|THEATERF_SNOW, - "F04", - TXT_RIVER -); -static TemplateTypeClass const F05( - TEMPLATE_F05, - THEATERF_TEMPERATE|THEATERF_SNOW, - "F05", - TXT_RIVER -); -static TemplateTypeClass const F06( - TEMPLATE_F06, - THEATERF_TEMPERATE|THEATERF_SNOW, - "F06", - TXT_RIVER -); - -static TemplateTypeClass const ARRO0001( - TEMPLATE_ARRO0001, - THEATERF_INTERIOR, - "ARRO0001", - TXT_INTERIOR -); -static TemplateTypeClass const ARRO0002( - TEMPLATE_ARRO0002, - THEATERF_INTERIOR, - "ARRO0002", - TXT_INTERIOR -); -static TemplateTypeClass const ARRO0003( - TEMPLATE_ARRO0003, - THEATERF_INTERIOR, - "ARRO0003", - TXT_INTERIOR -); -static TemplateTypeClass const ARRO0004( - TEMPLATE_ARRO0004, - THEATERF_INTERIOR, - "ARRO0004", - TXT_INTERIOR -); -static TemplateTypeClass const ARRO0005( - TEMPLATE_ARRO0005, - THEATERF_INTERIOR, - "ARRO0005", - TXT_INTERIOR -); -static TemplateTypeClass const ARRO0006( - TEMPLATE_ARRO0006, - THEATERF_INTERIOR, - "ARRO0006", - TXT_INTERIOR -); -static TemplateTypeClass const ARRO0007( - TEMPLATE_ARRO0007, - THEATERF_INTERIOR, - "ARRO0007", - TXT_INTERIOR -); -static TemplateTypeClass const ARRO0008( - TEMPLATE_ARRO0008, - THEATERF_INTERIOR, - "ARRO0008", - TXT_INTERIOR -); -static TemplateTypeClass const ARRO0009( - TEMPLATE_ARRO0009, - THEATERF_INTERIOR, - "ARRO0009", - TXT_INTERIOR -); -static TemplateTypeClass const ARRO0010( - TEMPLATE_ARRO0010, - THEATERF_INTERIOR, - "ARRO0010", - TXT_INTERIOR -); -static TemplateTypeClass const ARRO0011( - TEMPLATE_ARRO0011, - THEATERF_INTERIOR, - "ARRO0011", - TXT_INTERIOR -); -static TemplateTypeClass const ARRO0012( - TEMPLATE_ARRO0012, - THEATERF_INTERIOR, - "ARRO0012", - TXT_INTERIOR -); -static TemplateTypeClass const ARRO0013( - TEMPLATE_ARRO0013, - THEATERF_INTERIOR, - "ARRO0013", - TXT_INTERIOR -); -static TemplateTypeClass const ARRO0014( - TEMPLATE_ARRO0014, - THEATERF_INTERIOR, - "ARRO0014", - TXT_INTERIOR -); -static TemplateTypeClass const ARRO0015( - TEMPLATE_ARRO0015, - THEATERF_INTERIOR, - "ARRO0015", - TXT_INTERIOR -); -static TemplateTypeClass const FLOR0001( - TEMPLATE_FLOR0001, - THEATERF_INTERIOR, - "FLOR0001", - TXT_INTERIOR -); -static TemplateTypeClass const FLOR0002( - TEMPLATE_FLOR0002, - THEATERF_INTERIOR, - "FLOR0002", - TXT_INTERIOR -); -static TemplateTypeClass const FLOR0003( - TEMPLATE_FLOR0003, - THEATERF_INTERIOR, - "FLOR0003", - TXT_INTERIOR -); -static TemplateTypeClass const FLOR0004( - TEMPLATE_FLOR0004, - THEATERF_INTERIOR, - "FLOR0004", - TXT_INTERIOR -); -static TemplateTypeClass const FLOR0005( - TEMPLATE_FLOR0005, - THEATERF_INTERIOR, - "FLOR0005", - TXT_INTERIOR -); -static TemplateTypeClass const FLOR0006( - TEMPLATE_FLOR0006, - THEATERF_INTERIOR, - "FLOR0006", - TXT_INTERIOR -); -static TemplateTypeClass const FLOR0007( - TEMPLATE_FLOR0007, - THEATERF_INTERIOR, - "FLOR0007", - TXT_INTERIOR -); -static TemplateTypeClass const GFLR0001( - TEMPLATE_GFLR0001, - THEATERF_INTERIOR, - "GFLR0001", - TXT_INTERIOR -); -static TemplateTypeClass const GFLR0002( - TEMPLATE_GFLR0002, - THEATERF_INTERIOR, - "GFLR0002", - TXT_INTERIOR -); -static TemplateTypeClass const GFLR0003( - TEMPLATE_GFLR0003, - THEATERF_INTERIOR, - "GFLR0003", - TXT_INTERIOR -); -static TemplateTypeClass const GFLR0004( - TEMPLATE_GFLR0004, - THEATERF_INTERIOR, - "GFLR0004", - TXT_INTERIOR -); -static TemplateTypeClass const GFLR0005( - TEMPLATE_GFLR0005, - THEATERF_INTERIOR, - "GFLR0005", - TXT_INTERIOR -); -static TemplateTypeClass const GSTR0001( - TEMPLATE_GSTR0001, - THEATERF_INTERIOR, - "GSTR0001", - TXT_INTERIOR -); -static TemplateTypeClass const GSTR0002( - TEMPLATE_GSTR0002, - THEATERF_INTERIOR, - "GSTR0002", - TXT_INTERIOR -); -static TemplateTypeClass const GSTR0003( - TEMPLATE_GSTR0003, - THEATERF_INTERIOR, - "GSTR0003", - TXT_INTERIOR -); -static TemplateTypeClass const GSTR0004( - TEMPLATE_GSTR0004, - THEATERF_INTERIOR, - "GSTR0004", - TXT_INTERIOR -); -static TemplateTypeClass const GSTR0005( - TEMPLATE_GSTR0005, - THEATERF_INTERIOR, - "GSTR0005", - TXT_INTERIOR -); -static TemplateTypeClass const GSTR0006( - TEMPLATE_GSTR0006, - THEATERF_INTERIOR, - "GSTR0006", - TXT_INTERIOR -); -static TemplateTypeClass const GSTR0007( - TEMPLATE_GSTR0007, - THEATERF_INTERIOR, - "GSTR0007", - TXT_INTERIOR -); -static TemplateTypeClass const GSTR0008( - TEMPLATE_GSTR0008, - THEATERF_INTERIOR, - "GSTR0008", - TXT_INTERIOR -); -static TemplateTypeClass const GSTR0009( - TEMPLATE_GSTR0009, - THEATERF_INTERIOR, - "GSTR0009", - TXT_INTERIOR -); -static TemplateTypeClass const GSTR0010( - TEMPLATE_GSTR0010, - THEATERF_INTERIOR, - "GSTR0010", - TXT_INTERIOR -); -static TemplateTypeClass const GSTR0011( - TEMPLATE_GSTR0011, - THEATERF_INTERIOR, - "GSTR0011", - TXT_INTERIOR -); -static TemplateTypeClass const LWAL0001( - TEMPLATE_LWAL0001, - THEATERF_INTERIOR, - "LWAL0001", - TXT_INTERIOR -); -static TemplateTypeClass const LWAL0002( - TEMPLATE_LWAL0002, - THEATERF_INTERIOR, - "LWAL0002", - TXT_INTERIOR -); -static TemplateTypeClass const LWAL0003( - TEMPLATE_LWAL0003, - THEATERF_INTERIOR, - "LWAL0003", - TXT_INTERIOR -); -static TemplateTypeClass const LWAL0004( - TEMPLATE_LWAL0004, - THEATERF_INTERIOR, - "LWAL0004", - TXT_INTERIOR -); -static TemplateTypeClass const LWAL0005( - TEMPLATE_LWAL0005, - THEATERF_INTERIOR, - "LWAL0005", - TXT_INTERIOR -); -static TemplateTypeClass const LWAL0006( - TEMPLATE_LWAL0006, - THEATERF_INTERIOR, - "LWAL0006", - TXT_INTERIOR -); -static TemplateTypeClass const LWAL0007( - TEMPLATE_LWAL0007, - THEATERF_INTERIOR, - "LWAL0007", - TXT_INTERIOR -); -static TemplateTypeClass const LWAL0008( - TEMPLATE_LWAL0008, - THEATERF_INTERIOR, - "LWAL0008", - TXT_INTERIOR -); -static TemplateTypeClass const LWAL0009( - TEMPLATE_LWAL0009, - THEATERF_INTERIOR, - "LWAL0009", - TXT_INTERIOR -); -static TemplateTypeClass const LWAL0010( - TEMPLATE_LWAL0010, - THEATERF_INTERIOR, - "LWAL0010", - TXT_INTERIOR -); -static TemplateTypeClass const LWAL0011( - TEMPLATE_LWAL0011, - THEATERF_INTERIOR, - "LWAL0011", - TXT_INTERIOR -); -static TemplateTypeClass const LWAL0012( - TEMPLATE_LWAL0012, - THEATERF_INTERIOR, - "LWAL0012", - TXT_INTERIOR -); -static TemplateTypeClass const LWAL0013( - TEMPLATE_LWAL0013, - THEATERF_INTERIOR, - "LWAL0013", - TXT_INTERIOR -); -static TemplateTypeClass const LWAL0014( - TEMPLATE_LWAL0014, - THEATERF_INTERIOR, - "LWAL0014", - TXT_INTERIOR -); -static TemplateTypeClass const LWAL0015( - TEMPLATE_LWAL0015, - THEATERF_INTERIOR, - "LWAL0015", - TXT_INTERIOR -); -static TemplateTypeClass const LWAL0016( - TEMPLATE_LWAL0016, - THEATERF_INTERIOR, - "LWAL0016", - TXT_INTERIOR -); -static TemplateTypeClass const LWAL0017( - TEMPLATE_LWAL0017, - THEATERF_INTERIOR, - "LWAL0017", - TXT_INTERIOR -); -static TemplateTypeClass const LWAL0018( - TEMPLATE_LWAL0018, - THEATERF_INTERIOR, - "LWAL0018", - TXT_INTERIOR -); -static TemplateTypeClass const LWAL0019( - TEMPLATE_LWAL0019, - THEATERF_INTERIOR, - "LWAL0019", - TXT_INTERIOR -); -static TemplateTypeClass const LWAL0020( - TEMPLATE_LWAL0020, - THEATERF_INTERIOR, - "LWAL0020", - TXT_INTERIOR -); -static TemplateTypeClass const LWAL0021( - TEMPLATE_LWAL0021, - THEATERF_INTERIOR, - "LWAL0021", - TXT_INTERIOR -); -static TemplateTypeClass const LWAL0022( - TEMPLATE_LWAL0022, - THEATERF_INTERIOR, - "LWAL0022", - TXT_INTERIOR -); -static TemplateTypeClass const LWAL0023( - TEMPLATE_LWAL0023, - THEATERF_INTERIOR, - "LWAL0023", - TXT_INTERIOR -); -static TemplateTypeClass const LWAL0024( - TEMPLATE_LWAL0024, - THEATERF_INTERIOR, - "LWAL0024", - TXT_INTERIOR -); -static TemplateTypeClass const LWAL0025( - TEMPLATE_LWAL0025, - THEATERF_INTERIOR, - "LWAL0025", - TXT_INTERIOR -); -static TemplateTypeClass const LWAL0026( - TEMPLATE_LWAL0026, - THEATERF_INTERIOR, - "LWAL0026", - TXT_INTERIOR -); -static TemplateTypeClass const LWAL0027( - TEMPLATE_LWAL0027, - THEATERF_INTERIOR, - "LWAL0027", - TXT_INTERIOR -); -static TemplateTypeClass const STRP0001( - TEMPLATE_STRP0001, - THEATERF_INTERIOR, - "STRP0001", - TXT_INTERIOR -); -static TemplateTypeClass const STRP0002( - TEMPLATE_STRP0002, - THEATERF_INTERIOR, - "STRP0002", - TXT_INTERIOR -); -static TemplateTypeClass const STRP0003( - TEMPLATE_STRP0003, - THEATERF_INTERIOR, - "STRP0003", - TXT_INTERIOR -); -static TemplateTypeClass const STRP0004( - TEMPLATE_STRP0004, - THEATERF_INTERIOR, - "STRP0004", - TXT_INTERIOR -); -static TemplateTypeClass const STRP0005( - TEMPLATE_STRP0005, - THEATERF_INTERIOR, - "STRP0005", - TXT_INTERIOR -); -static TemplateTypeClass const STRP0006( - TEMPLATE_STRP0006, - THEATERF_INTERIOR, - "STRP0006", - TXT_INTERIOR -); -static TemplateTypeClass const STRP0007( - TEMPLATE_STRP0007, - THEATERF_INTERIOR, - "STRP0007", - TXT_INTERIOR -); -static TemplateTypeClass const STRP0008( - TEMPLATE_STRP0008, - THEATERF_INTERIOR, - "STRP0008", - TXT_INTERIOR -); -static TemplateTypeClass const STRP0009( - TEMPLATE_STRP0009, - THEATERF_INTERIOR, - "STRP0009", - TXT_INTERIOR -); -static TemplateTypeClass const STRP0010( - TEMPLATE_STRP0010, - THEATERF_INTERIOR, - "STRP0010", - TXT_INTERIOR -); -static TemplateTypeClass const STRP0011( - TEMPLATE_STRP0011, - THEATERF_INTERIOR, - "STRP0011", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0001( - TEMPLATE_WALL0001, - THEATERF_INTERIOR, - "WALL0001", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0002( - TEMPLATE_WALL0002, - THEATERF_INTERIOR, - "WALL0002", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0003( - TEMPLATE_WALL0003, - THEATERF_INTERIOR, - "WALL0003", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0004( - TEMPLATE_WALL0004, - THEATERF_INTERIOR, - "WALL0004", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0005( - TEMPLATE_WALL0005, - THEATERF_INTERIOR, - "WALL0005", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0006( - TEMPLATE_WALL0006, - THEATERF_INTERIOR, - "WALL0006", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0007( - TEMPLATE_WALL0007, - THEATERF_INTERIOR, - "WALL0007", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0008( - TEMPLATE_WALL0008, - THEATERF_INTERIOR, - "WALL0008", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0009( - TEMPLATE_WALL0009, - THEATERF_INTERIOR, - "WALL0009", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0010( - TEMPLATE_WALL0010, - THEATERF_INTERIOR, - "WALL0010", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0011( - TEMPLATE_WALL0011, - THEATERF_INTERIOR, - "WALL0011", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0012( - TEMPLATE_WALL0012, - THEATERF_INTERIOR, - "WALL0012", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0013( - TEMPLATE_WALL0013, - THEATERF_INTERIOR, - "WALL0013", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0014( - TEMPLATE_WALL0014, - THEATERF_INTERIOR, - "WALL0014", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0015( - TEMPLATE_WALL0015, - THEATERF_INTERIOR, - "WALL0015", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0016( - TEMPLATE_WALL0016, - THEATERF_INTERIOR, - "WALL0016", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0017( - TEMPLATE_WALL0017, - THEATERF_INTERIOR, - "WALL0017", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0018( - TEMPLATE_WALL0018, - THEATERF_INTERIOR, - "WALL0018", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0019( - TEMPLATE_WALL0019, - THEATERF_INTERIOR, - "WALL0019", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0020( - TEMPLATE_WALL0020, - THEATERF_INTERIOR, - "WALL0020", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0021( - TEMPLATE_WALL0021, - THEATERF_INTERIOR, - "WALL0021", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0022( - TEMPLATE_WALL0022, - THEATERF_INTERIOR, - "WALL0022", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0023( - TEMPLATE_WALL0023, - THEATERF_INTERIOR, - "WALL0023", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0024( - TEMPLATE_WALL0024, - THEATERF_INTERIOR, - "WALL0024", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0025( - TEMPLATE_WALL0025, - THEATERF_INTERIOR, - "WALL0025", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0026( - TEMPLATE_WALL0026, - THEATERF_INTERIOR, - "WALL0026", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0027( - TEMPLATE_WALL0027, - THEATERF_INTERIOR, - "WALL0027", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0028( - TEMPLATE_WALL0028, - THEATERF_INTERIOR, - "WALL0028", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0029( - TEMPLATE_WALL0029, - THEATERF_INTERIOR, - "WALL0029", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0030( - TEMPLATE_WALL0030, - THEATERF_INTERIOR, - "WALL0030", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0031( - TEMPLATE_WALL0031, - THEATERF_INTERIOR, - "WALL0031", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0032( - TEMPLATE_WALL0032, - THEATERF_INTERIOR, - "WALL0032", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0033( - TEMPLATE_WALL0033, - THEATERF_INTERIOR, - "WALL0033", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0034( - TEMPLATE_WALL0034, - THEATERF_INTERIOR, - "WALL0034", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0035( - TEMPLATE_WALL0035, - THEATERF_INTERIOR, - "WALL0035", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0036( - TEMPLATE_WALL0036, - THEATERF_INTERIOR, - "WALL0036", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0037( - TEMPLATE_WALL0037, - THEATERF_INTERIOR, - "WALL0037", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0038( - TEMPLATE_WALL0038, - THEATERF_INTERIOR, - "WALL0038", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0039( - TEMPLATE_WALL0039, - THEATERF_INTERIOR, - "WALL0039", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0040( - TEMPLATE_WALL0040, - THEATERF_INTERIOR, - "WALL0040", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0041( - TEMPLATE_WALL0041, - THEATERF_INTERIOR, - "WALL0041", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0042( - TEMPLATE_WALL0042, - THEATERF_INTERIOR, - "WALL0042", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0043( - TEMPLATE_WALL0043, - THEATERF_INTERIOR, - "WALL0043", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0044( - TEMPLATE_WALL0044, - THEATERF_INTERIOR, - "WALL0044", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0045( - TEMPLATE_WALL0045, - THEATERF_INTERIOR, - "WALL0045", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0046( - TEMPLATE_WALL0046, - THEATERF_INTERIOR, - "WALL0046", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0047( - TEMPLATE_WALL0047, - THEATERF_INTERIOR, - "WALL0047", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0048( - TEMPLATE_WALL0048, - THEATERF_INTERIOR, - "WALL0048", - TXT_INTERIOR -); -static TemplateTypeClass const WALL0049( - TEMPLATE_WALL0049, - THEATERF_INTERIOR, - "WALL0049", - TXT_INTERIOR -); - -//static TemplateTypeClass const Xtra0001( -// TEMPLATE_XTRA0001, -// THEATERF_INTERIOR, -// "XTRA0001", -// TXT_INTERIOR -//); -//static TemplateTypeClass const Xtra0002( -// TEMPLATE_XTRA0002, -// THEATERF_INTERIOR, -// "XTRA0002", -// TXT_INTERIOR -//); -//static TemplateTypeClass const Xtra0003( -// TEMPLATE_XTRA0003, -// THEATERF_INTERIOR, -// "XTRA0003", -// TXT_INTERIOR -//); -//static TemplateTypeClass const Xtra0004( -// TEMPLATE_XTRA0004, -// THEATERF_INTERIOR, -// "XTRA0004", -// TXT_INTERIOR -//); -//static TemplateTypeClass const Xtra0005( -// TEMPLATE_XTRA0005, -// THEATERF_INTERIOR, -// "XTRA0005", -// TXT_INTERIOR -//); -//static TemplateTypeClass const Xtra0006( -// TEMPLATE_XTRA0006, -// THEATERF_INTERIOR, -// "XTRA0006", -// TXT_INTERIOR -//); -//static TemplateTypeClass const Xtra0007( -// TEMPLATE_XTRA0007, -// THEATERF_INTERIOR, -// "XTRA0007", -// TXT_INTERIOR -//); -//static TemplateTypeClass const Xtra0008( -// TEMPLATE_XTRA0008, -// THEATERF_INTERIOR, -// "XTRA0008", -// TXT_INTERIOR -//); -//static TemplateTypeClass const Xtra0009( -// TEMPLATE_XTRA0009, -// THEATERF_INTERIOR, -// "XTRA0009", -// TXT_INTERIOR -//); -//static TemplateTypeClass const Xtra0010( -// TEMPLATE_XTRA0010, -// THEATERF_INTERIOR, -// "XTRA0010", -// TXT_INTERIOR -//); -//static TemplateTypeClass const Xtra0011( -// TEMPLATE_XTRA0011, -// THEATERF_INTERIOR, -// "XTRA0011", -// TXT_INTERIOR -//); -//static TemplateTypeClass const Xtra0012( -// TEMPLATE_XTRA0012, -// THEATERF_INTERIOR, -// "XTRA0012", -// TXT_INTERIOR -//); -//static TemplateTypeClass const Xtra0013( -// TEMPLATE_XTRA0013, -// THEATERF_INTERIOR, -// "XTRA0013", -// TXT_INTERIOR -//); -//static TemplateTypeClass const Xtra0014( -// TEMPLATE_XTRA0014, -// THEATERF_INTERIOR, -// "XTRA0014", -// TXT_INTERIOR -//); -//static TemplateTypeClass const Xtra0015( -// TEMPLATE_XTRA0015, -// THEATERF_INTERIOR, -// "XTRA0015", -// TXT_INTERIOR -//); -//static TemplateTypeClass const Xtra0016( -// TEMPLATE_XTRA0016, -// THEATERF_INTERIOR, -// "XTRA0016", -// TXT_INTERIOR -//); - -#ifdef FIXIT_ANTS -static TemplateTypeClass const AntHill( - TEMPLATE_HILL01, - THEATERF_TEMPERATE, - "HILL01", - TXT_ROCK -); -#endif - /*********************************************************************************************** * TemplateTypeClass::TemplateTypeClass -- Constructor for template type objects. * * * @@ -2348,146 +1454,12 @@ void TemplateTypeClass::Init_Heap(void) (void)new TemplateTypeClass(Bridge3d); // TEMPLATE_BRIDGE_3D (void)new TemplateTypeClass(Bridge3e); // TEMPLATE_BRIDGE_3E (void)new TemplateTypeClass(Bridge3f); // TEMPLATE_BRIDGE_3F - (void)new TemplateTypeClass(F01); // TEMPLATE_F01 - (void)new TemplateTypeClass(F02); // TEMPLATE_F02 - (void)new TemplateTypeClass(F03); // TEMPLATE_F03 - (void)new TemplateTypeClass(F04); // TEMPLATE_F04 - (void)new TemplateTypeClass(F05); // TEMPLATE_F05 - (void)new TemplateTypeClass(F06); // TEMPLATE_F06 - (void)new TemplateTypeClass(ARRO0001); // TEMPLATE_ARRO0001 - (void)new TemplateTypeClass(ARRO0002); // TEMPLATE_ARRO0002 - (void)new TemplateTypeClass(ARRO0003); // TEMPLATE_ARRO0003 - (void)new TemplateTypeClass(ARRO0004); // TEMPLATE_ARRO0004 - (void)new TemplateTypeClass(ARRO0005); // TEMPLATE_ARRO0005 - (void)new TemplateTypeClass(ARRO0006); // TEMPLATE_ARRO0006 - (void)new TemplateTypeClass(ARRO0007); // TEMPLATE_ARRO0007 - (void)new TemplateTypeClass(ARRO0008); // TEMPLATE_ARRO0008 - (void)new TemplateTypeClass(ARRO0009); // TEMPLATE_ARRO0009 - (void)new TemplateTypeClass(ARRO0010); // TEMPLATE_ARRO0010 - (void)new TemplateTypeClass(ARRO0011); // TEMPLATE_ARRO0011 - (void)new TemplateTypeClass(ARRO0012); // TEMPLATE_ARRO0012 - (void)new TemplateTypeClass(ARRO0013); // TEMPLATE_ARRO0013 - (void)new TemplateTypeClass(ARRO0014); // TEMPLATE_ARRO0014 - (void)new TemplateTypeClass(ARRO0015); // TEMPLATE_ARRO0015 - (void)new TemplateTypeClass(FLOR0001); // TEMPLATE_FLOR0001 - (void)new TemplateTypeClass(FLOR0002); // TEMPLATE_FLOR0002 - (void)new TemplateTypeClass(FLOR0003); // TEMPLATE_FLOR0003 - (void)new TemplateTypeClass(FLOR0004); // TEMPLATE_FLOR0004 - (void)new TemplateTypeClass(FLOR0005); // TEMPLATE_FLOR0005 - (void)new TemplateTypeClass(FLOR0006); // TEMPLATE_FLOR0006 - (void)new TemplateTypeClass(FLOR0007); // TEMPLATE_FLOR0007 - (void)new TemplateTypeClass(GFLR0001); // TEMPLATE_GFLR0001 - (void)new TemplateTypeClass(GFLR0002); // TEMPLATE_GFLR0002 - (void)new TemplateTypeClass(GFLR0003); // TEMPLATE_GFLR0003 - (void)new TemplateTypeClass(GFLR0004); // TEMPLATE_GFLR0004 - (void)new TemplateTypeClass(GFLR0005); // TEMPLATE_GFLR0005 - (void)new TemplateTypeClass(GSTR0001); // TEMPLATE_GSTR0001 - (void)new TemplateTypeClass(GSTR0002); // TEMPLATE_GSTR0002 - (void)new TemplateTypeClass(GSTR0003); // TEMPLATE_GSTR0003 - (void)new TemplateTypeClass(GSTR0004); // TEMPLATE_GSTR0004 - (void)new TemplateTypeClass(GSTR0005); // TEMPLATE_GSTR0005 - (void)new TemplateTypeClass(GSTR0006); // TEMPLATE_GSTR0006 - (void)new TemplateTypeClass(GSTR0007); // TEMPLATE_GSTR0007 - (void)new TemplateTypeClass(GSTR0008); // TEMPLATE_GSTR0008 - (void)new TemplateTypeClass(GSTR0009); // TEMPLATE_GSTR0009 - (void)new TemplateTypeClass(GSTR0010); // TEMPLATE_GSTR0010 - (void)new TemplateTypeClass(GSTR0011); // TEMPLATE_GSTR0011 - (void)new TemplateTypeClass(LWAL0001); // TEMPLATE_LWAL0001 - (void)new TemplateTypeClass(LWAL0002); // TEMPLATE_LWAL0002 - (void)new TemplateTypeClass(LWAL0003); // TEMPLATE_LWAL0003 - (void)new TemplateTypeClass(LWAL0004); // TEMPLATE_LWAL0004 - (void)new TemplateTypeClass(LWAL0005); // TEMPLATE_LWAL0005 - (void)new TemplateTypeClass(LWAL0006); // TEMPLATE_LWAL0006 - (void)new TemplateTypeClass(LWAL0007); // TEMPLATE_LWAL0007 - (void)new TemplateTypeClass(LWAL0008); // TEMPLATE_LWAL0008 - (void)new TemplateTypeClass(LWAL0009); // TEMPLATE_LWAL0009 - (void)new TemplateTypeClass(LWAL0010); // TEMPLATE_LWAL0010 - (void)new TemplateTypeClass(LWAL0011); // TEMPLATE_LWAL0011 - (void)new TemplateTypeClass(LWAL0012); // TEMPLATE_LWAL0012 - (void)new TemplateTypeClass(LWAL0013); // TEMPLATE_LWAL0013 - (void)new TemplateTypeClass(LWAL0014); // TEMPLATE_LWAL0014 - (void)new TemplateTypeClass(LWAL0015); // TEMPLATE_LWAL0015 - (void)new TemplateTypeClass(LWAL0016); // TEMPLATE_LWAL0016 - (void)new TemplateTypeClass(LWAL0017); // TEMPLATE_LWAL0017 - (void)new TemplateTypeClass(LWAL0018); // TEMPLATE_LWAL0018 - (void)new TemplateTypeClass(LWAL0019); // TEMPLATE_LWAL0019 - (void)new TemplateTypeClass(LWAL0020); // TEMPLATE_LWAL0020 - (void)new TemplateTypeClass(LWAL0021); // TEMPLATE_LWAL0021 - (void)new TemplateTypeClass(LWAL0022); // TEMPLATE_LWAL0022 - (void)new TemplateTypeClass(LWAL0023); // TEMPLATE_LWAL0023 - (void)new TemplateTypeClass(LWAL0024); // TEMPLATE_LWAL0024 - (void)new TemplateTypeClass(LWAL0025); // TEMPLATE_LWAL0025 - (void)new TemplateTypeClass(LWAL0026); // TEMPLATE_LWAL0026 - (void)new TemplateTypeClass(LWAL0027); // TEMPLATE_LWAL0027 - (void)new TemplateTypeClass(STRP0001); // TEMPLATE_STRP0001 - (void)new TemplateTypeClass(STRP0002); // TEMPLATE_STRP0002 - (void)new TemplateTypeClass(STRP0003); // TEMPLATE_STRP0003 - (void)new TemplateTypeClass(STRP0004); // TEMPLATE_STRP0004 - (void)new TemplateTypeClass(STRP0005); // TEMPLATE_STRP0005 - (void)new TemplateTypeClass(STRP0006); // TEMPLATE_STRP0006 - (void)new TemplateTypeClass(STRP0007); // TEMPLATE_STRP0007 - (void)new TemplateTypeClass(STRP0008); // TEMPLATE_STRP0008 - (void)new TemplateTypeClass(STRP0009); // TEMPLATE_STRP0009 - (void)new TemplateTypeClass(STRP0010); // TEMPLATE_STRP0010 - (void)new TemplateTypeClass(STRP0011); // TEMPLATE_STRP0011 - (void)new TemplateTypeClass(WALL0001); // TEMPLATE_WALL0001 - (void)new TemplateTypeClass(WALL0002); // TEMPLATE_WALL0002 - (void)new TemplateTypeClass(WALL0003); // TEMPLATE_WALL0003 - (void)new TemplateTypeClass(WALL0004); // TEMPLATE_WALL0004 - (void)new TemplateTypeClass(WALL0005); // TEMPLATE_WALL0005 - (void)new TemplateTypeClass(WALL0006); // TEMPLATE_WALL0006 - (void)new TemplateTypeClass(WALL0007); // TEMPLATE_WALL0007 - (void)new TemplateTypeClass(WALL0008); // TEMPLATE_WALL0008 - (void)new TemplateTypeClass(WALL0009); // TEMPLATE_WALL0009 - (void)new TemplateTypeClass(WALL0010); // TEMPLATE_WALL0010 - (void)new TemplateTypeClass(WALL0011); // TEMPLATE_WALL0011 - (void)new TemplateTypeClass(WALL0012); // TEMPLATE_WALL0012 - (void)new TemplateTypeClass(WALL0013); // TEMPLATE_WALL0013 - (void)new TemplateTypeClass(WALL0014); // TEMPLATE_WALL0014 - (void)new TemplateTypeClass(WALL0015); // TEMPLATE_WALL0015 - (void)new TemplateTypeClass(WALL0016); // TEMPLATE_WALL0016 - (void)new TemplateTypeClass(WALL0017); // TEMPLATE_WALL0017 - (void)new TemplateTypeClass(WALL0018); // TEMPLATE_WALL0018 - (void)new TemplateTypeClass(WALL0019); // TEMPLATE_WALL0019 - (void)new TemplateTypeClass(WALL0020); // TEMPLATE_WALL0020 - (void)new TemplateTypeClass(WALL0021); // TEMPLATE_WALL0021 - (void)new TemplateTypeClass(WALL0022); // TEMPLATE_WALL0022 - (void)new TemplateTypeClass(WALL0023); // TEMPLATE_WALL0023 - (void)new TemplateTypeClass(WALL0024); // TEMPLATE_WALL0024 - (void)new TemplateTypeClass(WALL0025); // TEMPLATE_WALL0025 - (void)new TemplateTypeClass(WALL0026); // TEMPLATE_WALL0026 - (void)new TemplateTypeClass(WALL0027); // TEMPLATE_WALL0027 - (void)new TemplateTypeClass(WALL0028); // TEMPLATE_WALL0028 - (void)new TemplateTypeClass(WALL0029); // TEMPLATE_WALL0029 - (void)new TemplateTypeClass(WALL0030); // TEMPLATE_WALL0030 - (void)new TemplateTypeClass(WALL0031); // TEMPLATE_WALL0031 - (void)new TemplateTypeClass(WALL0032); // TEMPLATE_WALL0032 - (void)new TemplateTypeClass(WALL0033); // TEMPLATE_WALL0033 - (void)new TemplateTypeClass(WALL0034); // TEMPLATE_WALL0034 - (void)new TemplateTypeClass(WALL0035); // TEMPLATE_WALL0035 - (void)new TemplateTypeClass(WALL0036); // TEMPLATE_WALL0036 - (void)new TemplateTypeClass(WALL0037); // TEMPLATE_WALL0037 - (void)new TemplateTypeClass(WALL0038); // TEMPLATE_WALL0038 - (void)new TemplateTypeClass(WALL0039); // TEMPLATE_WALL0039 - (void)new TemplateTypeClass(WALL0040); // TEMPLATE_WALL0040 - (void)new TemplateTypeClass(WALL0041); // TEMPLATE_WALL0041 - (void)new TemplateTypeClass(WALL0042); // TEMPLATE_WALL0042 - (void)new TemplateTypeClass(WALL0043); // TEMPLATE_WALL0043 - (void)new TemplateTypeClass(WALL0044); // TEMPLATE_WALL0044 - (void)new TemplateTypeClass(WALL0045); // TEMPLATE_WALL0045 - (void)new TemplateTypeClass(WALL0046); // TEMPLATE_WALL0046 - (void)new TemplateTypeClass(WALL0047); // TEMPLATE_WALL0047 - (void)new TemplateTypeClass(WALL0048); // TEMPLATE_WALL0048 - (void)new TemplateTypeClass(WALL0049); // TEMPLATE_WALL0049 (void)new TemplateTypeClass(Bridge1h); // TEMPLATE_BRIDGE1H (void)new TemplateTypeClass(Bridge2h); // TEMPLATE_BRIDGE2H - (void)new TemplateTypeClass(Bridge1ax); // TEMPLATE_BRIDGE_1AX (void)new TemplateTypeClass(Bridge2ax); // TEMPLATE_BRIDGE_2AX (void)new TemplateTypeClass(Bridge1x); // TEMPLATE_BRIDGE1X (void)new TemplateTypeClass(Bridge2x); // TEMPLATE_BRIDGE2X - - (void)new TemplateTypeClass(AntHill); // TEMPLATE_ROAD36 } @@ -2641,10 +1613,7 @@ void TemplateTypeClass::Init(TheaterType theater) for (TemplateType index = TEMPLATE_FIRST; index < TEMPLATE_COUNT; index++) { TemplateTypeClass& tplate = As_Reference(index); -// jmarshall - stupid hack - if (index >= TEMPLATE_BRIDGE_1A) - break; -// jmarshall - stupid hack + ((void const *&)tplate.ImageData) = NULL; if (tplate.Theater & (1<= TEMPLATE_BRIDGE_1A) - break; -// jmarshall - stupid hack - // jmarshall: get hdimage data. if (As_Reference(index).Get_HDImage_Data()) { Map.Add_To_List(&As_Reference(index)); diff --git a/code/redalert/defines.h b/code/redalert/defines.h index 32f3f39..dc13015 100644 --- a/code/redalert/defines.h +++ b/code/redalert/defines.h @@ -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, diff --git a/code/redalert/display.cpp b/code/redalert/display.cpp index be48243..8b714c4 100644 --- a/code/redalert/display.cpp +++ b/code/redalert/display.cpp @@ -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; diff --git a/code/redalert/mapedit.cpp b/code/redalert/mapedit.cpp index 7d26b43..545c817 100644 --- a/code/redalert/mapedit.cpp +++ b/code/redalert/mapedit.cpp @@ -84,6 +84,8 @@ extern int UnknownKey; // in menus.cpp char MapEditClass::HealthBuf[20]; +std::vector 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(); + } } } diff --git a/code/redalert/mapedit.h b/code/redalert/mapedit.h index af18d73..e3d79b2 100644 --- a/code/redalert/mapedit.h +++ b/code/redalert/mapedit.h @@ -264,7 +264,7 @@ class MapEditClass : public MouseClass */ // ScenarioVarType ScenVar; - std::vector Objects[NUM_EDIT_CLASSES]; + static std::vector Objects[NUM_EDIT_CLASSES]; /* ** Last-selected object to place, and last-selected house of object diff --git a/code/redalert/reinf.cpp b/code/redalert/reinf.cpp index 5dd9d22..feaacae 100644 --- a/code/redalert/reinf.cpp +++ b/code/redalert/reinf.cpp @@ -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;