From e3a7c98a25aa9d0c0331619687514c02eba09f26 Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sat, 27 Aug 2016 01:41:37 +0000
Subject: [PATCH] Fix a gcc 6.x warning

git-svn-id: https://svn.eduke32.com/eduke32@5831 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/source/gamedef.c | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/polymer/eduke32/source/gamedef.c b/polymer/eduke32/source/gamedef.c
index 82bf39788..6e1e88b77 100644
--- a/polymer/eduke32/source/gamedef.c
+++ b/polymer/eduke32/source/gamedef.c
@@ -4839,19 +4839,32 @@ DO_DEFSTATE:
                     //    AddLog(g_szBuf);
                 }
                 g_numCases=0;
+
                 if (tempscrptr)
                 {
-                    intptr_t t,n;
-                    for (i=3; i<3+tempscrptr[1]*2-2; i+=2) // sort them
+                    for (i = 3; i < 3 + tempscrptr[1] * 2 - 2; i += 2)  // sort them
                     {
-                        t=tempscrptr[i]; n=i;
-                        for (j=i+2; j<3+tempscrptr[1]*2; j+=2)
-                            if (tempscrptr[j]<t) {t=tempscrptr[j]; n=j;}
-                            if (n!=i)
+                        intptr_t t = tempscrptr[i];
+                        intptr_t n = i;
+
+                        for (j = i + 2; j < 3 + tempscrptr[1] * 2; j += 2)
+                        {
+                            if (tempscrptr[j] < t)
                             {
-                                t=tempscrptr[i  ]; tempscrptr[i  ]=tempscrptr[n  ]; tempscrptr[n  ]=t;
-                                t=tempscrptr[i+1]; tempscrptr[i+1]=tempscrptr[n+1]; tempscrptr[n+1]=t;
+                                t = tempscrptr[j];
+                                n = j;
                             }
+                        }
+
+                        if (n != i)
+                        {
+                            t                 = tempscrptr[i];
+                            tempscrptr[i]     = tempscrptr[n];
+                            tempscrptr[n]     = t;
+                            t                 = tempscrptr[i + 1];
+                            tempscrptr[i + 1] = tempscrptr[n + 1];
+                            tempscrptr[n + 1] = t;
+                        }
                     }
                     //            for (j=3;j<3+tempscrptr[1]*2;j+=2)initprintf("%5d %8x\n",tempscrptr[j],tempscrptr[j+1]);
                     tempscrptr[0]= (intptr_t)g_scriptPtr - (intptr_t)&apScript[0];    // save 'end' location