From 632dd55301148bfcd3ec1e16fd15730ba86d0358 Mon Sep 17 00:00:00 2001 From: driAn Date: Tue, 7 Nov 2006 23:01:39 +0000 Subject: [PATCH] no message git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@534 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/enet/callbacks.c | 1 + source/src/bot/ac_bot_ai.cpp | 2 +- source/src/renderextras.cpp | 3 +-- source/src/weapon.cpp | 2 +- source/vcpp/cube.suo | Bin 80896 -> 87552 bytes source/vcpp/cube.vcproj | 8 ++++---- 6 files changed, 8 insertions(+), 8 deletions(-) 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 3ca6653cbf5b716e3445d2d60fe9745333aad1a7..20f50b6041aaf4be120e5c4a37b22abfe8b61b76 100644 GIT binary patch delta 9394 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