diff --git a/source/enet/callbacks.c b/source/enet/callbacks.c index 7f960af3..0bed048b 100644 --- a/source/enet/callbacks.c +++ b/source/enet/callbacks.c @@ -5,6 +5,7 @@ #define ENET_BUILDING_LIB 1 #include "enet/enet.h" + static ENetCallbacks callbacks = { malloc, free, rand }; int diff --git a/source/src/bot/ac_bot_ai.cpp b/source/src/bot/ac_bot_ai.cpp index 749ecda9..33b0e910 100644 --- a/source/src/bot/ac_bot_ai.cpp +++ b/source/src/bot/ac_bot_ai.cpp @@ -95,7 +95,7 @@ bool CACBot::ChoosePreferredWeapon() void CACBot::Reload(int Gun) { - printf("bot reload"); + }; entity *CACBot::SearchForEnts(bool bUseWPs, float flRange, float flMaxHeight) diff --git a/source/src/renderextras.cpp b/source/src/renderextras.cpp index d27e839e..0984cda3 100644 --- a/source/src/renderextras.cpp +++ b/source/src/renderextras.cpp @@ -551,8 +551,6 @@ void addshotline(dynent *d, vec &from, vec &to) }; }; -VAR(shotline_duration, 0, 75, 10000); - void rendershotlines() { int lines = 0; @@ -560,6 +558,7 @@ void rendershotlines() { shotline *s = &shotlines[i]; if(!s->inuse) continue; + const int shotline_duration = 75; if(lastmillis-s->millis > shotline_duration) { s->inuse = false; continue; } if(!lines) diff --git a/source/src/weapon.cpp b/source/src/weapon.cpp index 3b28d861..8358e43c 100644 --- a/source/src/weapon.cpp +++ b/source/src/weapon.cpp @@ -113,7 +113,7 @@ COMMAND(altaction, ARG_1INT); void reload(dynent *d) { - if(!d || d->reloading) return; + if(!d || d->reloading || d->weaponchanging) return; if(d == player1) setscope(false); bool akimbo = d->gunselect==GUN_PISTOL && d->akimbo!=0; diff --git a/source/vcpp/cube.suo b/source/vcpp/cube.suo index 3ca6653c..20f50b60 100644 Binary files a/source/vcpp/cube.suo and b/source/vcpp/cube.suo differ diff --git a/source/vcpp/cube.vcproj b/source/vcpp/cube.vcproj index 857c955d..f8a74132 100644 --- a/source/vcpp/cube.vcproj +++ b/source/vcpp/cube.vcproj @@ -1,7 +1,7 @@