From 50146bc509b18c9d9b5ab584a45497495af591a0 Mon Sep 17 00:00:00 2001
From: Wedge009 <wedge009@wedge009.net>
Date: Sat, 22 Oct 2016 11:06:12 +1100
Subject: [PATCH] Avoid division by or modulo of zero in test scenario's maths
 test (bug #25214)

---
 data/scenario-test.cfg | 76 ++++++++++++++++++++++++++++++++----------
 1 file changed, 58 insertions(+), 18 deletions(-)

diff --git a/data/scenario-test.cfg b/data/scenario-test.cfg
index 9ceaed616773..033fea4463a8 100644
--- a/data/scenario-test.cfg
+++ b/data/scenario-test.cfg
@@ -2635,15 +2635,35 @@ For game purposes, the races group into factions; for example, orcs often cooper
                                 variable=divisor
                             [/text_input]
                         [/message]
-                        {VARIABLE total $number}
-                        [set_variable]
-                            name=total
-                            divide=$divisor
-                        [/set_variable]
-                        [message]
-                            speaker=narrator
-                            message="Dividing $number| by $divisor| results in $total|."
-                        [/message]
+                        [if]
+                            [variable]
+                                name=divisor
+                                equals=0
+                            [/variable]
+                            [or]
+                                [variable]
+                                    name=divisor
+                                    equals=
+                                [/variable]
+                            [/or]
+                            [then]
+                                [message]
+                                    speaker=narrator
+                                    message="Cannot divide by zero!"
+                                [/message]
+                            [/then]
+                            [else]
+                                {VARIABLE total $number}
+                                [set_variable]
+                                    name=total
+                                    divide=$divisor
+                                [/set_variable]
+                                [message]
+                                    speaker=narrator
+                                    message="Dividing $number| by $divisor| results in $total|."
+                                [/message]
+                            [/else]
+                        [/if]
                     [/command]
                 [/option]
                 [option]
@@ -2656,15 +2676,35 @@ For game purposes, the races group into factions; for example, orcs often cooper
                                 variable=modulo
                             [/text_input]
                         [/message]
-                        {VARIABLE total $number}
-                        [set_variable]
-                            name=total
-                            modulo=$modulo
-                        [/set_variable]
-                        [message]
-                            speaker=narrator
-                            message="$number| % $modulo| = $total|."
-                        [/message]
+                        [if]
+                            [variable]
+                                name=modulo
+                                equals=0
+                            [/variable]
+                            [or]
+                                [variable]
+                                    name=modulo
+                                    equals=
+                                [/variable]
+                            [/or]
+                            [then]
+                                [message]
+                                    speaker=narrator
+                                    message="Cannot use modulus of zero!"
+                                [/message]
+                            [/then]
+                            [else]
+                                {VARIABLE total $number}
+                                [set_variable]
+                                    name=total
+                                    modulo=$modulo
+                                [/set_variable]
+                                [message]
+                                    speaker=narrator
+                                    message="$number| % $modulo| = $total|."
+                                [/message]
+                            [/else]
+                        [/if]
                     [/command]
                 [/option]
                 [option]