X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fall.qc;h=b8d2428f3ff24ac9c30d6d1b26930bd2012a7b42;hb=b8880819e333ef558143ae80afcdb339b907a439;hp=5c51c2d87b4da7071b8dcde95671038f3618e630;hpb=fcd31ea01083f448ef36785ad0bdb4244927fa42;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc
index 5c51c2d87..b8d2428f3 100644
--- a/qcsrc/common/weapons/all.qc
+++ b/qcsrc/common/weapons/all.qc
@@ -123,6 +123,8 @@ string W_UndeprecateName(string s)
 		case "minstanex": return "vaporizer";
 		case "grenadelauncher": return "mortar";
 		case "uzi": return "machinegun";
+		case "hmg": return "okhmg";
+		case "rpc": return "okrpc";
 		default: return s;
 	}
 }
@@ -192,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)
 	{
@@ -207,35 +208,49 @@ 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?
 	}
 }
 
+string GetAmmoName(int ammotype)
+{
+	switch (ammotype)
+	{
+		case RES_SHELLS:  return ITEM_Shells.m_name;
+		case RES_BULLETS: return ITEM_Bullets.m_name;
+		case RES_ROCKETS: return ITEM_Rockets.m_name;
+		case RES_CELLS:   return ITEM_Cells.m_name;
+		case RES_PLASMA:  return ITEM_Plasma.m_name;
+		case RES_FUEL:    return ITEM_JetpackFuel.m_name;
+		default:          return "batteries";
+	}
+}
+
 #ifdef CSQC
 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;
 	}
 }
 
@@ -243,12 +258,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;
 	}
 }
@@ -293,24 +308,21 @@ vector shotorg_adjustfromclient(vector vecs, float y_is_right, float algn)
 
 vector shotorg_adjust_values(vector vecs, bool y_is_right, bool visual, int algn)
 {
-#ifdef SVQC
 	string s;
-#endif
 	if (visual)
 	{
 		vecs = shotorg_adjustfromclient(vecs, y_is_right, algn);
 	}
-#ifdef SVQC
-	else if (autocvar_g_shootfromeye)
+	else if (STAT(SHOOTFROMEYE))
 	{
 		vecs.y = vecs.z = 0;
 	}
-	else if (autocvar_g_shootfromcenter)
+	else if (STAT(SHOOTFROMCENTER))
 	{
 		vecs.y = 0;
 		vecs.z -= 2;
 	}
-	else if ((s = autocvar_g_shootfromfixedorigin) != "")
+	else if ((s = G_SHOOTFROMFIXEDORIGIN) != "")
 	{
 		vector v = stov(s);
 		if (y_is_right) v.y = -v.y;
@@ -318,7 +330,6 @@ vector shotorg_adjust_values(vector vecs, bool y_is_right, bool visual, int algn
 		vecs.y = v.y;
 		vecs.z = v.z;
 	}
-#endif
 	else  // just do the same as top
 	{
 		vecs = shotorg_adjustfromclient(vecs, y_is_right, algn);
@@ -554,14 +565,27 @@ REGISTER_NET_TEMP(wframe)
 #ifdef CSQC
 NET_HANDLE(wframe, bool isNew)
 {
-	vector a = ReadVector();
+	int fr = ReadByte();
+	float t = ReadFloat();
     int slot = ReadByte();
 	bool restartanim = ReadByte();
 	entity wepent = viewmodels[slot];
-	if(a.x == wepent.anim_idle_x) // we don't need to enforce idle animation
-		wepent.animstate_looping = false;
+	if(fr == WFRAME_IDLE)
+		wepent.animstate_looping = false; // we don't need to enforce idle animation
 	else
+	{
+		vector a = '0 0 0';
+		switch(fr)
+		{
+			case WFRAME_IDLE: a = wepent.anim_idle; break;
+			case WFRAME_FIRE1: a = wepent.anim_fire1; break;
+			case WFRAME_FIRE2: a = wepent.anim_fire2; break;
+			default:
+			case WFRAME_RELOAD: a = wepent.anim_reload; break;
+		}
+		a.z *= t;
 		anim_set(wepent, a, !restartanim, restartanim, restartanim);
+	}
 	wepent.state = ReadByte();
 	wepent.weapon_nextthink = ReadFloat();
 	switch (wepent.state)
@@ -581,13 +605,14 @@ NET_HANDLE(wframe, bool isNew)
 #endif
 
 #ifdef SVQC
-void wframe_send(entity actor, entity weaponentity, vector a, bool restartanim)
+void wframe_send(entity actor, entity weaponentity, int wepframe, float attackrate, bool restartanim)
 {
 	if (!IS_REAL_CLIENT(actor)) return;
 	int channel = MSG_ONE;
 	msg_entity = actor;
 	WriteHeader(channel, wframe);
-	WriteVector(channel, a);
+	WriteByte(channel, wepframe);
+	WriteFloat(channel, attackrate);
 	WriteByte(channel, weaponslot(weaponentity.weaponentity_fld));
 	WriteByte(channel, restartanim);
 	WriteByte(channel, weaponentity.state);