Version bump. :-)

diff --git a/direct.c b/direct.c
index 7010e4616980714d6fdd3242a63a047581c56330..3ae88cafa7bcf642d7fd0a2f78af14210ca04f65 100644 (file)
--- a/direct.c
+++ b/direct.c
@@ -1590,28 +1590,28 @@ int d_gpumain(void)
        return error("What the hell? Do you think we adhere to the Goof standard?");
 }
 
        return error("What the hell? Do you think we adhere to the Goof standard?");
 }
 

+

 //
 // .opt - turn a specific (or all) optimisation on or off
 //
 int d_opt(void)
 {
 //
 // .opt - turn a specific (or all) optimisation on or off
 //
 int d_opt(void)
 {

-       char * tmpstr;
-

        while (*tok != EOL)
        {
                if (*tok == STRING)
                {
                        tok++;
        while (*tok != EOL)
        {
                if (*tok == STRING)
                {
                        tok++;

-                       tmpstr = string[*tok++];
+                       char * tmpstr = string[*tok++];

 
                        if (ParseOptimization(tmpstr) != OK)
                        {
                                char temperr[256];
 
                        if (ParseOptimization(tmpstr) != OK)
                        {
                                char temperr[256];

-                               sprintf(temperr, "unknown optimisation flag '%s'.", tmpstr);
+                               sprintf(temperr, "unknown optimisation flag '%s'", tmpstr);

                                return error(temperr);
                        }
                }
                else
                                return error(temperr);
                        }
                }
                else

-                       return error(".opt directive needs every switch enclosed inside quotation marks.");
+                       return error(".opt directive needs every switch enclosed inside quotation marks");

        }
        }

-}
\ No newline at end of file
+}
+

diff --git a/eagen0.c b/eagen0.c
index bf4ba3da6ab64fdb093df39ac9944b82d8f109d5..88ebdb3bee2cee83a1425694a3cfd5e8b61f2cfb 100644 (file)
--- a/eagen0.c
+++ b/eagen0.c
@@ -72,7 +72,7 @@ int eaNgen(WORD siz)
                                return OK;
                        }
 
                                return OK;
                        }
 

-                       if (v + 0x8000 >= 0x18000)
+                       if ((v + 0x8000) >= 0x18000)

                                return error(range_error);
 
                        D_word(v);
                                return error(range_error);
 
                        D_word(v);

diff --git a/rmac.c b/rmac.c
index 45cd1d8f0532ff69347de1979fa1e6ed3da18f69..cde6e123784b972cf676b38a04d208b34f7e9a39 100644 (file)
--- a/rmac.c
+++ b/rmac.c
@@ -176,34 +176,33 @@ void DisplayVersion(void)
 //
 int ParseOptimization(char * optstring)
 {
 //
 int ParseOptimization(char * optstring)
 {

-    int onoff = 0;
-
-    if (*optstring == '+')
-        onoff = 1;
-    else if (*optstring != '~')
-        return ERROR;
-
-    if ((optstring[2] == 'a' || optstring[2] == 'A') &&
-        (optstring[3] == 'l' || optstring[3] == 'L') &&
-        (optstring[4] == 'l' || optstring[4] == 'L'))
-    {
-        memset(optim_flags, onoff, OPT_COUNT * sizeof(int));
-        return OK;
-    }
-    else if (optstring[1] == 'o' || optstring[1] == 'O') //Turn on specific optimisation
+       int onoff = 0;
+
+       if (*optstring == '+')
+               onoff = 1;
+       else if (*optstring != '~')
+               return ERROR;
+
+       if ((optstring[2] == 'a' || optstring[2] == 'A')
+               && (optstring[3] == 'l' || optstring[3] == 'L')
+               && (optstring[4] == 'l' || optstring[4] == 'L'))

        {
        {

-        int opt_no = atoi(&optstring[2]);
-        if ((opt_no >= 0) && (opt_no < OPT_COUNT))
-            optim_flags[opt_no] = onoff;
-        else
-        {
-            return ERROR;
-        }
-    }
-    else
-    {
-        return ERROR;
-    }
+               memset(optim_flags, onoff, OPT_COUNT * sizeof(int));
+               return OK;
+       }
+       else if (optstring[1] == 'o' || optstring[1] == 'O') // Turn on specific optimisation
+       {
+               int opt_no = atoi(&optstring[2]);
+
+               if ((opt_no >= 0) && (opt_no < OPT_COUNT))
+                       optim_flags[opt_no] = onoff;
+               else
+                       return ERROR;
+       }
+       else
+       {
+               return ERROR;
+       }

 }
 
 
 }
 
 

diff --git a/rmac.h b/rmac.h
index 1fa419bc172d153c7f7f0d7ea92e301619827873..4a4e8b92b97c7b6ed6bd205ec6e773fdfeae753d 100644 (file)
--- a/rmac.h
+++ b/rmac.h
@@ -41,10 +41,11 @@
        // WARNING(FIXME: Code removed because...)
 
        #else
        // WARNING(FIXME: Code removed because...)
 
        #else

-       //If we're not compiling for Visual Studio let's assume that we're using
-       //some flavour of gcc instead. So let's use the gcc compliant macro instead.
-       //If some weirdo uses something else (I dunno, Intel compiler or something?)
-       //this is probably going to explode spectacularly. Let's wait for the fireworks!
+       // If we're not compiling for Visual Studio let's assume that we're using
+       // some flavour of gcc instead. So let's use the gcc compliant macro
+       // instead. If some weirdo uses something else (I dunno, Intel compiler or
+       // something?) this is probably going to explode spectacularly. Let's wait
+       // for the fireworks!

        #define DO_PRAGMA(x) _Pragma (#x)
        #define WARNING(desc) DO_PRAGMA(message (#desc))
        #define inline __inline
        #define DO_PRAGMA(x) _Pragma (#x)
        #define WARNING(desc) DO_PRAGMA(message (#desc))
        #define inline __inline

diff --git a/version.h b/version.h
index c152043b7b115bb6a6016fef3a006cdf03fa1fd7..588461499eb1c0bd6a88b7b61514238b93f52f6e 100644 (file)
--- a/version.h
+++ b/version.h
@@ -13,6 +13,6 @@
 
 #define MAJOR   1              // Major version number
 #define MINOR   4              // Minor version number
 
 #define MAJOR   1              // Major version number
 #define MINOR   4              // Minor version number

-#define PATCH   16             // Patch release number
+#define PATCH   17             // Patch release number

 
 #endif // __VERSION_H__
 
 #endif // __VERSION_H__