Fixed compiler warnings.
This commit is contained in:
parent
74f1ab866b
commit
b75e1b8a23
9 changed files with 22 additions and 17 deletions
|
|
@ -571,7 +571,7 @@ bool Game::isSoftwareRenderer () {
|
|||
}
|
||||
|
||||
// and on only windows version you can use software-render game. Linux, OSX always defaults to OpenGL
|
||||
if (plat.win32) {
|
||||
if (plat.win) {
|
||||
return plat.hasModule ("sw");
|
||||
}
|
||||
return false;
|
||||
|
|
@ -696,11 +696,11 @@ bool Game::loadCSBinary () {
|
|||
}
|
||||
StringArray libs;
|
||||
|
||||
if (plat.win32) {
|
||||
if (plat.win) {
|
||||
libs.push ("mp.dll");
|
||||
libs.push ("cs.dll");
|
||||
}
|
||||
else if (plat.linux) {
|
||||
else if (plat.nix) {
|
||||
libs.push ("cs.so");
|
||||
libs.push ("cs_i386.so");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -997,7 +997,7 @@ DLSYM_RETURN EntityLinkage::lookup (SharedLibrary::Handle module, const char *fu
|
|||
}
|
||||
|
||||
// if requested module is yapb module, put in cache the looked up symbol
|
||||
if (self != module || (plat.win32 && (static_cast <uint16> (reinterpret_cast <uint32> (function) >> 16) & 0xffff) == 0)) {
|
||||
if (self != module || (plat.win && (static_cast <uint16> (reinterpret_cast <unsigned long> (function) >> 16) & 0xffff) == 0)) {
|
||||
return resolve (module);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -770,7 +770,11 @@ float BotManager::getAverageTeamKPD (bool calcForBots) {
|
|||
}
|
||||
auto bot = bots[client.ent];
|
||||
|
||||
if ((calcForBots && bot) || (!calcForBots && !bot)) {
|
||||
if (calcForBots && bot) {
|
||||
calc.first += client.ent->v.frags;
|
||||
calc.second++;
|
||||
}
|
||||
else if (!calcForBots && !bot) {
|
||||
calc.first += client.ent->v.frags;
|
||||
calc.second++;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -650,7 +650,7 @@ void BotSupport::installSendTo () {
|
|||
}
|
||||
|
||||
// enable only on modern games
|
||||
if (game.is (GameFlags::Modern) && (plat.linux || plat.win32) && !plat.arm && !m_sendToDetour.detoured ()) {
|
||||
if (game.is (GameFlags::Modern) && (plat.nix || plat.win) && !plat.arm && !m_sendToDetour.detoured ()) {
|
||||
m_sendToDetour.install (reinterpret_cast <void *> (BotSupport::sendTo), true);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue