From 37ff36e7a0c2e95fd1dd2b8d161999154aa9bdf6 Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Sun, 12 Nov 2006 22:59:40 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@628 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/clientgame.cpp | 2 +- source/src/entities.cpp | 2 +- source/src/weapon.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp index 928f285e..5eccb506 100644 --- a/source/src/clientgame.cpp +++ b/source/src/clientgame.cpp @@ -40,7 +40,7 @@ void spawnstate(playerent *d) // reset player state not persistent if(d==player1) { gun_changed = true; - player1->primary = m_osok ? GUN_SNIPER : player1->nextprimary; + player1->primary = m_osok ? GUN_SNIPER : (m_pistol ? GUN_PISTOL : player1->nextprimary); if(player1->skin!=player1->nextskin) { c2sinit=false; diff --git a/source/src/entities.cpp b/source/src/entities.cpp index 5660ae5b..59af4571 100644 --- a/source/src/entities.cpp +++ b/source/src/entities.cpp @@ -272,7 +272,7 @@ void equip(playerent *d) if(m_pistol || d->primary==GUN_PISTOL) // pistol only mode { d->ammo[GUN_PISTOL] = itemstats[GUN_PISTOL].max; - } + }; if(m_lss) { d->mag[d->primary] = d->mag[GUN_PISTOL] = 0; diff --git a/source/src/weapon.cpp b/source/src/weapon.cpp index 83eaa2cd..09896796 100644 --- a/source/src/weapon.cpp +++ b/source/src/weapon.cpp @@ -67,7 +67,7 @@ void weapon(int gun) if(gun != GUN_KNIFE && gun != GUN_GRENADE && gun != GUN_PISTOL && gun != player1->primary) return; if(m_noguns && gun != GUN_KNIFE && gun != GUN_GRENADE) return; - if(m_noprimary && gun != GUN_KNIFE && gun != GUN_GRENADE && gun != GUN_KNIFE) return; + if(m_noprimary && gun != GUN_KNIFE && gun != GUN_GRENADE && gun != GUN_PISTOL) return; if(m_nopistol && gun == GUN_PISTOL) return; if(gun == GUN_GRENADE && !player1->mag[GUN_GRENADE]) return;