From b6887383205bd2c24467158732d564f97234bebb Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Thu, 23 Apr 2020 01:45:56 +0200 Subject: [PATCH] Counter-Strike: Fix armoury_entity from selecting the wrong model for some items. --- src/server/cstrike/armoury_entity.cpp | 10 ++++++---- src/server/cstrike/server.c | 1 - 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/server/cstrike/armoury_entity.cpp b/src/server/cstrike/armoury_entity.cpp index 5e4bfc1f..d7286427 100644 --- a/src/server/cstrike/armoury_entity.cpp +++ b/src/server/cstrike/armoury_entity.cpp @@ -145,7 +145,7 @@ armoury_entity::armoury_entity(void) remove(this); return; } - + m_iCount = 1; for (int i = 1; i < (tokenize(__fullspawndata) - 1); i += 2) { @@ -154,14 +154,16 @@ armoury_entity::armoury_entity(void) m_iCount = stoi(argv(i+1)); break; case "item": - m_iItem = g_cstrike_armouryitems[stoi(argv(i+1))]; + int id = stoi(argv(i+1)); - if (m_iItem < 0 || m_iItem >= 19) { + if (id < 0 || id >= 19) { print(sprintf("^1armoury_entity with invalid item %i. ignoring\n", m_iItem)); remove(this); return; } - model = sArmouryModels[m_iItem]; + + m_iItem = g_cstrike_armouryitems[id]; + model = sArmouryModels[id]; break; default: break; diff --git a/src/server/cstrike/server.c b/src/server/cstrike/server.c index 034089f4..0777f36c 100644 --- a/src/server/cstrike/server.c +++ b/src/server/cstrike/server.c @@ -14,7 +14,6 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ - void Game_InitRules(void) {