Fix fatal error when transiting from cam1 to cam2.

The main problem was that rules.js was not loaded for missions not converted to javascript. Also an issue were some asserts that got triggered. The fix is to always load rules.js, even for wzscript missions. We may want to remove duplicate scripting code from the wzscript to avoid strange behaviours. Closes ticket:4323
Warzone2100 · Jan 1, 2016 · 6428123 · 6428123
1 parent c16081d
commit 6428123
Show file tree

Hide file tree

Showing 47 changed files with 130 additions and 9 deletions.
diff --git a/data/base/wrf/cam1/cam1a-c.wrf b/data/base/wrf/cam1/cam1a-c.wrf
@@ -19,3 +19,6 @@ file		SCRIPT		"cam1daynight.slo"
 directory       "script/data"
 file            SCRIPTVAL       "cam1a-c.vlo"
 file            SCRIPTVAL       "cam1night.vlo"
+
+directory "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam1/cam1end.wrf b/data/base/wrf/cam1/cam1end.wrf
@@ -18,3 +18,6 @@ file		SCRIPT		"cam1daynight.slo"
 directory       "script/data"
 file            SCRIPTVAL       "cam1end.vlo"
 file            SCRIPTVAL       "cam1day.vlo"
+
+directory "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam1/sub1-1.wrf b/data/base/wrf/cam1/sub1-1.wrf
@@ -22,3 +22,6 @@ directory       "script/data"
 file            SCRIPTVAL       "cam1-1.vlo"
 file            SCRIPTVAL       "cam1-1-ai.vlo"
 file            SCRIPTVAL       "cam1mkday.vlo"
+
+directory "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam1/sub1-1s.wrf b/data/base/wrf/cam1/sub1-1s.wrf
@@ -19,3 +19,6 @@ directory       "script/data"
 
 file            SCRIPTVAL       "cam1-1s.vlo"
 file            SCRIPTVAL       "cam1night.vlo"
+
+directory "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam1/sub1-5.wrf b/data/base/wrf/cam1/sub1-5.wrf
@@ -20,3 +20,6 @@ directory       "script/data"
 
 file            SCRIPTVAL       "cam1-5.vlo"
 file            SCRIPTVAL       "cam1mknight.vlo"
+
+directory "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam1/sub1-5s.wrf b/data/base/wrf/cam1/sub1-5s.wrf
@@ -19,3 +19,6 @@ directory       "script/data"
 
 file            SCRIPTVAL       "cam1-5s.vlo"
 file            SCRIPTVAL       "cam1day.vlo"
+
+directory "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam1/sub1-7.wrf b/data/base/wrf/cam1/sub1-7.wrf
@@ -20,3 +20,6 @@ directory       "script/data"
 
 file            SCRIPTVAL       "cam1-7.vlo"
 file            SCRIPTVAL       "cam1mkday.vlo"
+
+directory "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam1/sub1-7s.wrf b/data/base/wrf/cam1/sub1-7s.wrf
@@ -19,3 +19,6 @@ directory       "script/data"
 
 file            SCRIPTVAL       "cam1-7s.vlo"
 file            SCRIPTVAL       "cam1day.vlo"
+
+directory "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam1/sub1-d.wrf b/data/base/wrf/cam1/sub1-d.wrf
@@ -19,3 +19,6 @@ file		SCRIPT		"cam1daynight.slo"
 directory       "script/data"
 file            SCRIPTVAL       "cam1-d.vlo"
 file            SCRIPTVAL       "cam1mknight.vlo"
+
+directory "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam1/sub1-ds.wrf b/data/base/wrf/cam1/sub1-ds.wrf
@@ -19,3 +19,6 @@ file		SCRIPT		"cam1daynight.slo"
 directory       "script/data"
 file            SCRIPTVAL       "cam1-ds.vlo"
 file            SCRIPTVAL       "cam1day.vlo"
+
+directory "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam2/cam2a.wrf b/data/base/wrf/cam2/cam2a.wrf
@@ -28,3 +28,6 @@ file            SCRIPTVAL       "cam2ax.vlo"
 file            SCRIPTVAL       "vtols2a.vlo"
 file            SCRIPTVAL       "cam2arein.vlo"	
 file            SCRIPTVAL       "cam2tech.vlo"
+
+directory       "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam2/cam2b.wrf b/data/base/wrf/cam2/cam2b.wrf
@@ -23,3 +23,6 @@ file            SCRIPTVAL       "cam2b.vlo"
 file            SCRIPTVAL       "cam2bx.vlo"
 file            SCRIPTVAL       "vtols2b.vlo"
 file            SCRIPTVAL       "cam2day.vlo"
