osok, hudgun preload

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@608 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2006-11-12 16:53:41 +00:00
parent 446ce0ca7a
commit f2473ce615
2 changed files with 41 additions and 45 deletions
@@ -40,7 +40,6 @@ void spawnstate(playerent *d)              // reset player state not persistent
    if(d==player1) 
    {
        gun_changed = true;
-		//player1->primary = m_pistol ? GUN_PISTOL : (m_ss ? GUN_SNIPER : player1->nextprimary);
        player1->primary = m_osok ? GUN_SNIPER : player1->nextprimary;
        if(player1->skin!=player1->nextskin)
        {
@@ -50,6 +49,7 @@ void spawnstate(playerent *d)              // reset player state not persistent
        setscope(false);
    };
    equip(d);
+    if(m_osok) d->health = 1;
 	dblend = 0;
 };