markmental/yapb-noob-edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more fixed for clang warnings

Browse source
This commit is contained in:
Dmitry 2015-06-06 16:37:15 +03:00
commit 8f48af4314
5 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
include/core.h
View file

@ -852,9 +852,10 @@ private:
float m_firstCollideTime; // time of first collision float m_firstCollideTime; // time of first collision
float m_probeTime; // time of probing different moves float m_probeTime; // time of probing different moves
float m_lastCollTime; // time until next collision check float m_lastCollTime; // time until next collision check
char m_collisionProbeBits; // bits of possible collision moves
char m_collideMoves[4]; // sorted array of movements unsigned int m_collisionProbeBits; // bits of possible collision moves
char m_collStateIndex; // index into collide moves unsigned int m_collideMoves[4]; // sorted array of movements
unsigned int m_collStateIndex; // index into collide moves
CollisionState m_collisionState; // collision State CollisionState m_collisionState; // collision State
PathNode *m_navNode; // pointer to current node from path PathNode *m_navNode; // pointer to current node from path

2
project/yapb.vcxproj
View file

@ -226,7 +226,7 @@
<OutputFile>.\release\yapb.dll</OutputFile> <OutputFile>.\release\yapb.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<DelayLoadDLLs>user32.dll;ws2_32.dll;%(DelayLoadDLLs)</DelayLoadDLLs> <DelayLoadDLLs>user32.dll;ws2_32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>Debug</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
<GenerateMapFile>false</GenerateMapFile> <GenerateMapFile>false</GenerateMapFile>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<OptimizeReferences>false</OptimizeReferences> <OptimizeReferences>false</OptimizeReferences>

4
source/combat.cpp
View file

@ -1394,9 +1394,9 @@ void Bot::CommandTeam (void)
if (memberNear) // has teammates ? 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); 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); RadioMessage (Radio_Fallback);
} }
else if (memberExists && yb_communication_type.GetInt () == 1) else if (memberExists && yb_communication_type.GetInt () == 1)

6
source/interface.cpp
View file

@ -165,12 +165,10 @@ int BotCommandHandler (edict_t *ent, const char *arg0, const char *arg1, const c
"------------------------------------------------\n" "------------------------------------------------\n"
"Name: %s\n" "Name: %s\n"
"Version: %s (Build: %u)\n" "Version: %s (Build: %u)\n"
"Compiled by: %s\n"
"Compiled: %s, %s +300 (GMT)\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 // 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 }, { "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 { "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 }, { "retrocs", "rcs_i386.so", "cs.dylib", "rcs.dll", "Retro Counter-Strike", CSV_OLD },
{"", "", "", "", 0} {"", "", "", "", 0},
}; };
// get the engine functions from the engine... // get the engine functions from the engine...

2
source/support.cpp
View file

@ -1243,7 +1243,7 @@ void AddLogEntry (bool outputToConsole, int logLevel, const char *format, ...)
#if defined (PLATFORM_WIN32) #if defined (PLATFORM_WIN32)
MessageBoxA (GetActiveWindow (), buffer, "YaPB Error", MB_ICONSTOP); MessageBoxA (GetActiveWindow (), buffer, "YaPB Error", MB_ICONSTOP);
#else #else
printf (buffer); printf ("%s", buffer);
#endif #endif
FreeLibraryMemory (); FreeLibraryMemory ();