[nexuiz-commits] r6637 - in trunk/data/qcsrc: client common menu menu/item menu/nexuiz server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sat May 2 09:18:16 EDT 2009
Author: div0
Date: 2009-05-02 09:18:14 -0400 (Sat, 02 May 2009)
New Revision: 6637
Modified:
trunk/data/qcsrc/client/prandom.qc
trunk/data/qcsrc/client/teamradar.qc
trunk/data/qcsrc/common/util.qc
trunk/data/qcsrc/menu/item/inputbox.c
trunk/data/qcsrc/menu/menu.qc
trunk/data/qcsrc/menu/nexuiz/serverlist.c
trunk/data/qcsrc/server/cl_client.qc
trunk/data/qcsrc/server/cl_player.qc
trunk/data/qcsrc/server/clientcommands.qc
Log:
revert many fteqcc workarounds, as Blub has a patch to fix the bug this works around for
Modified: trunk/data/qcsrc/client/prandom.qc
===================================================================
--- trunk/data/qcsrc/client/prandom.qc 2009-05-02 12:42:04 UTC (rev 6636)
+++ trunk/data/qcsrc/client/prandom.qc 2009-05-02 13:18:14 UTC (rev 6637)
@@ -5,10 +5,7 @@
float prandom()
{
float c;
- string s1, s2;
- s1 = ftos(prandom_seed);
- s2 = ftos(prandom_seed + 3.1415926535);
- c = crc16(FALSE, strcat(s1, s2)); // fteqcc sucks
+ c = crc16(FALSE, strcat(ftos(prandom_seed), ftos(prandom_seed + 3.1415926535)));
prandom_seed = c;
#ifdef USE_PRANDOM_DEBUG
Modified: trunk/data/qcsrc/client/teamradar.qc
===================================================================
--- trunk/data/qcsrc/client/teamradar.qc 2009-05-02 12:42:04 UTC (rev 6636)
+++ trunk/data/qcsrc/client/teamradar.qc 2009-05-02 13:18:14 UTC (rev 6637)
@@ -18,11 +18,7 @@
float vlen_minnorm2d(vector v)
{
- float a, b;
- a = max(v_x, -v_x);
- b = max(v_y, -v_y);
- return min(a, b);
- // return min(max(v_x, -v_x), max(v_y, -v_y)); // fteqcc sucks
+ return min(max(v_x, -v_x), max(v_y, -v_y));
}
vector teamradar_3dcoord_to_texcoord(vector in)
Modified: trunk/data/qcsrc/common/util.qc
===================================================================
--- trunk/data/qcsrc/common/util.qc 2009-05-02 12:42:04 UTC (rev 6636)
+++ trunk/data/qcsrc/common/util.qc 2009-05-02 13:18:14 UTC (rev 6637)
@@ -884,15 +884,10 @@
void cvar_settemp_restore()
{
// undo what cvar_settemp did
- string s1, s2;
float n, i;
n = tokenize_console(cvar_string("settemp_list"));
for(i = 0; i < n - 3; i += 3)
- {
- s1 = argv(i + 1);
- s2 = argv(i + 2);
- cvar_set(s1, s2); // fteqcc sucks
- }
+ cvar_set(argv(i + 1), cvar_string(argv(i + 2)));
cvar_set("settemp_list", "0");
}
#endif
Modified: trunk/data/qcsrc/menu/item/inputbox.c
===================================================================
--- trunk/data/qcsrc/menu/item/inputbox.c 2009-05-02 12:42:04 UTC (rev 6636)
+++ trunk/data/qcsrc/menu/item/inputbox.c 2009-05-02 13:18:14 UTC (rev 6637)
@@ -76,21 +76,17 @@
void enterTextInputBox(entity me, string ch)
{
float i;
- string s1, s2;
for(i = 0; i < strlen(ch); ++i)
if(strstrofs(me.forbiddenCharacters, substring(ch, i, 1), 0) > -1)
return;
if(strlen(ch) + strlen(me.text) > me.maxLength)
return;
- s1 = substring(me.text, 0, me.cursorPos);
- s2 = substring(me.text, me.cursorPos, strlen(me.text) - me.cursorPos);
- me.setText(me, strcat(s1, ch, s2)); // fteqcc sucks
+ me.setText(me, strcat(substring(me.text, 0, me.cursorPos), ch, substring(me.text, me.cursorPos, strlen(me.text) - me.cursorPos)));
me.cursorPos += strlen(ch);
}
float keyDownInputBox(entity me, float key, float ascii, float shift)
{
- string s1, s2;
me.lastChangeTime = time;
me.dragScrollTimer = time;
if(ascii >= 32 && ascii != 127)
@@ -116,22 +112,14 @@
if(me.cursorPos > 0)
{
me.cursorPos -= 1;
- s1 = substring(me.text, 0, me.cursorPos);
- s2 = substring(me.text, me.cursorPos + 1, strlen(me.text) - me.cursorPos - 1);
- me.setText(me, strcat(s1, s2)); // fteqcc sucks
+ me.setText(me, strcat(substring(me.text, 0, me.cursorPos), substring(me.text, me.cursorPos + 1, strlen(me.text) - me.cursorPos - 1)));
}
return 1;
case K_DEL:
if(shift & S_CTRL)
- {
me.setText(me, "");
- }
else
- {
- s1 = substring(me.text, 0, me.cursorPos);
- s2 = substring(me.text, me.cursorPos + 1, strlen(me.text) - me.cursorPos - 1);
- me.setText(me, strcat(s1, s2)); // fteqcc sucks
- }
+ me.setText(me, strcat(substring(me.text, 0, me.cursorPos), substring(me.text, me.cursorPos + 1, strlen(me.text) - me.cursorPos - 1)));
return 1;
}
return 0;
Modified: trunk/data/qcsrc/menu/menu.qc
===================================================================
--- trunk/data/qcsrc/menu/menu.qc 2009-05-02 12:42:04 UTC (rev 6636)
+++ trunk/data/qcsrc/menu/menu.qc 2009-05-02 13:18:14 UTC (rev 6637)
@@ -54,7 +54,7 @@
void() m_init_delayed =
{
float fh, glob, n, i;
- string s, s1, s2;
+ string s;
dprint_load();
@@ -93,11 +93,7 @@
continue;
n = tokenize_console(s);
if(n >= 2)
- {
- s1 = argv(0);
- s2 = substring(s, argv_start_index(1), argv_end_index(-1) - argv_start_index(1));
- Skin_ApplySetting(s1, s2); // fteqcc sucks
- }
+ Skin_ApplySetting(argv(0), substring(s, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)));
}
fclose(fh);
Modified: trunk/data/qcsrc/menu/nexuiz/serverlist.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/serverlist.c 2009-05-02 12:42:04 UTC (rev 6636)
+++ trunk/data/qcsrc/menu/nexuiz/serverlist.c 2009-05-02 13:18:14 UTC (rev 6637)
@@ -104,7 +104,7 @@
void ToggleFavorite(string srv)
{
- string s, s1, s2;
+ string s;
float o;
s = cvar_string("net_slist_favorites");
o = strstrofs(strcat(" ", s, " "), strcat(" ", srv, " "), 0);
@@ -114,9 +114,9 @@
}
else
{
- s1 = substring(s, 0, o - 1);
- s2 = substring(s, o + strlen(srv), strlen(s) - o - strlen(srv));
- cvar_set("net_slist_favorites", strcat(s1, s2)); // fteqcc sucks
+ cvar_set("net_slist_favorites", strcat(
+ substring(s, 0, o - 1), substring(s, o + strlen(srv), strlen(s) - o - strlen(srv))
+ ));
}
resorthostcache();
}
Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc 2009-05-02 12:42:04 UTC (rev 6636)
+++ trunk/data/qcsrc/server/cl_client.qc 2009-05-02 13:18:14 UTC (rev 6637)
@@ -2079,11 +2079,7 @@
if(dot2 == -1)
return 1;
else
- {
- s1 = substring(v1, dot1 + 1, -1);
- s2 = substring(v2, dot2 + 1, -1);
- return vercmp_recursive(s1, s2); // fteqcc sucks
- }
+ return vercmp_recursive(substring(v1, dot1 + 1, 999), substring(v2, dot2 + 1, 999));
}
float vercmp(string v1, string v2)
Modified: trunk/data/qcsrc/server/cl_player.qc
===================================================================
--- trunk/data/qcsrc/server/cl_player.qc 2009-05-02 12:42:04 UTC (rev 6636)
+++ trunk/data/qcsrc/server/cl_player.qc 2009-05-02 13:18:14 UTC (rev 6637)
@@ -881,18 +881,16 @@
void PrecacheGlobalSound(string samplestring)
{
float n, i;
- string s;
tokenize_console(samplestring);
- s = argv(0);
n = stof(argv(1));
if(n > 0)
{
for(i = 1; i <= n; ++i)
- precache_sound(strcat(s, ftos(i), ".wav")); // fteqcc sucks
+ precache_sound(strcat(argv(0), ftos(i), ".wav"));
}
else
{
- precache_sound(strcat(s, ".wav"));
+ precache_sound(strcat(argv(0), ".wav"));
}
}
@@ -973,18 +971,16 @@
{
float n;
float tauntrand;
- string s;
if(sample == "")
return;
tokenize_console(sample);
- s = argv(0);
n = stof(argv(1));
if(n > 0)
- sample = strcat(s, ftos(floor(random() * n + 1)), ".wav"); // randomization, fteqcc sucks
+ sample = strcat(argv(0), ftos(floor(random() * n + 1)), ".wav"); // randomization
else
- sample = strcat(s, ".wav"); // randomization
+ sample = strcat(argv(0), ".wav"); // randomization
switch(voicetype)
{
Modified: trunk/data/qcsrc/server/clientcommands.qc
===================================================================
--- trunk/data/qcsrc/server/clientcommands.qc 2009-05-02 12:42:04 UTC (rev 6636)
+++ trunk/data/qcsrc/server/clientcommands.qc 2009-05-02 13:18:14 UTC (rev 6637)
@@ -101,7 +101,7 @@
float readyrestart_happened;
.float lms_spectate_warning;
void SV_ParseClientCommand(string s) {
- local string cmd, s1, s2;
+ local string cmd;
local float tokens, f, effectnum;
local vector start, end;
@@ -261,11 +261,7 @@
sprint(self, records_reply);
} else if(argv(0) == "voice") {
if(tokens >= 3)
- {
- s1 = argv(1);
- s2 = substring(s, argv_start_index(2), argv_end_index(-1) - argv_start_index(2));
- VoiceMessage(s1, s2); // fteqcc sucks
- }
+ VoiceMessage(argv(1), substring(s, argv_start_index(2), argv_end_index(-1) - argv_start_index(2)));
else
VoiceMessage(argv(1), "");
} else if(argv(0) == "say") {
More information about the nexuiz-commits
mailing list