From 8f48af4314e455e1b9a2617784f2ecea896bd33c Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sat, 6 Jun 2015 16:37:15 +0300 Subject: [PATCH] more fixed for clang warnings --- include/core.h | 7 ++++--- project/yapb.vcxproj | 2 +- source/combat.cpp | 4 ++-- source/interface.cpp | 6 ++---- source/support.cpp | 2 +- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/include/core.h b/include/core.h index afdae31..a772a25 100644 --- a/include/core.h +++ b/include/core.h @@ -852,9 +852,10 @@ private: float m_firstCollideTime; // time of first collision float m_probeTime; // time of probing different moves float m_lastCollTime; // time until next collision check - char m_collisionProbeBits; // bits of possible collision moves - char m_collideMoves[4]; // sorted array of movements - char m_collStateIndex; // index into collide moves + + unsigned int m_collisionProbeBits; // bits of possible collision moves + unsigned int m_collideMoves[4]; // sorted array of movements + unsigned int m_collStateIndex; // index into collide moves CollisionState m_collisionState; // collision State PathNode *m_navNode; // pointer to current node from path diff --git a/project/yapb.vcxproj b/project/yapb.vcxproj index 15a73e0..d45ab97 100644 --- a/project/yapb.vcxproj +++ b/project/yapb.vcxproj @@ -226,7 +226,7 @@ .\release\yapb.dll true user32.dll;ws2_32.dll;%(DelayLoadDLLs) - Debug + false false Windows false diff --git a/source/combat.cpp b/source/combat.cpp index d0ec016..0ffbc6b 100644 --- a/source/combat.cpp +++ b/source/combat.cpp @@ -1394,9 +1394,9 @@ void Bot::CommandTeam (void) if (memberNear) // has teammates ? { - if (m_personality == PERSONALITY_RUSHER && !(yb_communication_type.GetInt () == 2)) + if (m_personality == PERSONALITY_RUSHER && yb_communication_type.GetInt () == 2) RadioMessage (Radio_StormTheFront); - else if (!m_personality == PERSONALITY_RUSHER && !(yb_communication_type.GetInt () == 2)) + else if (m_personality != PERSONALITY_RUSHER && yb_communication_type.GetInt () == 2) RadioMessage (Radio_Fallback); } else if (memberExists && yb_communication_type.GetInt () == 1) diff --git a/source/interface.cpp b/source/interface.cpp index 980cb00..c3ffb4e 100644 --- a/source/interface.cpp +++ b/source/interface.cpp @@ -165,12 +165,10 @@ int BotCommandHandler (edict_t *ent, const char *arg0, const char *arg1, const c "------------------------------------------------\n" "Name: %s\n" "Version: %s (Build: %u)\n" - "Compiled by: %s\n" "Compiled: %s, %s +300 (GMT)\n" - "Meta-Interface Version: %s\n" "------------------------------------------------"; - ClientPrint (ent, print_console, versionData, PRODUCT_NAME, PRODUCT_VERSION, GenerateBuildNumber (), PRODUCT_AUTHOR, __DATE__, __TIME__, META_INTERFACE_VERSION); + ClientPrint (ent, print_console, versionData, PRODUCT_NAME, PRODUCT_VERSION, GenerateBuildNumber (), __DATE__, __TIME__); } // display some sort of help information @@ -3074,7 +3072,7 @@ DLL_GIVEFNPTRSTODLL GiveFnptrsToDll (enginefuncs_t *functionTable, globalvars_t { "csv15", "cs_i386.so", "cs.dylib", "mp.dll", "CS 1.5 for Steam", CSV_OLD }, { "cs13", "cs_i386.so", "cs.dylib", "mp.dll", "Counter-Strike v1.3", CSV_OLD }, // assume cs13 = cs15 { "retrocs", "rcs_i386.so", "cs.dylib", "rcs.dll", "Retro Counter-Strike", CSV_OLD }, - {"", "", "", "", 0} + {"", "", "", "", 0}, }; // get the engine functions from the engine... diff --git a/source/support.cpp b/source/support.cpp index abc6f04..e50f40a 100644 --- a/source/support.cpp +++ b/source/support.cpp @@ -1243,7 +1243,7 @@ void AddLogEntry (bool outputToConsole, int logLevel, const char *format, ...) #if defined (PLATFORM_WIN32) MessageBoxA (GetActiveWindow (), buffer, "YaPB Error", MB_ICONSTOP); #else - printf (buffer); + printf ("%s", buffer); #endif FreeLibraryMemory ();