+
+directory       "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam2/cam2c.wrf b/data/base/wrf/cam2/cam2c.wrf
@@ -23,3 +23,6 @@ file            SCRIPTVAL       "cam2c.vlo"
 file		SCRIPTVAL	"cam2cx.vlo"
 file            SCRIPTVAL       "vtols2c.vlo"
 file            SCRIPTVAL       "cam2day.vlo"
+
+directory       "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam2/cam2end.wrf b/data/base/wrf/cam2/cam2end.wrf
@@ -19,3 +19,6 @@ file		SCRIPT		"cam2daynight.slo"
 directory       "script/data"
 file            SCRIPTVAL       "cam2endx.vlo"
 file            SCRIPTVAL       "cam2day.vlo"
+
+directory       "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam2/sub2-1.wrf b/data/base/wrf/cam2/sub2-1.wrf
@@ -19,3 +19,6 @@ directory       "script/data"
 file		SCRIPTVAL	"cam2-1x.vlo"
 file            SCRIPTVAL       "cam2-1.vlo"
 file            SCRIPTVAL       "cam2day.vlo"
+
+directory       "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam2/sub2-1s.wrf b/data/base/wrf/cam2/sub2-1s.wrf
@@ -16,3 +16,6 @@ file		SCRIPT		"cam2daynight.slo"
 directory       "script/data"
 file            SCRIPTVAL       "cam2-1s.vlo"
 file            SCRIPTVAL       "cam2day.vlo"
+
+directory       "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam2/sub2-2.wrf b/data/base/wrf/cam2/sub2-2.wrf
@@ -19,3 +19,6 @@ directory       "script/data"
 file            SCRIPTVAL       "cam2-2.vlo"
 file            SCRIPTVAL       "vtols2-2.vlo"
 file            SCRIPTVAL       "cam2day.vlo"
+
+directory       "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam2/sub2-2s.wrf b/data/base/wrf/cam2/sub2-2s.wrf
@@ -16,3 +16,6 @@ file		SCRIPT		"cam2daynight.slo"
 directory       "script/data"
 file            SCRIPTVAL       "cam2-2s.vlo"
 file            SCRIPTVAL       "cam2day.vlo"
+
+directory       "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam2/sub2-5.wrf b/data/base/wrf/cam2/sub2-5.wrf
@@ -17,3 +17,6 @@ file		SCRIPT		"cam2daynight.slo"
 directory       "script/data"
 file            SCRIPTVAL       "cam2-5.vlo"
 file            SCRIPTVAL       "cam2day.vlo"
+
+directory       "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam2/sub2-5s.wrf b/data/base/wrf/cam2/sub2-5s.wrf
@@ -19,3 +19,6 @@ directory       "script/binary"
 directory       "script/data"
 file            SCRIPTVAL       "cam2-5s.vlo"
 file            SCRIPTVAL       "cam2day.vlo"
+
+directory       "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam2/sub2-6.wrf b/data/base/wrf/cam2/sub2-6.wrf
@@ -17,3 +17,6 @@ file		SCRIPT		"cam2daynight.slo"
 directory       "script/data"
 file            SCRIPTVAL       "cam2-6.vlo"
 file            SCRIPTVAL       "cam2day.vlo"
+
+directory       "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam2/sub2-6s.wrf b/data/base/wrf/cam2/sub2-6s.wrf
@@ -16,3 +16,6 @@ file		SCRIPT		"cam2daynight.slo"
 directory       "script/data"
 file            SCRIPTVAL       "cam2-6s.vlo"
 file            SCRIPTVAL       "cam2day.vlo"
+
+directory       "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam2/sub2-7.wrf b/data/base/wrf/cam2/sub2-7.wrf
@@ -19,3 +19,6 @@ directory       "script/data"
 file            SCRIPTVAL       "cam2-7.vlo"
 file            SCRIPTVAL       "vtols2-7.vlo"
 file            SCRIPTVAL       "cam2day.vlo"
+
+directory       "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam2/sub2-7s.wrf b/data/base/wrf/cam2/sub2-7s.wrf
@@ -16,3 +16,6 @@ file		SCRIPT		"cam2daynight.slo"
 directory       "script/data"
 file            SCRIPTVAL       "cam2-7s.vlo"
 file            SCRIPTVAL       "cam2day.vlo"
+
+directory       "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam2/sub2-8.wrf b/data/base/wrf/cam2/sub2-8.wrf
@@ -19,3 +19,6 @@ directory       "script/data"
 file            SCRIPTVAL       "cam2-8.vlo"
 file            SCRIPTVAL       "vtols2-8.vlo"
 file            SCRIPTVAL       "cam2day.vlo"
