more cleaned-up code
This commit is contained in:
173
amxmodx/util.cpp
173
amxmodx/util.cpp
@ -30,11 +30,10 @@
|
||||
*/
|
||||
|
||||
#include <time.h>
|
||||
|
||||
#include "amxmodx.h"
|
||||
|
||||
#ifdef __linux__
|
||||
#define _vsnprintf vsnprintf
|
||||
#define _vsnprintf vsnprintf
|
||||
#endif
|
||||
|
||||
char *UTIL_VarArgs(const char *fmt, ...)
|
||||
@ -52,40 +51,47 @@ char *UTIL_VarArgs(const char *fmt, ...)
|
||||
int UTIL_ReadFlags(const char* c)
|
||||
{
|
||||
int flags = 0;
|
||||
while (*c) flags |= ( 1 << ( *c++ - 'a' ) );
|
||||
|
||||
while (*c)
|
||||
flags |= (1<<(*c++ - 'a'));
|
||||
|
||||
return flags;
|
||||
}
|
||||
|
||||
void UTIL_GetFlags(char* f,int a)
|
||||
void UTIL_GetFlags(char* f, int a)
|
||||
{
|
||||
for(int i='a';i<='z';++i){
|
||||
if ( a & 1 ) *f++ = i;
|
||||
for (int i = 'a'; i <= 'z'; ++i)
|
||||
{
|
||||
if (a & 1) *f++ = i;
|
||||
a >>= 1;
|
||||
}
|
||||
|
||||
*f = 0;
|
||||
}
|
||||
|
||||
/* warning - don't pass here const string */
|
||||
void UTIL_ShowMenu( edict_t* pEdict, int slots, int time, char *menu, int mlen )
|
||||
void UTIL_ShowMenu(edict_t* pEdict, int slots, int time, char *menu, int mlen)
|
||||
{
|
||||
char *n = menu;
|
||||
char c = 0;
|
||||
int a;
|
||||
|
||||
if (!gmsgShowMenu)
|
||||
return; // some games don't support ShowMenu (Firearms)
|
||||
return; // some games don't support ShowMenu (Firearms)
|
||||
|
||||
while ( *n ) {
|
||||
while (*n)
|
||||
{
|
||||
a = mlen;
|
||||
if ( a > 175 ) a = 175;
|
||||
if (a > 175) a = 175;
|
||||
mlen -= a;
|
||||
c = *(n+=a);
|
||||
*n = 0;
|
||||
MESSAGE_BEGIN( MSG_ONE , gmsgShowMenu, NULL, pEdict );
|
||||
WRITE_SHORT( slots );
|
||||
WRITE_CHAR( time );
|
||||
WRITE_BYTE( c ? TRUE : FALSE);
|
||||
WRITE_STRING( menu );
|
||||
|
||||
MESSAGE_BEGIN(MSG_ONE, gmsgShowMenu, NULL, pEdict);
|
||||
WRITE_SHORT(slots);
|
||||
WRITE_CHAR(time);
|
||||
WRITE_BYTE(c ? TRUE : FALSE);
|
||||
WRITE_STRING(menu);
|
||||
MESSAGE_END();
|
||||
*n = c;
|
||||
menu = n;
|
||||
@ -93,14 +99,14 @@ void UTIL_ShowMenu( edict_t* pEdict, int slots, int time, char *menu, int mlen )
|
||||
}
|
||||
|
||||
/* warning - don't pass here const string */
|
||||
void UTIL_ShowMOTD( edict_t *client , char *motd, int mlen, const char *name)
|
||||
void UTIL_ShowMOTD(edict_t *client, char *motd, int mlen, const char *name)
|
||||
{
|
||||
if (!gmsgMOTD)
|
||||
return; // :TODO: Maybe output a warning log?
|
||||
|
||||
if (gmsgServerName)
|
||||
{
|
||||
MESSAGE_BEGIN( MSG_ONE , gmsgServerName, NULL, client );
|
||||
MESSAGE_BEGIN(MSG_ONE, gmsgServerName, NULL, client);
|
||||
WRITE_STRING(name);
|
||||
MESSAGE_END();
|
||||
}
|
||||
@ -109,15 +115,17 @@ void UTIL_ShowMOTD( edict_t *client , char *motd, int mlen, const char *name)
|
||||
char c = 0;
|
||||
int a;
|
||||
|
||||
while ( *n ) {
|
||||
while (*n)
|
||||
{
|
||||
a = mlen;
|
||||
if ( a > 175 ) a = 175;
|
||||
if (a > 175) a = 175;
|
||||
mlen -= a;
|
||||
c = *(n+=a);
|
||||
c = *(n += a);
|
||||
*n = 0;
|
||||
MESSAGE_BEGIN( MSG_ONE , gmsgMOTD, NULL, client );
|
||||
WRITE_BYTE( c ? FALSE : TRUE );
|
||||
WRITE_STRING( motd );
|
||||
|
||||
MESSAGE_BEGIN(MSG_ONE, gmsgMOTD, NULL, client);
|
||||
WRITE_BYTE(c ? FALSE : TRUE);
|
||||
WRITE_STRING(motd);
|
||||
MESSAGE_END();
|
||||
*n = c;
|
||||
motd = n;
|
||||
@ -125,42 +133,52 @@ void UTIL_ShowMOTD( edict_t *client , char *motd, int mlen, const char *name)
|
||||
|
||||
if (gmsgServerName)
|
||||
{
|
||||
MESSAGE_BEGIN( MSG_ONE , gmsgServerName, NULL, client );
|
||||
WRITE_STRING( hostname->string );
|
||||
MESSAGE_BEGIN(MSG_ONE, gmsgServerName, NULL, client);
|
||||
WRITE_STRING(hostname->string);
|
||||
MESSAGE_END();
|
||||
}
|
||||
}
|
||||
|
||||
void UTIL_IntToString(int value, char *output)
|
||||
{
|
||||
static const char *words[] = {"zero ","one ","two ","three ","four ",
|
||||
static const char *words[] =
|
||||
{"zero ","one ","two ","three ","four ",
|
||||
"five ", "six ","seven ","eight ","nine ","ten ",
|
||||
"eleven ","twelve ","thirteen ","fourteen ","fifteen ",
|
||||
"sixteen ","seventeen ","eighteen ","nineteen ",
|
||||
"twenty ","thirty ","fourty ", "fifty ","sixty ",
|
||||
"seventy ","eighty ","ninety ",
|
||||
"hundred ","thousand "};
|
||||
|
||||
*output = 0;
|
||||
if (value < 0) value = -value;
|
||||
int tho = value / 1000;
|
||||
int aaa = 0;
|
||||
if (tho){
|
||||
aaa += sprintf(&output[aaa], words[ tho ] );
|
||||
aaa += sprintf(&output[aaa], words[29] );
|
||||
|
||||
if (tho)
|
||||
{
|
||||
aaa += sprintf(&output[aaa], words[tho]);
|
||||
aaa += sprintf(&output[aaa], words[29]);
|
||||
value = value % 1000;
|
||||
}
|
||||
|
||||
int hun = value / 100;
|
||||
if (hun) {
|
||||
aaa += sprintf(&output[aaa], words[ hun ] );
|
||||
aaa += sprintf(&output[aaa], words[28] );
|
||||
|
||||
if (hun)
|
||||
{
|
||||
aaa += sprintf(&output[aaa], words[hun]);
|
||||
aaa += sprintf(&output[aaa], words[28]);
|
||||
value = value % 100;
|
||||
}
|
||||
|
||||
int ten = value / 10;
|
||||
int unit = value % 10;
|
||||
if ( ten )
|
||||
aaa += sprintf(&output[aaa], words[ ( ten > 1 ) ? ( ten + 18 ) : ( unit + 10 ) ] );
|
||||
if ( ten != 1 && ( unit || (!value && !hun && !tho) ) )
|
||||
sprintf(&output[aaa], words[ unit ] );
|
||||
|
||||
if (ten)
|
||||
aaa += sprintf(&output[aaa], words[(ten > 1) ? (ten + 18) : (unit + 10)]);
|
||||
|
||||
if (ten != 1 && (unit || (!value && !hun && !tho)))
|
||||
sprintf(&output[aaa], words[unit]);
|
||||
}
|
||||
|
||||
char* UTIL_SplitHudMessage(const char *src)
|
||||
@ -168,50 +186,57 @@ char* UTIL_SplitHudMessage(const char *src)
|
||||
static char message[512];
|
||||
short b = 0, d = 0, e = 0, c = -1;
|
||||
|
||||
while ( src[ d ] && e < 480 ) {
|
||||
if ( src[ d ] == ' ' ) {
|
||||
while (src[d] && e < 480)
|
||||
{
|
||||
if (src[d] == ' ')
|
||||
{
|
||||
c = e;
|
||||
}
|
||||
else if ( src[ d ] == '\n' ) {
|
||||
else if (src[d] == '\n')
|
||||
{
|
||||
c = -1;
|
||||
b = 0;
|
||||
}
|
||||
message[ e++ ] = src[ d++ ];
|
||||
if ( ++b == 69 ) {
|
||||
if ( c == -1 ) {
|
||||
message[ e++ ] = '\n';
|
||||
|
||||
message[e++] = src[d++];
|
||||
|
||||
if (++b == 69)
|
||||
{
|
||||
if (c == -1)
|
||||
{
|
||||
message[e++] = '\n';
|
||||
b = 0;
|
||||
}
|
||||
else {
|
||||
message[ c ] = '\n';
|
||||
} else {
|
||||
message[c] = '\n';
|
||||
b = e - c - 1;
|
||||
c = -1;
|
||||
}
|
||||
}
|
||||
}
|
||||
message[ e ] = 0;
|
||||
|
||||
message[e] = 0;
|
||||
return message;
|
||||
}
|
||||
|
||||
unsigned short FixedUnsigned16( float value, float scale )
|
||||
unsigned short FixedUnsigned16(float value, float scale)
|
||||
{
|
||||
int output = (int)(value * scale);
|
||||
|
||||
if ( output < 0 )
|
||||
if (output < 0)
|
||||
output = 0;
|
||||
else if ( output > 0xFFFF )
|
||||
else if (output > 0xFFFF)
|
||||
output = 0xFFFF;
|
||||
|
||||
return (unsigned short)output;
|
||||
}
|
||||
|
||||
short FixedSigned16( float value, float scale )
|
||||
short FixedSigned16(float value, float scale)
|
||||
{
|
||||
int output = (int)(value * scale);
|
||||
|
||||
if ( output > 32767 )
|
||||
if (output > 32767)
|
||||
output = 32767;
|
||||
else if ( output < -32768 )
|
||||
else if (output < -32768)
|
||||
output = -32768;
|
||||
|
||||
return (short)output;
|
||||
@ -219,15 +244,15 @@ short FixedSigned16( float value, float scale )
|
||||
|
||||
void UTIL_HudMessage(edict_t *pEntity, const hudtextparms_t &textparms, char *pMessage)
|
||||
{
|
||||
if ( pEntity )
|
||||
MESSAGE_BEGIN( MSG_ONE_UNRELIABLE, SVC_TEMPENTITY, NULL, pEntity );
|
||||
if (pEntity)
|
||||
MESSAGE_BEGIN(MSG_ONE_UNRELIABLE, SVC_TEMPENTITY, NULL, pEntity);
|
||||
else
|
||||
MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
|
||||
MESSAGE_BEGIN(MSG_BROADCAST, SVC_TEMPENTITY);
|
||||
|
||||
WRITE_BYTE(29);
|
||||
WRITE_BYTE(textparms.channel & 0xFF);
|
||||
WRITE_SHORT(FixedSigned16(textparms.x, (1<<13) ));
|
||||
WRITE_SHORT(FixedSigned16(textparms.y, (1<<13) ));
|
||||
WRITE_SHORT(FixedSigned16(textparms.x, (1<<13)));
|
||||
WRITE_SHORT(FixedSigned16(textparms.y, (1<<13)));
|
||||
WRITE_BYTE(textparms.effect);
|
||||
WRITE_BYTE(textparms.r1);
|
||||
WRITE_BYTE(textparms.g1);
|
||||
@ -237,30 +262,34 @@ void UTIL_HudMessage(edict_t *pEntity, const hudtextparms_t &textparms, char *pM
|
||||
WRITE_BYTE(255);
|
||||
WRITE_BYTE(250);
|
||||
WRITE_BYTE(0);
|
||||
WRITE_SHORT(FixedUnsigned16(textparms.fadeinTime, (1<<8) ));
|
||||
WRITE_SHORT(FixedUnsigned16(textparms.fadeoutTime, (1<<8) ));
|
||||
WRITE_SHORT(FixedUnsigned16(textparms.holdTime, (1<<8) ));
|
||||
if (textparms.effect==2)
|
||||
WRITE_SHORT(FixedUnsigned16(textparms.fxTime, (1<<8) ) );
|
||||
WRITE_SHORT(FixedUnsigned16(textparms.fadeinTime, (1<<8)));
|
||||
WRITE_SHORT(FixedUnsigned16(textparms.fadeoutTime, (1<<8)));
|
||||
WRITE_SHORT(FixedUnsigned16(textparms.holdTime, (1<<8)));
|
||||
|
||||
if (textparms.effect == 2)
|
||||
WRITE_SHORT(FixedUnsigned16(textparms.fxTime, (1<<8)));
|
||||
|
||||
WRITE_STRING(pMessage);
|
||||
MESSAGE_END();
|
||||
}
|
||||
|
||||
/* warning - buffer of msg must be longer than 190 chars!
|
||||
(here in AMX it is always longer) */
|
||||
void UTIL_ClientPrint( edict_t *pEntity, int msg_dest, char *msg )
|
||||
void UTIL_ClientPrint(edict_t *pEntity, int msg_dest, char *msg)
|
||||
{
|
||||
if (!gmsgTextMsg)
|
||||
return; // :TODO: Maybe output a warning log?
|
||||
|
||||
char c = msg[190];
|
||||
msg[190] = 0; // truncate without checking with strlen()
|
||||
if ( pEntity )
|
||||
MESSAGE_BEGIN( MSG_ONE, gmsgTextMsg, NULL, pEntity );
|
||||
msg[190] = 0; // truncate without checking with strlen()
|
||||
|
||||
if (pEntity)
|
||||
MESSAGE_BEGIN(MSG_ONE, gmsgTextMsg, NULL, pEntity);
|
||||
else
|
||||
MESSAGE_BEGIN( MSG_BROADCAST , gmsgTextMsg);
|
||||
WRITE_BYTE( msg_dest );
|
||||
WRITE_STRING( msg );
|
||||
MESSAGE_BEGIN(MSG_BROADCAST, gmsgTextMsg);
|
||||
|
||||
WRITE_BYTE(msg_dest);
|
||||
WRITE_STRING(msg);
|
||||
MESSAGE_END();
|
||||
msg[190] = c;
|
||||
}
|
||||
@ -275,7 +304,7 @@ void UTIL_ClientPrint( edict_t *pEntity, int msg_dest, char *msg )
|
||||
void UTIL_FakeClientCommand(edict_t *pEdict, const char *cmd, const char *arg1, const char *arg2)
|
||||
{
|
||||
if (!cmd)
|
||||
return; // no command
|
||||
return; // no command
|
||||
|
||||
// store command
|
||||
g_fakecmd.argv[0] = cmd;
|
||||
@ -304,7 +333,7 @@ void UTIL_FakeClientCommand(edict_t *pEdict, const char *cmd, const char *arg1,
|
||||
// store argument
|
||||
g_fakecmd.argv[1] = arg1;
|
||||
// build argument line
|
||||
snprintf( g_fakecmd.args, 255, "%s", arg1);
|
||||
snprintf(g_fakecmd.args, 255, "%s", arg1);
|
||||
// if snprintf reached 255 chars limit, this will make sure there will be no access violation
|
||||
g_fakecmd.args[255] = 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user