X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fent_cs.qc;h=36b8b587edea078fec656450ba5bb8acd1259383;hp=3e861dc55f5ea6fa7e1840d5a7fa1cba6b9091e7;hb=0c9d2b6fb006ced68b15614ab73f5e5273679cc8;hpb=ac8fcab4091acca8a86ee37d23f23d68c1e9eace

diff --git a/qcsrc/common/ent_cs.qc b/qcsrc/common/ent_cs.qc
index 3e861dc55f..36b8b587ed 100644
--- a/qcsrc/common/ent_cs.qc
+++ b/qcsrc/common/ent_cs.qc
@@ -33,9 +33,9 @@ STATIC_INIT(RegisterEntCSProps_renumber) { FOREACH(EntCSProps, true, it.m_id = i
 	bool id##_check(entity ent, entity player) { return (ent.(checkprop) != player.(checkprop)); } \
 	_ENTCS_PROP(id, ispublic, checkprop, setprop, svsend, clreceive)
 
-#define ENTCS_PROP_ENCODED(id, ispublic, checkprop, setprop, encfactor, svsend, clreceive) \
+#define ENTCS_PROP_CODED(id, ispublic, checkprop, setprop, decfactor, svsend, clreceive) \
 	bool id##_check(entity ent, entity player) { \
-		return (floor(ent.(checkprop)) * encfactor != floor(player.(checkprop)) * encfactor); \
+		return (floor(ent.(checkprop)) / decfactor != floor(player.(checkprop)) * decfactor); \
 	} \
 	_ENTCS_PROP(id, ispublic, checkprop, setprop, svsend, clreceive)
 
@@ -47,14 +47,14 @@ STATIC_INIT(RegisterEntCSProps_renumber) { FOREACH(EntCSProps, true, it.m_id = i
 		this.m_receive = id##_receive; \
 	}
 
-#define ENTCS_PROP_ENCODED(id, ispublic, checkprop, setprop, encfactor, svsend, clreceive) \
+#define ENTCS_PROP_CODED(id, ispublic, checkprop, setprop, decfactor, svsend, clreceive) \
 	ENTCS_PROP(id, ispublic, checkprop, setprop, svsend, clreceive)
 #endif
 
 #ifdef SVQC
-#define ENTCS_PROP_RESOURCE(id, ispublic, checkprop, setprop, encfactor, svsend, clreceive) \
+#define ENTCS_PROP_RESOURCE(id, ispublic, checkprop, setprop, decfactor, svsend, clreceive) \
 	bool id##_check(entity ent, entity player) { \
-		return (floor(GetResourceAmount(ent, checkprop) / encfactor) != floor(GetResourceAmount(player, checkprop) / encfactor)); \
+		return (floor(GetResourceAmount(ent, checkprop) / decfactor) != floor(GetResourceAmount(player, checkprop) / decfactor)); \
 	} \
 	void id##_set(entity ent, entity player) { SetResourceAmountExplicit(ent, checkprop, GetResourceAmount(player, checkprop)); } \
 	void id##_send(int chan, entity ent) { LAMBDA(svsend); } \
@@ -65,7 +65,7 @@ STATIC_INIT(RegisterEntCSProps_renumber) { FOREACH(EntCSProps, true, it.m_id = i
 		this.m_send = id##_send; \
 	}
 #elif defined(CSQC)
-#define ENTCS_PROP_RESOURCE(id, ispublic, checkprop, setprop, encfactor, svsend, clreceive) \
+#define ENTCS_PROP_RESOURCE(id, ispublic, checkprop, setprop, decfactor, svsend, clreceive) \
 	void id##_receive(entity ent) { LAMBDA(clreceive); } \
 	REGISTER(EntCSProps, ENTCS_PROP, id, m_id, new_pure(entcs_prop)) { \
 		this.m_public = ispublic; \
@@ -88,22 +88,22 @@ ENTCS_PROP(ORIGIN, false, origin, ENTCS_SET_NORMAL,
 	{ WriteVector(chan, ent.origin); },
 	{ ent.has_sv_origin = true; vector v = ReadVector(); setorigin(ent, v); })
 
-#define ENC_FACTOR (360 / 256)
-ENTCS_PROP_ENCODED(ANGLES, false, angles_y, ENTCS_SET_NORMAL, 1 / ENC_FACTOR,
-	{ WriteByte(chan, ent.angles.y / ENC_FACTOR); },
-	{ vector v = '0 0 0'; v.y = ReadByte() * ENC_FACTOR; ent.angles = v; })
-#undef ENC_FACTOR
+#define DEC_FACTOR (360 / 256)
+ENTCS_PROP_CODED(ANGLES, false, angles_y, ENTCS_SET_NORMAL, DEC_FACTOR,
+	{ WriteByte(chan, ent.angles.y / DEC_FACTOR); },
+	{ vector v = '0 0 0'; v.y = ReadByte() * DEC_FACTOR; ent.angles = v; })
+#undef DEC_FACTOR
 
 // FIXME: use a better scale?
-#define ENC_FACTOR 10
-ENTCS_PROP_RESOURCE(HEALTH, false, RESOURCE_HEALTH, ENTCS_SET_NORMAL, ENC_FACTOR,
-	{ WriteByte(chan, bound(0, GetResourceAmount(ent, RESOURCE_HEALTH) / ENC_FACTOR, 255)); },
-	{ ent.healthvalue = ReadByte() * ENC_FACTOR; })
-
-ENTCS_PROP_RESOURCE(ARMOR, false, RESOURCE_ARMOR, ENTCS_SET_NORMAL, ENC_FACTOR,
-	{ WriteByte(chan, bound(0, GetResourceAmount(ent, RESOURCE_ARMOR) / ENC_FACTOR, 255)); },
-	{ SetResourceAmountExplicit(ent, RESOURCE_ARMOR, ReadByte() * ENC_FACTOR); })
-#undef ENC_FACTOR
+#define DEC_FACTOR 10
+ENTCS_PROP_RESOURCE(HEALTH, false, RESOURCE_HEALTH, ENTCS_SET_NORMAL, DEC_FACTOR,
+	{ WriteByte(chan, bound(0, GetResourceAmount(ent, RESOURCE_HEALTH) / DEC_FACTOR, 255)); },
+	{ ent.healthvalue = ReadByte() * DEC_FACTOR; })
+
+ENTCS_PROP_RESOURCE(ARMOR, false, RESOURCE_ARMOR, ENTCS_SET_NORMAL, DEC_FACTOR,
+	{ WriteByte(chan, bound(0, GetResourceAmount(ent, RESOURCE_ARMOR) / DEC_FACTOR, 255)); },
+	{ SetResourceAmountExplicit(ent, RESOURCE_ARMOR, ReadByte() * DEC_FACTOR); })
+#undef DEC_FACTOR
 
 ENTCS_PROP(NAME, true, netname, ENTCS_SET_MUTABLE_STRING,
 	{ WriteString(chan, ent.netname); },