+
+directory       "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam2/sub2-8s.wrf b/data/base/wrf/cam2/sub2-8s.wrf
@@ -16,3 +16,6 @@ file		SCRIPT		"cam2daynight.slo"
 directory       "script/data"
 file            SCRIPTVAL       "cam2-8s.vlo"
 file            SCRIPTVAL       "cam2day.vlo"
+
+directory       "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam2/sub2-d.wrf b/data/base/wrf/cam2/sub2-d.wrf
@@ -21,3 +21,6 @@ file            SCRIPTVAL       "cam2d.vlo"
 file		SCRIPTVAL	"cam2dx.vlo"
 file            SCRIPTVAL       "vtols2d.vlo"
 file            SCRIPTVAL       "cam2day.vlo"
+
+directory       "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam2/sub2-ds.wrf b/data/base/wrf/cam2/sub2-ds.wrf
@@ -16,3 +16,6 @@ file		SCRIPT		"cam2daynight.slo"
 directory       "script/data"
 file            SCRIPTVAL       "cam2-ds.vlo"
 file            SCRIPTVAL       "cam2day.vlo"
+
+directory       "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam3/cam3a.wrf b/data/base/wrf/cam3/cam3a.wrf
@@ -27,3 +27,6 @@ file            SCRIPTVAL       "vtols3a.vlo"
 file            SCRIPTVAL       "cam3arein.vlo"
 file            SCRIPTVAL       "disk2.vlo"
 file            SCRIPTVAL       "cam3tech.vlo"
+
+directory       "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam3/cam3ab.wrf b/data/base/wrf/cam3/cam3ab.wrf
@@ -23,3 +23,6 @@ file            SCRIPTVAL       "cam3a-bx.vlo"
 file            SCRIPTVAL       "vtols3a-b.vlo"
 file            SCRIPTVAL       "disk2.vlo"
 file            SCRIPTVAL       "cam3day.vlo"
+
+directory       "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam3/cam3ad1.wrf b/data/base/wrf/cam3/cam3ad1.wrf
@@ -24,3 +24,6 @@ file            SCRIPTVAL       "cam3a-d1x.vlo"
 file            SCRIPTVAL       "disk2.vlo"
 file            SCRIPTVAL       "vtols3ad1.vlo"
 file            SCRIPTVAL       "cam3mkday.vlo"
+
+directory       "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam3/cam3ad2.wrf b/data/base/wrf/cam3/cam3ad2.wrf
@@ -22,3 +22,6 @@ file            SCRIPTVAL       "cam3a-d2.vlo"
 file            SCRIPTVAL       "cam3a-d2x.vlo"
 file            SCRIPTVAL       "vtols3ad2.vlo"
 file            SCRIPTVAL       "cam3mknight.vlo"
+
+directory       "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam3/cam3b.wrf b/data/base/wrf/cam3/cam3b.wrf
@@ -25,3 +25,6 @@ file            SCRIPTVAL       "vtols3b.vlo"
 file            SCRIPTVAL       "cam3mknight.vlo"
 file            SCRIPTVAL       "disk2.vlo"
 file            SCRIPTVAL       "cam3btech.vlo"
+
+directory       "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam3/cam3c.wrf b/data/base/wrf/cam3/cam3c.wrf
@@ -25,3 +25,6 @@ file            SCRIPTVAL       "vtols3c.vlo"
 file            SCRIPTVAL       "cam3btech.vlo"
 file            SCRIPTVAL       "disk2.vlo"
 file            SCRIPTVAL       "cam3mknight.vlo"
+
+directory       "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam3/sub3-1.wrf b/data/base/wrf/cam3/sub3-1.wrf
@@ -59,3 +59,6 @@ file            SCRIPTVAL       "vtols3-1.vlo"
 file            SCRIPTVAL       "count3-1.vlo"
 file            SCRIPTVAL       "disk2.vlo"
 file            SCRIPTVAL       "cam3mkday.vlo"
+
+directory       "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam3/sub3-1s.wrf b/data/base/wrf/cam3/sub3-1s.wrf
@@ -19,3 +19,6 @@ directory       "script/data"
 file            SCRIPTVAL       "cam3-1s.vlo"
 file            SCRIPTVAL       "disk2.vlo"
 file            SCRIPTVAL       "cam3night.vlo"
+
+directory       "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam3/sub3-2.wrf b/data/base/wrf/cam3/sub3-2.wrf
@@ -25,3 +25,6 @@ file            SCRIPTVAL       "vtols3-2.vlo"
 file            SCRIPTVAL       "cam3-2tech.vlo"
 file            SCRIPTVAL       "disk2.vlo"
 file            SCRIPTVAL       "cam3mkday.vlo"
