Merge branch 'terencehill/connection_msg_fix' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / cheats.qc

diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc
index 996058f1d4f2c75439eda161044543eb70a43b96..cdad6d9fea184ca1a8aaa5d484b9cf476b38bedc 100644 (file)
--- a/qcsrc/server/cheats.qc
+++ b/qcsrc/server/cheats.qc
@@ -599,7 +599,7 @@ float CheatCommand(float argc)
                                                        {
                                                                if(vlen(oldself.origin - start) < vlen(e.origin - start))
                                                                        ++effectnum;
-                                                               else if(vlen(oldself.origin - start) == vlen(e.origin - start) && num_for_edict(oldself) < num_for_edict(e))
+                                                               else if(vlen(oldself.origin - start) == vlen(e.origin - start) && etof(oldself) < etof(e))
                                                                        ++effectnum;
                                                        }
                                                        fputs(f, strcat("\"race_place\" \"", ftos(effectnum), "\"\n"));
@@ -1067,7 +1067,8 @@ void DragBox_Think()
                self.maxs_y = fabs(self.aiment.origin.y - self.enemy.origin.y) * 0.5;
                self.maxs_z = fabs(self.aiment.origin.z - self.enemy.origin.z) * 0.5;
                self.mins = -1 * self.maxs;
-               setorigin(self, self.origin); setsize(self, self.mins, self.maxs); // link edict
+               setorigin(self, self.origin);
+               setsize(self, self.mins, self.maxs); // link edict
        }
 
        if(self.cnt == -1) // actually race_place -1