X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fall.qc;h=f2fdf4407fb6307494ba7201e009c3c21f36091c;hp=898889149a0ef1fccceb6613e468ae42c92f7107;hb=fada5c8bfa9e769669bdefee4e90d5b473fb174e;hpb=4afba1cb5f5e1526d4f8c26dae616b6bc32e9461

diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc
index 898889149..f2fdf4407 100644
--- a/qcsrc/common/weapons/all.qc
+++ b/qcsrc/common/weapons/all.qc
@@ -194,9 +194,8 @@ string W_FixWeaponOrder_ForceComplete(string order)
 	return W_FixWeaponOrder(order, 1);
 }
 
-void W_RandomWeapons(entity e, int n)
+WepSet W_RandomWeapons(entity e, WepSet remaining, int n)
 {
-	WepSet remaining = e.weapons;
 	WepSet result = '0 0 0';
 	for (int j = 0; j < n; ++j)
 	{
@@ -209,19 +208,19 @@ void W_RandomWeapons(entity e, int n)
 		result |= WepSet_FromWeapon(w);
 		remaining &= ~WepSet_FromWeapon(w);
 	}
-	e.weapons = result;
+	return result;
 }
 
 string GetAmmoPicture(int ammotype)
 {
 	switch (ammotype)
 	{
-		case RESOURCE_SHELLS:  return ITEM_Shells.m_icon;
-		case RESOURCE_BULLETS: return ITEM_Bullets.m_icon;
-		case RESOURCE_ROCKETS: return ITEM_Rockets.m_icon;
-		case RESOURCE_CELLS:   return ITEM_Cells.m_icon;
-		case RESOURCE_PLASMA:  return ITEM_Plasma.m_icon;
-		case RESOURCE_FUEL:    return ITEM_JetpackFuel.m_icon;
+		case RES_SHELLS:  return ITEM_Shells.m_icon;
+		case RES_BULLETS: return ITEM_Bullets.m_icon;
+		case RES_ROCKETS: return ITEM_Rockets.m_icon;
+		case RES_CELLS:   return ITEM_Cells.m_icon;
+		case RES_PLASMA:  return ITEM_Plasma.m_icon;
+		case RES_FUEL:    return ITEM_JetpackFuel.m_icon;
 		default: return "";  // wtf, no ammo type?
 	}
 }
@@ -231,13 +230,13 @@ int GetAmmoTypeFromNum(int i)
 {
 	switch (i)
 	{
-		case 0: return RESOURCE_SHELLS;
-		case 1: return RESOURCE_BULLETS;
-		case 2: return RESOURCE_ROCKETS;
-		case 3: return RESOURCE_CELLS;
-		case 4: return RESOURCE_PLASMA;
-		case 5: return RESOURCE_FUEL;
-		default: return RESOURCE_NONE;
+		case 0: return RES_SHELLS;
+		case 1: return RES_BULLETS;
+		case 2: return RES_ROCKETS;
+		case 3: return RES_CELLS;
+		case 4: return RES_PLASMA;
+		case 5: return RES_FUEL;
+		default: return RES_NONE;
 	}
 }
 
@@ -245,12 +244,12 @@ int GetAmmoStat(int ammotype)
 {
 	switch (ammotype)
 	{
-		case RESOURCE_SHELLS: return STAT_SHELLS;
-		case RESOURCE_BULLETS: return STAT_NAILS;
-		case RESOURCE_ROCKETS: return STAT_ROCKETS;
-		case RESOURCE_CELLS: return STAT_CELLS;
-		case RESOURCE_PLASMA: return STAT_PLASMA.m_id;
-		case RESOURCE_FUEL: return STAT_FUEL.m_id;
+		case RES_SHELLS: return STAT_SHELLS;
+		case RES_BULLETS: return STAT_NAILS;
+		case RES_ROCKETS: return STAT_ROCKETS;
+		case RES_CELLS: return STAT_CELLS;
+		case RES_PLASMA: return STAT_PLASMA.m_id;
+		case RES_FUEL: return STAT_FUEL.m_id;
 		default: return -1;
 	}
 }