YGGverse
/
hlsdk-portable
mirror of https://github.com/YGGverse/hlsdk-portable.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'master' into half-screwed

half-screwed
Andrey Akhmichin 2 years ago
parent
a5ad757649 813aa0ae91
commit
75ce27c2d3
No known key found for this signature in database
GPG Key ID: 1F180D249B0643C0
2 changed files with 9 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      dlls/client.cpp
  2. 2
      wscript

13
dlls/client.cpp
Unescape View File

@ -431,13 +431,15 @@ void Host_Say( edict_t *pEntity, int teamonly )
{ {
if( CMD_ARGC() >= 2 ) if( CMD_ARGC() >= 2 )
{ {
sprintf( szTemp, "%s %s", (char *)pcmd, (char *)CMD_ARGS() ); _snprintf( szTemp, sizeof(szTemp) - 1, "%s %s", (char *)pcmd, (char *)CMD_ARGS() );
} }
else else
{ {
// Just a one word command, use the first word...sigh // Just a one word command, use the first word...sigh
sprintf( szTemp, "%s", (char *)pcmd ); strncpy( szTemp, (char *)pcmd, sizeof(szTemp) - 1 );
} }
szTemp[sizeof(szTemp) - 1] = '\0';
p = szTemp; p = szTemp;
} }
@ -466,11 +468,12 @@ void Host_Say( edict_t *pEntity, int teamonly )
// turn on color set 2 (color on, no sound) // turn on color set 2 (color on, no sound)
if( player->IsObserver() && ( teamonly ) ) if( player->IsObserver() && ( teamonly ) )
sprintf( text, "[%d:%d %s] %c(SPEC) %s: ", stTimeNow->tm_hour, stTimeNow->tm_min, dd, 2, STRING( pEntity->v.netname ) ); _snprintf( text, sizeof(text) - 1, "[%d:%d %s] %c(SPEC) %s: ", stTimeNow->tm_hour, stTimeNow->tm_min, dd, 2, STRING( pEntity->v.netname ) );
else if( teamonly ) else if( teamonly )
sprintf( text, "[%d:%d %s] %c(TEAM) %s: ", stTimeNow->tm_hour, stTimeNow->tm_min, dd, 2, STRING( pEntity->v.netname ) ); _snprintf( text, sizeof(text) - 1, "[%d:%d %s] %c(TEAM) %s: ", stTimeNow->tm_hour, stTimeNow->tm_min, dd, 2, STRING( pEntity->v.netname ) );
else else
sprintf( text, "[%d:%d %s] %c%s: ", stTimeNow->tm_hour, stTimeNow->tm_min, dd, 2, STRING( pEntity->v.netname ) ); _snprintf( text, sizeof(text) - 1, "[%d:%d %s] %c%s: ", stTimeNow->tm_hour, stTimeNow->tm_min, dd, 2, STRING( pEntity->v.netname ) );
text[sizeof(text) - 1] = '\0';
j = sizeof( text ) - 2 - strlen( text ); // -2 for /n and null terminator j = sizeof( text ) - 2 - strlen( text ); // -2 for /n and null terminator
if( (int)strlen( p ) > j ) if( (int)strlen( p ) > j )

2
wscript
Unescape View File

@ -175,7 +175,7 @@ def configure(conf):
conf.env.append_unique('CXXFLAGS', ['-Wno-invalid-offsetof', '-fno-rtti', '-fno-exceptions']) conf.env.append_unique('CXXFLAGS', ['-Wno-invalid-offsetof', '-fno-rtti', '-fno-exceptions'])
# strip lib from pattern # strip lib from pattern
if conf.env.DEST_OS in ['linux', 'darwin']: if conf.env.DEST_OS not in ['android']:
if conf.env.cshlib_PATTERN.startswith('lib'): if conf.env.cshlib_PATTERN.startswith('lib'):
conf.env.cshlib_PATTERN = conf.env.cshlib_PATTERN[3:] conf.env.cshlib_PATTERN = conf.env.cshlib_PATTERN[3:]
if conf.env.cxxshlib_PATTERN.startswith('lib'): if conf.env.cxxshlib_PATTERN.startswith('lib'):

Write Preview
Loading…
Cancel
Save