Fix texture binding issues that were breaking r_shadow_bouncegrid.

[xonotic/darkplaces.git] / common.c

diff --git a/common.c b/common.c
index badf4c9ccaca487160a3af26f8d2f3d14fd870df..9b7dd101926608013114dfe71e685c536b2a9445 100644 (file)
--- a/common.c
+++ b/common.c
@@ -372,7 +372,7 @@ void MSG_WriteVector (sizebuf_t *sb, const vec3_t v, protocolversion_t protocol)
        MSG_WriteCoord (sb, v[2], protocol);
 }
 
-// LordHavoc: round to nearest value, rather than rounding toward zero, fixes crosshair problem
+// LadyHavoc: round to nearest value, rather than rounding toward zero, fixes crosshair problem
 void MSG_WriteAngle8i (sizebuf_t *sb, float f)
 {
        if (f >= 0)
@@ -552,7 +552,7 @@ void MSG_ReadVector (sizebuf_t *sb, vec3_t v, protocolversion_t protocol)
        v[2] = MSG_ReadCoord(sb, protocol);
 }
 
-// LordHavoc: round to nearest value, rather than rounding toward zero, fixes crosshair problem
+// LadyHavoc: round to nearest value, rather than rounding toward zero, fixes crosshair problem
 float MSG_ReadAngle8i (sizebuf_t *sb)
 {
        return (signed char) MSG_ReadByte (sb) * (360.0/256.0);
@@ -612,7 +612,7 @@ void SZ_Write (sizebuf_t *buf, const unsigned char *data, int length)
        memcpy (SZ_GetSpace(buf,length),data,length);
 }
 
-// LordHavoc: thanks to Fuh for bringing the pure evil of SZ_Print to my
+// LadyHavoc: thanks to Fuh for bringing the pure evil of SZ_Print to my
 // attention, it has been eradicated from here, its only (former) use in
 // all of darkplaces.
 
@@ -2039,7 +2039,7 @@ char *InfoString_GetValue(const char *buffer, const char *key, char *value, size
                                (buffer[pos+1 + keylength] == 0 ||
                                 buffer[pos+1 + keylength] == '\\'))
                {
-                       pos += 1 + keylength;           // Skip \key
+                       pos += 1 + (int)keylength;           // Skip \key
                        if (buffer[pos] == '\\') pos++; // Skip \ before value.
                        for (j = 0;buffer[pos+j] && buffer[pos+j] != '\\' && j < (int)valuelength - 1;j++)
                                value[j] = buffer[pos+j];
@@ -2094,7 +2094,7 @@ void InfoString_SetValue(char *buffer, size_t bufferlength, const char *key, con
        pos2 = pos;
        if (buffer[pos] == '\\')
        {
-               pos2 += 1 + keylength;  // Skip \key
+               pos2 += 1 + (int)keylength;  // Skip \key
                if (buffer[pos2] == '\\') pos2++; // Skip \ before value.
                for (;buffer[pos2] && buffer[pos2] != '\\';pos2++);
        }