End the mission when a script error occurs.

2014-10-18 12:37:28 +13:00
parent d79ecb432a
commit 79492a3240
11 changed files with 76 additions and 2 deletions
--- a/mods/cnc/chrome/ingame-infoscripterror.yaml
+++ b/mods/cnc/chrome/ingame-infoscripterror.yaml
@@ -0,0 +1,27 @@
+Container@SCRIPT_ERROR_PANEL:
+	Height: PARENT_BOTTOM
+	Width: PARENT_RIGHT
+	Children:
+		Label@DESCA:
+			X: 15
+			Y: 15
+			Width: PARENT_RIGHT-30
+			Height: 20
+			Font: Bold
+			Align:Center
+			Text: The map script has encountered a fatal error
+		Label@DESCB:
+			X: 15
+			Y: 45
+			Width: PARENT_RIGHT-30
+			Height: 20
+			Font: Regular
+			WordWrap: true
+			Text: The details of the error have been saved to lua.log in the logs directory.
+		Label@DESCC:
+			X: 15
+			Y: 65
+			Width: PARENT_RIGHT-30
+			Height: 20
+			Font: Regular
+			Text: Please send this file to the map author so that they can fix this issue.
--- a/mods/cnc/chrome/ingame-leavemap.yaml
+++ b/mods/cnc/chrome/ingame-leavemap.yaml
@@ -116,6 +116,8 @@ Container@LEAVE_MAP_WIDGET:
 					Font: Bold
 					Text: Statistics
 				Container@OBJECTIVES_PANEL:
+					Width: PARENT_RIGHT
+					Height: 365
 				Container@DIALOG_CHAT_PANEL:
 					X: 15
 					Y: 15
--- a/mods/cnc/mod.yaml
+++ b/mods/cnc/mod.yaml
@@ -93,6 +93,7 @@ ChromeLayout:
 	./mods/cnc/chrome/ingame-debug.yaml
 	./mods/cnc/chrome/ingame-info.yaml
 	./mods/cnc/chrome/ingame-infobriefing.yaml
+	./mods/cnc/chrome/ingame-infoscripterror.yaml
 	./mods/cnc/chrome/ingame-infoobjectives.yaml
 	./mods/cnc/chrome/ingame-infostats.yaml
 	./mods/cnc/chrome/ingame-leavemap.yaml
--- a/mods/d2k/mod.yaml
+++ b/mods/d2k/mod.yaml
@@ -64,6 +64,7 @@ ChromeLayout:
 	./mods/ra/chrome/ingame-fmvplayer.yaml
 	./mods/d2k/chrome/ingame-menu.yaml
 	./mods/ra/chrome/ingame-info.yaml
+	./mods/ra/chrome/ingame-infoscripterror.yaml
 	./mods/ra/chrome/ingame-infobriefing.yaml
 	./mods/ra/chrome/ingame-infoobjectives.yaml
 	./mods/ra/chrome/ingame-infostats.yaml
--- a/mods/ra/chrome/ingame-infoscripterror.yaml
+++ b/mods/ra/chrome/ingame-infoscripterror.yaml
@@ -0,0 +1,27 @@
+Container@SCRIPT_ERROR_PANEL:
+	Height: PARENT_BOTTOM
+	Width: PARENT_RIGHT
+	Children:
+		Label@DESCA:
+			X: 15
+			Y: 15
+			Width: PARENT_RIGHT-30
+			Height: 20
+			Font: Bold
+			Align:Center
+			Text: The map script has encountered a fatal error
+		Label@DESCB:
+			X: 15
+			Y: 45
+			Width: PARENT_RIGHT-30
+			Height: 20
+			Font: Regular
+			WordWrap: true
+			Text: The details of the error have been saved to lua.log in the logs directory.
+		Label@DESCC:
+			X: 15
+			Y: 65
+			Width: PARENT_RIGHT-30
+			Height: 20
+			Font: Regular
+			Text: Please send this file to the map author so that they can fix this issue.
--- a/mods/ra/chrome/ingame-leavemap.yaml
+++ b/mods/ra/chrome/ingame-leavemap.yaml
@@ -126,6 +126,7 @@ Container@LEAVE_MAP_WIDGET:
 					Text: Leave
 				Container@OBJECTIVES_PANEL:
 					Y: 65
+					Width: PARENT_RIGHT
 				Container@DIALOG_CHAT_PANEL:
 					X: 20
 					Y: 65
--- a/mods/ra/mod.yaml
+++ b/mods/ra/mod.yaml
@@ -76,6 +76,7 @@ ChromeLayout:
 	./mods/ra/chrome/ingame-diplomacy.yaml
 	./mods/ra/chrome/ingame-fmvplayer.yaml
 	./mods/ra/chrome/ingame-info.yaml
+	./mods/ra/chrome/ingame-infoscripterror.yaml
 	./mods/ra/chrome/ingame-infobriefing.yaml
 	./mods/ra/chrome/ingame-infoobjectives.yaml
 	./mods/ra/chrome/ingame-infostats.yaml
--- a/mods/ts/mod.yaml
+++ b/mods/ts/mod.yaml
@@ -106,6 +106,7 @@ ChromeLayout:
 	./mods/ra/chrome/ingame-fmvplayer.yaml
 	./mods/ra/chrome/ingame-menu.yaml
 	./mods/ra/chrome/ingame-info.yaml
+	./mods/ra/chrome/ingame-infoscripterror.yaml
 	./mods/ra/chrome/ingame-infobriefing.yaml
 	./mods/ra/chrome/ingame-infoobjectives.yaml
 	./mods/ra/chrome/ingame-infostats.yaml