Feb 2021 Update

Th3Fr33m4n · Feb 20, 2021 · 193d914 · 193d914
1 parent 8f7f348
commit 193d914
Show file tree

Hide file tree

Showing 16 changed files with 208 additions and 206 deletions.
diff --git a/.gitignore b/.gitignore
@@ -45,3 +45,7 @@ Release/jk-botti.tlog/jk-botti.lastbuildstate
 Release/jk-botti.tlog/unsuccessfulbuild
 Release/safe_snprintf.obj
 Release/vc142.pdb
+.vs/jk-botti/v16/ipch/AutoPCH/452fab92dc351b9f/BOT_WEAPONS.ipch
+*.ipch
+.vs/jk-botti/v16/Browse.VC.db-wal
+.vs/jk-botti/v16/Browse.VC.db-shm
diff --git a/Makefile b/Makefile
@@ -22,8 +22,8 @@ else
 endif
 
 TARGET = jk_botti_mm
-BASEFLAGS = -Wall -Wno-write-strings -Wno-aggressive-loop-optimizations
-ARCHFLAG += -march=i686 -mtune=generic -msse -msse2 -mmmx -s -pipe -mfpmath=sse
+BASEFLAGS = -Wall -Wno-write-strings
+ARCHFLAG += -march=i686 -mtune=generic -msse -msse2 -mmmx -pipe -mfpmath=sse
 
 ifeq ($(DBG_FLGS),1)
 	OPTFLAGS = -O0 -g

diff --git a/bot.cpp b/bot.cpp
@@ -5,7 +5,7 @@
 //
 
 #ifndef _WIN32
-#include <string.h>
+#include <cstring>
 #endif
 
 #include <malloc.h>
@@ -439,8 +439,7 @@ char * GetSpecificTeam(char * teamstr, size_t slen, qboolean get_smallest, qbool
             {
                count++;
             }
-         }
-
+         }         
 
          if(get_smallest)
          {
@@ -571,7 +570,6 @@ static void RecountTeams(void)
    }
 }
 
-
 //
 void BotCheckTeamplay(void)
 {
@@ -2916,7 +2914,7 @@ void BotThink( bot_t &pBot )
       f_strafe_speed = calc.x;
       pBot.f_move_speed = calc.y;
 
-      if(0)
+      if(false)
       {
          Vector v_angle = pEdict->v.v_angle;
          v_angle.x = 0;

diff --git a/bot.h b/bot.h
@@ -7,7 +7,7 @@
 #ifndef BOT_H
 #define BOT_H
 
-#include <ctype.h>
+#include <cctype>
 #include "safe_snprintf.h"
 
 // Manual branch optimization for GCC 3.0.0 and newer

diff --git a/bot_inline_funcs.h b/bot_inline_funcs.h
@@ -7,7 +7,7 @@
 #ifndef BOT_INLINE_FUNCS
 #define BOT_INLINE_FUNCS
 
-#include <inttypes.h>
+#include <cinttypes>
 #include <sys/time.h>
 
 // Manual branch optimization for GCC 3.0.0 and newer

diff --git a/bot_query_hook.cpp b/bot_query_hook.cpp
@@ -9,7 +9,7 @@
 #endif
 
 #include <malloc.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <memory.h>
 
 #include <extdll.h>

diff --git a/bot_query_hook_win32.cpp b/bot_query_hook_win32.cpp
@@ -6,11 +6,11 @@
 
 #ifdef _WIN32
 
-#include <string.h>
+#include <cstring>
 
 #include <memory.h>
-#include <string.h>
-#include <stdio.h>
+#include <cstring>
+#include <cstdio>
 
 #include <winsock2.h>
 #include <windows.h>

diff --git a/bot_weapons.cpp b/bot_weapons.cpp
@@ -5,7 +5,7 @@
 //
 
 #ifndef _WIN32
-#include <string.h>
+#include <cstring>
 #endif
 
 #include <extdll.h>

diff --git a/commands.cpp b/commands.cpp
@@ -5,7 +5,7 @@
 //
 
 #ifndef _WIN32
-#include <string.h>
+#include <cstring>
 #endif
 
 #include <extdll.h>
@@ -14,7 +14,7 @@
 #include <meta_api.h>
 #include <entity_state.h>
 #include <pm_defs.h>
-#include <time.h>
+#include <ctime>
 
 #include "bot.h"
 #include "bot_func.h"

diff --git a/dll.cpp b/dll.cpp
@@ -5,7 +5,7 @@
 //
 
 #ifndef _WIN32
-#include <string.h>
+#include <cstring>
 #endif
 
 #include <malloc.h>
@@ -16,7 +16,7 @@
 #include <meta_api.h>
 #include <entity_state.h>
 #include <pm_defs.h>
-#include <time.h>
+#include <ctime>
 
 #include "bot.h"
 #include "bot_func.h"

diff --git a/engine.cpp b/engine.cpp
@@ -5,7 +5,7 @@
 //
 
 #ifndef _WIN32
-#include <string.h>
+#include <cstring>
 #endif
 
 #include <extdll.h>

diff --git a/h_export.cpp b/h_export.cpp
@@ -5,7 +5,7 @@
 //
 
 #ifndef _WIN32
-#include <string.h>
+#include <cstring>
 #endif
 
 #include <extdll.h>