diff --git a/code/game/g_main.c b/code/game/g_main.c
index 575e3f2..26fc02b 100644
--- a/code/game/g_main.c
+++ b/code/game/g_main.c
@@ -768,16 +768,13 @@ static qboolean G_LoadClassData( char* fileName )
 
 						if( Q_stricmpn( token, "WP_", 3 ) == 0 )
 						{
-							weapon = GetIDForString( WeaponTable, token );
+							int t = GetIDForString( WeaponTable, token );
 
-							if ( weapon > 0 ) {
+							if ( t >= 0 ) {
+								weapon = (unsigned)t;
 								g_classData[classIndex].weaponsFlags |= ( 1 << weapon );
 								continue;
 							}
-							if ( weapon == 0) {
-								g_classData[classIndex].weaponsFlags |= 1;
-								continue;
-							}
 						}
 					}