void MSG_WriteCoord13i (sizebuf_t *sb, float f)
{
if (f >= 0)
- MSG_WriteShort (sb, (int)(f * 8.0f + 0.5f));
+ MSG_WriteShort (sb, (int)(f * 8.0 + 0.5));
else
- MSG_WriteShort (sb, (int)(f * 8.0f - 0.5f));
+ MSG_WriteShort (sb, (int)(f * 8.0 - 0.5));
}
void MSG_WriteCoord16i (sizebuf_t *sb, float f)
{
if (f >= 0)
- MSG_WriteShort (sb, (int)(f + 0.5f));
+ MSG_WriteShort (sb, (int)(f + 0.5));
else
- MSG_WriteShort (sb, (int)(f - 0.5f));
+ MSG_WriteShort (sb, (int)(f - 0.5));
}
void MSG_WriteCoord32f (sizebuf_t *sb, float f)
void MSG_WriteAngle8i (sizebuf_t *sb, float f)
{
if (f >= 0)
- MSG_WriteByte (sb, (int)(f*(256.0f/360.0f) + 0.5f) & 255);
+ MSG_WriteByte (sb, (int)(f*(256.0/360.0) + 0.5) & 255);
else
- MSG_WriteByte (sb, (int)(f*(256.0f/360.0f) - 0.5f) & 255);
+ MSG_WriteByte (sb, (int)(f*(256.0/360.0) - 0.5) & 255);
}
void MSG_WriteAngle16i (sizebuf_t *sb, float f)
{
if (f >= 0)
- MSG_WriteShort (sb, (int)(f*(65536.0f/360.0f) + 0.5f) & 65535);
+ MSG_WriteShort (sb, (int)(f*(65536.0/360.0) + 0.5) & 65535);
else
- MSG_WriteShort (sb, (int)(f*(65536.0f/360.0f) - 0.5f) & 65535);
+ MSG_WriteShort (sb, (int)(f*(65536.0/360.0) - 0.5) & 65535);
}
void MSG_WriteAngle32f (sizebuf_t *sb, float f)
MSG_WriteFloat (sb, f);
}
+void MSG_WriteAngle (sizebuf_t *sb, float f, int protocol)
+{
+ if (protocol == PROTOCOL_DARKPLACES5)
+ MSG_WriteAngle16i (sb, f);
+ else
+ MSG_WriteAngle8i (sb, f);
+}
//
// reading functions
float MSG_ReadCoord13i (void)
{
- return MSG_ReadLittleShort() * (1.0f/8.0f);
+ return MSG_ReadLittleShort() * (1.0/8.0);
}
float MSG_ReadCoord16i (void)
// LordHavoc: round to nearest value, rather than rounding toward zero, fixes crosshair problem
float MSG_ReadAngle8i (void)
{
- return MSG_ReadByte () * (360.0f/256.0f);
+ return MSG_ReadByte () * (360.0/256.0);
}
float MSG_ReadAngle16i (void)
{
- return MSG_ReadShort () * (360.0f/65536.0f);
+ return (unsigned short)MSG_ReadShort () * (360.0/65536.0);
}
float MSG_ReadAngle32f (void)
return MSG_ReadFloat ();
}
+float MSG_ReadAngle (int protocol)
+{
+ if (protocol == PROTOCOL_DARKPLACES5)
+ return MSG_ReadAngle16i ();
+ else
+ return MSG_ReadAngle8i ();
+}
+
//===========================================================================
*cur++ = ' ';
*cur++ = ' ';
}
- if ((j & 3) == 0)
+ if ((j & 3) == 3)
*cur++ = ' ';
}
// print text
for (j = 0;(j < MAX_NUM_ARGVS) && (j < com_argc);j++)
{
i = 0;
- while ((n < (CMDLINE_LENGTH - 1)) && com_argv[j][i])
- com_cmdline[n++] = com_argv[j][i++];
+ if (strstr(com_argv[j], " "))
+ {
+ // arg contains whitespace, store quotes around it
+ com_cmdline[n++] = '\"';
+ while ((n < (CMDLINE_LENGTH - 1)) && com_argv[j][i])
+ com_cmdline[n++] = com_argv[j][i++];
+ com_cmdline[n++] = '\"';
+ }
+ else
+ {
+ while ((n < (CMDLINE_LENGTH - 1)) && com_argv[j][i])
+ com_cmdline[n++] = com_argv[j][i++];
+ }
if (n < (CMDLINE_LENGTH - 1))
com_cmdline[n++] = ' ';
else