no message

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@360 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2006-08-27 18:27:57 +00:00
parent 4c21758964
commit a22d3755dc
27 changed files with 188 additions and 149 deletions
@@ -49,7 +49,7 @@ void weaponswitch(int gun)
 void weapon(int gun)
 {
    if(scoped) togglescope();
-	if(NADE_IN_HAND) return;
+	if(NADE_IN_HAND || player1->reloading) return;
    
    gun %= G_NUM;
    if(gun<0) gun = G_NUM+gun;