VM_sprintf(): make %i treat the input as QC integer, as opposed to float. %d of cours...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10232 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/dpdefs/dpextensions.qc b/dpdefs/dpextensions.qc
index a9448df1ad526109b26d8a31e48aedfbb72c6d7c..4c57054af7a1c2ff4875390ca50dcdfe01ae3e7f 100644 (file)
--- a/dpdefs/dpextensions.qc
+++ b/dpdefs/dpextensions.qc
@@ -963,7 +963,8 @@ string(string format, ...) sprintf = #627;
 //  optional: .<precision>, .*, or .*<argpos>$ for the precision
 //  length modifiers: h for forcing a float, l for forcing an int/entity (by default, %d etc. cast a float to int)
 //  conversions:
 //  optional: .<precision>, .*, or .*<argpos>$ for the precision
 //  length modifiers: h for forcing a float, l for forcing an int/entity (by default, %d etc. cast a float to int)
 //  conversions:

-//    di take a float if no length is specified or h is, and an int/entity if l is specified as length, and cast it to an int
+//    d takes a float if no length is specified or h is, and an int/entity if l is specified as length, and cast it to an int
+//    i takes an int/entity if no length is specified or i is, and a float if h is specified as length, and cast it to an int

 //    ouxXc take a float if no length is specified or h is, and an int/entity if l is specified as length, and cast it to an unsigned int
 //    eEfFgG take a float if no length is specified or h is, and an int/entity if l is specified as length, and cast it to a double
 //    s takes a string
 //    ouxXc take a float if no length is specified or h is, and an int/entity if l is specified as length, and cast it to an unsigned int
 //    eEfFgG take a float if no length is specified or h is, and an int/entity if l is specified as length, and cast it to a double
 //    s takes a string

diff --git a/prvm_cmds.c b/prvm_cmds.c
index cb78833cd54fcd65c81a6041679d9028d967acfc..239e7b3ee8edf334576125e3ed8bc10eeb0bbe7e 100644 (file)
--- a/prvm_cmds.c
+++ b/prvm_cmds.c
@@ -5956,7 +5956,7 @@ void VM_sprintf(void)
        int width, precision, thisarg, flags;
        char formatbuf[16];
        char *f;
        int width, precision, thisarg, flags;
        char formatbuf[16];
        char *f;

-       qboolean isfloat;
+       int isfloat;

        static int dummyivec[3] = {0, 0, 0};
        static float dummyvec[3] = {0, 0, 0};
 
        static int dummyivec[3] = {0, 0, 0};
        static float dummyvec[3] = {0, 0, 0};
 


@@ -5996,6 +5996,7 @@ void VM_sprintf(void)
                                precision = -1;
                                thisarg = -1;
                                flags = 0;
                                precision = -1;
                                thisarg = -1;
                                flags = 0;

+                               isfloat = -1;

 
                                // is number following?
                                if(*s >= '0' && *s <= '9')
 
                                // is number following?
                                if(*s >= '0' && *s <= '9')


@@ -6118,14 +6119,13 @@ noflags:
                                        }
                                }
 
                                        }
                                }
 

-                               isfloat = true;

                                for(;;)
                                {
                                        switch(*s)
                                        {
                                for(;;)
                                {
                                        switch(*s)
                                        {

-                                               case 'h': isfloat = true; break;
-                                               case 'l': isfloat = false; break;
-                                               case 'L': isfloat = false; break;
+                                               case 'h': isfloat = 1; break;
+                                               case 'l': isfloat = 0; break;
+                                               case 'L': isfloat = 0; break;

                                                case 'j': break;
                                                case 'z': break;
                                                case 't': break;
                                                case 'j': break;
                                                case 'z': break;
                                                case 't': break;


@@ -6136,6 +6136,15 @@ noflags:
                                }
 nolength:
 
                                }
 nolength:
 

+                               // now s points to the final directive char and is no longer changed
+                               if(isfloat < 0)
+                               {
+                                       if(*s == 'i')
+                                               isfloat = 0;
+                                       else
+                                               isfloat = 1;
+                               }
+

                                if(thisarg < 0)
                                        thisarg = argpos++;
 
                                if(thisarg < 0)
                                        thisarg = argpos++;