From: Mario <zacjardine@y7mail.com>
Date: Fri, 21 Aug 2015 05:45:53 +0000 (+1000)
Subject: Boolinterize
X-Git-Tag: xonotic-v0.8.2~2065^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=10347a17e12d553b8e6ea08e24b7ed123d30dd5a;p=xonotic%2Fxonotic-data.pk3dir.git

Boolinterize
---

diff --git a/qcsrc/common/effects.qc b/qcsrc/common/effects.qc
index 8fe7a97d7..cddfd60e5 100644
--- a/qcsrc/common/effects.qc
+++ b/qcsrc/common/effects.qc
@@ -1,4 +1,4 @@
-void Create_Effect_Entity(float eff_name, string eff_string, float eff_trail)
+void Create_Effect_Entity(int eff_name, string eff_string, bool eff_trail)
 {
 	entity eff;
 	effects_ent[eff_name - 1] = eff = spawn();
@@ -10,24 +10,24 @@ void Create_Effect_Entity(float eff_name, string eff_string, float eff_trail)
 }
 
 #ifdef CSQC
-void Read_Effect(float is_new)
+void Read_Effect(bool is_new)
 {
 #if EFFECTS_COUNT >= 255
-	float net_name = ReadShort();
+	int net_name = ReadShort();
 #else
-	float net_name = ReadByte();
+	int net_name = ReadByte();
 #endif
 
 	entity eff = effects_ent[net_name - 1];
 
 	vector v, vel = '0 0 0';
-	float eff_cnt = 1;
-	float eff_trail = eff.eent_eff_trail;
+	int eff_cnt = 1;
+	bool eff_trail = eff.eent_eff_trail;
 	v_x = ReadCoord();
 	v_y = ReadCoord();
 	v_z = ReadCoord();
 
-	float use_vel = ReadByte();
+	bool use_vel = ReadByte();
 	if(use_vel)
 	{
 		vel_x = ReadCoord();
@@ -47,7 +47,7 @@ void Read_Effect(float is_new)
 #endif
 
 #ifdef SVQC
-float Net_Write_Effect(entity client, float sf)
+bool Net_Write_Effect(entity client, int sf)
 {
 	WriteByte(MSG_ENTITY, ENT_CLIENT_EFFECT);
 #if EFFECTS_COUNT >= 255
diff --git a/qcsrc/common/effects.qh b/qcsrc/common/effects.qh
index 2b645813c..5262dee54 100644
--- a/qcsrc/common/effects.qh
+++ b/qcsrc/common/effects.qh
@@ -116,7 +116,7 @@
 #ifdef CSQC
 void Read_Effect(bool is_new);
 #elif defined(SVQC)
-void Send_Effect(string eff_name, vector eff_loc, vector eff_vel, float eff_cnt);
+void Send_Effect(string eff_name, vector eff_loc, vector eff_vel, int eff_cnt);
 #endif
 
 const int EFFECT_FIRST = 1;