kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@628 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lee Salzman
2006-11-12 22:59:40 +00:00
parent 2b0a15a445
commit 37ff36e7a0
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/clientgame.cpp
+1 -1
View File
@@ -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;
source/src/entities.cpp
+1 -1
View File
@@ -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;
source/src/weapon.cpp
+1 -1
View File
@@ -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;