+
+directory       "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam3/sub3-2s.wrf b/data/base/wrf/cam3/sub3-2s.wrf
@@ -19,3 +19,6 @@ directory       "script/data"
 file            SCRIPTVAL       "cam3-2s.vlo"
 file            SCRIPTVAL       "disk2.vlo"
 file            SCRIPTVAL       "cam3night.vlo"
+
+directory       "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam3/sub3-3.wrf b/data/base/wrf/cam3/sub3-3.wrf
@@ -18,3 +18,6 @@ directory       "script/data"
 file            SCRIPTVAL       "cam3-3.vlo"
 file            SCRIPTVAL       "disk2.vlo"
 file            SCRIPTVAL       "cam3day.vlo"
+
+directory       "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam3/sub3-3s.wrf b/data/base/wrf/cam3/sub3-3s.wrf
@@ -19,3 +19,6 @@ directory       "script/data"
 file            SCRIPTVAL       "cam3-3s.vlo"
 file            SCRIPTVAL       "disk2.vlo"
 file            SCRIPTVAL       "cam3day.vlo"
+
+directory       "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam3/sub3-4.wrf b/data/base/wrf/cam3/sub3-4.wrf
@@ -23,3 +23,6 @@ file            SCRIPTVAL       "disk1.vlo"
 file            SCRIPTVAL       "vtols3-4.vlo"
 file            SCRIPTVAL       "cam3-4x.vlo"
 file            SCRIPTVAL       "cam3mkday.vlo"
+
+directory       "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/data/base/wrf/cam3/sub3-4s.wrf b/data/base/wrf/cam3/sub3-4s.wrf
@@ -21,3 +21,6 @@ file            SCRIPTVAL       "cam3-4s.vlo"
 file            SCRIPTVAL       "cam3-4sx.vlo"
 file            SCRIPTVAL       "disk1.vlo"
 file            SCRIPTVAL       "cam3night.vlo"
+
+directory       "script"
+file            JAVASCRIPT      "rules.js"
diff --git a/lib/ivis_opengl/bitimage.cpp b/lib/ivis_opengl/bitimage.cpp
@@ -64,7 +64,7 @@ struct ImageMerge
 	std::vector<int> pages;  // List of page sizes, normally all pageSize, unless an image is too large for a normal page.
 };
 
-ImageDef *iV_GetImage(const QString &filename, int x, int y)
+ImageDef *iV_GetImage(const QString &filename)
 {
 	if (!images.contains(filename))
 	{

diff --git a/lib/ivis_opengl/bitimage.h b/lib/ivis_opengl/bitimage.h
@@ -50,7 +50,7 @@ static inline WZ_DECL_PURE short iV_GetImageYOffset(const IMAGEFILE *ImageFile,
 	return Image(ImageFile, ID).yOffset();
 }
 
-ImageDef *iV_GetImage(const QString &filename, int x, int y);
+ImageDef *iV_GetImage(const QString &filename);
 IMAGEFILE *iV_LoadImageFile(const char *FileData);
 void iV_FreeImageFile(IMAGEFILE *ImageFile);
 

diff --git a/lib/ivis_opengl/pieblitfunc.cpp b/lib/ivis_opengl/pieblitfunc.cpp
@@ -317,7 +317,7 @@ static Vector2i makePieImage(IMAGEFILE *imageFile, unsigned id, PIERECT *dest, i
 
 void iV_DrawImage2(const QString &filename, float x, float y, float width, float height)
 {
-	ImageDef *image = iV_GetImage(filename, x, y);
+	ImageDef *image = iV_GetImage(filename);
 	const GLfloat invTextureSize = image->invTextureSize;
 	const int tu = image->Tu;
 	const int tv = image->Tv;

diff --git a/src/levels.cpp b/src/levels.cpp
@@ -839,10 +839,7 @@ bool levLoadData(char const *name, Sha256 const *hash, char *pSaveName, GAME_TYP
 				return false;
 			}
 
-			if (!campaignReset())
-			{
-				return false;
-			}
+			campaignReset();
 		}
 	}
 

diff --git a/src/mission.cpp b/src/mission.cpp
@@ -251,7 +251,6 @@ void initMission(void)
 
 	mission.ETA = -1;
 	mission.startTime = 0;
-	ASSERT(mission.psGateways.size() == 0, "Mission map has gateways");
 	mission.psGateways.clear(); // just in case
 	mission.mapHeight = 0;
 	mission.mapWidth = 0;
@@ -883,7 +882,6 @@ void restoreMissionData(void)
 	scrollMinY = mission.scrollMinY;
 	scrollMaxX = mission.scrollMaxX;
 	scrollMaxY = mission.scrollMaxY;
-	ASSERT(mission.psGateways.size() == 0, "Mission map has gateways");
 	std::swap(mission.psGateways, gwGetGateways());
 	//and clear the mission pointers
 	mission.psMapTiles	= NULL;