Add missing research items causing crashes in campaign. Closes ticket…

…:3977 and closes ticket:3974.
Warzone2100 · Mar 11, 2013 · 2753aaa · 2753aaa
1 parent c1b4cad
commit 2753aaa
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 3 deletions.
diff --git a/data/base/stats/research_cam1.ini b/data/base/stats/research_cam1.ini
@@ -19,6 +19,17 @@
     ;resultFunctions = <comma-separated list>
     ;replacedComponents = <comma-separated list of items <oldComponentID:newComponentID>>
 
+[R-Vehicle-Prop-Tracks]
+name = "Tracked Propulsion"
+researchPoints = 2400
+researchPower = 75
+keyTopic = 1
+msgName = RES_TRACK1
+iconID = IMAGE_RES_DROIDTECH
+statID = tracked01
+requiredResearch = R-Sys-Engineering01,R-Vehicle-Prop-Halftracks
+resultComponents = tracked01
+
 [R-Vehicle-Prop-Hover]
 name = "Hover Propulsion"
 researchPoints = 3600

diff --git a/data/base/stats/research_cam2.ini b/data/base/stats/research_cam2.ini
@@ -19,6 +19,16 @@
     ;resultFunctions = <comma-separated list>
     ;replacedComponents = <comma-separated list of items <oldComponentID:newComponentID>>
 
+[R-Wpn-Rocket01-LtAT]
+name = "Lancer AT Rocket"
+researchPoints = 3600
+researchPower = 112
+keyTopic = 0
+msgName = RES_W_RK_LTAT1
+iconID = IMAGE_RES_WEAPONTECH
+statID = Rocket-LtA-T
+resultComponents = Rocket-LtA-T,Rocket-VTOL-LtA-T
+
 [R-Defense-HardcreteWall]
 name = "Hardcrete"
 researchPoints = 600

diff --git a/data/base/stats/research_cam3.ini b/data/base/stats/research_cam3.ini
@@ -19,6 +19,16 @@
     ;resultFunctions = <comma-separated list>
     ;replacedComponents = <comma-separated list of items <oldComponentID:newComponentID>>
 
+[R-Wpn-Rocket01-LtAT]
+name = "Lancer AT Rocket"
+researchPoints = 3600
+researchPower = 112
+keyTopic = 0
+msgName = RES_W_RK_LTAT1
+iconID = IMAGE_RES_WEAPONTECH
+statID = Rocket-LtA-T
+resultComponents = Rocket-LtA-T,Rocket-VTOL-LtA-T
+
 [R-Defense-HardcreteWall]
 name = "Hardcrete"
 researchPoints = 600

diff --git a/src/research.cpp b/src/research.cpp
@@ -1536,6 +1536,8 @@ bool enableResearch(RESEARCH *psResearch, UDWORD player)
 {
 	UDWORD				inc;
 
+	ASSERT_OR_RETURN(false, psResearch, "No such research topic");
+
 	inc = psResearch->index;
 	if (inc > asResearch.size())
 	{

diff --git a/src/scriptfuncs.cpp b/src/scriptfuncs.cpp
@@ -3994,6 +3994,7 @@ bool scrEnableResearch(void)
 	}
 
 	ASSERT_OR_RETURN(false, player >= 0 && player < MAX_PLAYERS, "Invalid player number");
+	ASSERT_OR_RETURN(false, psResearch, "Research topic specified not found");
 
 	if (!enableResearch(psResearch, player))
 	{

diff --git a/src/scriptvals_parser.ypp b/src/scriptvals_parser.ypp
@@ -706,13 +706,11 @@ var_init:		var_entry TYPE var_value
 							YYABORT;
 						}
 						data.v.oval = getResearch($3.pString);	/* store pointer */
-#if 0
 						if (data.v.oval == NULL)
 						{
 							yyerror("Research %s not found", $3.pString);
-							YYABORT;
+							// YYABORT;
 						}
-#endif
 						if(!eventSetContextVar(psCurrContext, $1, &data))
 						{
 							yyerror("Set Value Failed for %u", $1);