Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix gcc 12.1 compilation

Browse Source
This commit is contained in:
Flummi 2022-07-10 15:25:45 +00:00
parent e5c519cf07
commit 475b1cdc29
8 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/cstrike/csx/CMisc.cpp
View File

@ -127,10 +127,10 @@ void CPlayer::Connect(const char* address ){
void CPlayer::restartStats(bool all) void CPlayer::restartStats(bool all)
{ {
if ( all ) memset(weapons,0,sizeof(weapons)); if ( all ) memset(&weapons,0,sizeof(weapons));
memset(weaponsRnd,0,sizeof(weaponsRnd)); //DEC-Weapon (Round) stats memset(&weaponsRnd,0,sizeof(weaponsRnd)); //DEC-Weapon (Round) stats
memset(attackers,0,sizeof(attackers)); memset(&attackers,0,sizeof(attackers));
memset(victims,0,sizeof(victims)); memset(&victims,0,sizeof(victims));
life = {}; life = {};
} }

10
modules/dod/dodx/CMisc.cpp
View File

@ -94,14 +94,14 @@ void CPlayer::restartStats(bool all)
{ {
if ( all ) if ( all )
{ {
memset(weapons,0,sizeof(weapons)); memset(&weapons,0,sizeof(weapons));
memset(static_cast<void *>(&round),0,sizeof(round)); memset(static_cast<void *>(&round),0,sizeof(round));
memset(weaponsRnd,0,sizeof(weaponsRnd)); memset(&weaponsRnd,0,sizeof(weaponsRnd));
} }
memset(weaponsLife,0,sizeof(weaponsLife)); //DEC-Weapon (Round) stats memset(&weaponsLife,0,sizeof(weaponsLife)); //DEC-Weapon (Round) stats
memset(attackers,0,sizeof(attackers)); memset(&attackers,0,sizeof(attackers));
memset(victims,0,sizeof(victims)); memset(&victims,0,sizeof(victims));
life = {}; life = {};
} }

2
modules/dod/dodx/moduleconfig.cpp
View File

@ -173,7 +173,7 @@ void PlayerPreThink_Post(edict_t *pEntity)
{ {
pPlayer->clearRound = 0.0f; pPlayer->clearRound = 0.0f;
memset(static_cast<void *>(&pPlayer->round),0,sizeof(pPlayer->round)); memset(static_cast<void *>(&pPlayer->round),0,sizeof(pPlayer->round));
memset(pPlayer->weaponsRnd,0,sizeof(pPlayer->weaponsRnd)); memset(&pPlayer->weaponsRnd,0,sizeof(pPlayer->weaponsRnd));
} }
if (pPlayer->sendScore && pPlayer->sendScore < gpGlobals->time) if (pPlayer->sendScore && pPlayer->sendScore < gpGlobals->time)

6
modules/mysqlx/AMBuilder
View File

@ -17,18 +17,18 @@ if AMXX.mysql_path:
binary.sources = [] binary.sources = []
if builder.target_platform is 'linux' or builder.target_platform is 'mac': if builder.target_platform == 'linux' or builder.target_platform == 'mac':
binary.compiler.defines += ['stricmp=strcasecmp'] binary.compiler.defines += ['stricmp=strcasecmp']
binary.compiler.linkflags += [ binary.compiler.linkflags += [
os.path.join(AMXX.mysql_path, 'lib', 'libmysqlclient_r.a'), os.path.join(AMXX.mysql_path, 'lib', 'libmysqlclient_r.a'),
'-lpthread', '-lpthread',
'-lm', '-lm',
] ]
if builder.target_platform is 'linux': if builder.target_platform == 'linux':
binary.compiler.linkflags += [ binary.compiler.linkflags += [
'-lrt' '-lrt'
] ]
elif builder.target_platform is 'windows': elif builder.target_platform == 'windows':
binary.compiler.linkflags += [ binary.compiler.linkflags += [
os.path.join(AMXX.mysql_path, 'lib', 'mysqlclient.lib'), os.path.join(AMXX.mysql_path, 'lib', 'mysqlclient.lib'),
'ws2_32.lib', 'ws2_32.lib',

2
modules/sqlite/AMBuilder
View File

@ -12,7 +12,7 @@ binary.compiler.defines += [
'HAVE_STDINT_H', 'HAVE_STDINT_H',
] ]
if builder.target_platform is 'linux' or builder.target_platform is 'mac': if builder.target_platform == 'linux' or builder.target_platform == 'mac':
binary.compiler.defines += ['stricmp=strcasecmp'] binary.compiler.defines += ['stricmp=strcasecmp']
binary.compiler.postlink += ['-lpthread'] binary.compiler.postlink += ['-lpthread']

8
modules/tfcx/CMisc.cpp
View File

@ -126,10 +126,10 @@ void CPlayer::Connect(const char* address ){
void CPlayer::restartStats(bool all) void CPlayer::restartStats(bool all)
{ {
if ( all ) memset(weapons,0,sizeof(weapons)); if ( all ) memset(&weapons,0,sizeof(weapons));
memset(weaponsRnd,0,sizeof(weaponsRnd)); //DEC-Weapon (Round) stats memset(&weaponsRnd,0,sizeof(weaponsRnd)); //DEC-Weapon (Round) stats
memset(attackers,0,sizeof(attackers)); memset(&attackers,0,sizeof(attackers));
memset(victims,0,sizeof(victims)); memset(&victims,0,sizeof(victims));
life = {}; life = {};
} }

8
modules/ts/tsx/CMisc.cpp
View File

@ -78,10 +78,10 @@ void CPlayer::Connect(const char* ippp)
void CPlayer::restartStats(bool all) void CPlayer::restartStats(bool all)
{ {
if ( all ) memset(weapons,0,sizeof(weapons)); if ( all ) memset(&weapons,0,sizeof(weapons));
memset(weaponsRnd,0,sizeof(weaponsRnd)); //DEC-Weapon (Round) stats memset(&weaponsRnd,0,sizeof(weaponsRnd)); //DEC-Weapon (Round) stats
memset(attackers,0,sizeof(attackers)); memset(&attackers,0,sizeof(attackers));
memset(victims,0,sizeof(victims)); memset(&victims,0,sizeof(victims));
life = {}; life = {};
} }

2
third_party/zlib/AMBuilder vendored
View File

@ -3,7 +3,7 @@ import os, platform
lib = builder.compiler.StaticLibrary('zlib') lib = builder.compiler.StaticLibrary('zlib')
if builder.target_platform is 'linux' or builder.target_platform is 'mac': if builder.target_platform == 'linux' or builder.target_platform == 'mac':
lib.compiler.defines += [ lib.compiler.defines += [
'HAVE_UNISTD_H' 'HAVE_UNISTD_H'
] ]