Merge https://git.catrenelle.com/Kevin_Smarts/glife into master

build.sh

@@ -10,26 +10,26 @@ QSPFILE=glife.qsp
 
 #######################################################################
 
-./txtmerge.py locations glife.txt
+python tools/txtmerge.py locations glife.txt
 if [[ "$OSTYPE" == "linux-gnu" ]]; then
-	./txt2gam.linux glife.txt "${QSPFILE}" 1> /dev/null
+	./tools/txt2gam.linux glife.txt "${QSPFILE}" 1> /dev/null
 elif [[ "$OSTYPE" == "darwin"* ]]; then
-	./txt2gam.mac glife.txt "${QSPFILE}" 1> /dev/null
+	./tools/txt2gam.mac glife.txt "${QSPFILE}" 1> /dev/null
 elif [[ "$OSTYPE" == "msys" ]]; then
 	if [[ "$MSYSTEM_CARCH" == "x86_64" ]]; then
-		./txt2gam64.exe glife.txt "${QSPFILE}" 1> /dev/null
+		./tools/txt2gam64.exe glife.txt "${QSPFILE}" 1> /dev/null
 	else
-		./txt2gam.exe glife.txt "${QSPFILE}" 1> /dev/null
+		./tools/txt2gam.exe glife.txt "${QSPFILE}" 1> /dev/null
 	fi
 elif [[ "$OSTYPE" == "cygwin" ]]; then
 	# Unsure if non-AMD CPUs give this or AMD64, tested on an actual AMD brand chip
 	# requires a python install visible to cygwin (for the txtmerge above)
 	if [[ "$PROCESSOR_ARCHITECTURE" == "x86_64" ]]; then
-		./txt2gam64.exe glife.txt "${QSPFILE}" 1> /dev/null
+		./tools/txt2gam64.exe glife.txt "${QSPFILE}" 1> /dev/null
 	elif [[ "$PROCESSOR_ARCHITECTURE" == "AMD64" ]]; then
-		./txt2gam64.exe glife.txt "${QSPFILE}" 1> /dev/null
+		./tools/txt2gam64.exe glife.txt "${QSPFILE}" 1> /dev/null
 	else
-		./txt2gam.exe glife.txt "${QSPFILE}" 1> /dev/null
+		./tools/txt2gam.exe glife.txt "${QSPFILE}" 1> /dev/null
 	fi
 fi
 if [ -d "${DESTDIR}" ]; then

tools/qsp-analyser/QSP_Analyser/Common.cs

@@ -739,14 +739,14 @@ namespace Analyser
             {
                 for (int j = 0; j < qspOpsNamesCounts[i]; j++)
                 {
-                    if ((name.Equals(qspOpsNames[i, j].Name)) && 
+                    if ((name.Equals(qspOpsNames[i, j].Name)) &&
                         (!functionsOnly || (qspOpsNames[i, j].Code >= (int)QspFunctionType.First_Function)))
                         return qspOpsNames[i, j].Code;
                 }
             }
             return (int)QspFunctionType.Unknown;
         }
-        
+
         static public QspVariable GetVar(string name)
         {
             foreach (QspVariable var in vars)
@@ -1436,7 +1436,7 @@ namespace Analyser
                                     }
                                 }
 
-                                if ((csv_line == null) || (csvLineCompleted && 
+                                if ((csv_line == null) || (csvLineCompleted &&
                                     ((csvLocName != locName) || (quoted_line_counter != csvLineIndex) || (csvOriginalLine != quotedText))))
                                 {
                                     SubmitError("CSV-file does not match the original! Generate it again.", INVALID_INDEX);

tools/qsp-analyser/QSP_Analyser/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.3.0")]
-[assembly: AssemblyFileVersion("1.3.3")]
+[assembly: AssemblyVersion("1.3.3.2")]
+[assembly: AssemblyFileVersion("1.3.3.2")]

tools/qsp-analyser/QSP_Analyser/QSPGameCode.cs

@@ -587,6 +587,11 @@ namespace Analyser
                                 return false;
                             }
                         }
+                        else if ((c == ':') && (block == "else"))
+                        {
+                            SubmitError("ELSE with :", lineNum);
+                            return false;
+                        }
                         else if ((c == ':') && (controlBlock == (int)ControlBlockType.ActCondition))
                         {
                             //Разбор аргумента
@@ -1896,7 +1901,6 @@ namespace Analyser
                         {
                             pos++;
                         }
-
                     }
                     else if ((block.Length == 0) && (c2 == '"'))
                     {

tools/qsp-analyser/QSP_Analyser/QSP_Analyser.csproj

@@ -35,7 +35,7 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>1</ApplicationRevision>
+    <ApplicationRevision>2</ApplicationRevision>
     <ApplicationVersion>1.3.3.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>