[nexuiz-commits] r6612 - in trunk/data/qcsrc: client common menu menu/item menu/nexuiz server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Tue Apr 28 13:47:56 EDT 2009
Author: div0
Date: 2009-04-28 13:47:52 -0400 (Tue, 28 Apr 2009)
New Revision: 6612
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/clientcommands.qc
Log:
try working around fteqcc -r3178 bug
Modified: trunk/data/qcsrc/client/prandom.qc
===================================================================
--- trunk/data/qcsrc/client/prandom.qc 2009-04-28 15:51:01 UTC (rev 6611)
+++ trunk/data/qcsrc/client/prandom.qc 2009-04-28 17:47:52 UTC (rev 6612)
@@ -5,7 +5,10 @@
float prandom()
{
float c;
- c = crc16(FALSE, strcat(ftos(prandom_seed), ftos(prandom_seed + 3.1415926535)));
+ string s1, s2;
+ s1 = ftos(prandom_seed);
+ s2 = ftos(prandom_seed + 3.1415926535);
+ c = crc16(FALSE, strcat(s1, s2)); // fteqcc sucks
prandom_seed = c;
#ifdef USE_PRANDOM_DEBUG
Modified: trunk/data/qcsrc/client/teamradar.qc
===================================================================
--- trunk/data/qcsrc/client/teamradar.qc 2009-04-28 15:51:01 UTC (rev 6611)
+++ trunk/data/qcsrc/client/teamradar.qc 2009-04-28 17:47:52 UTC (rev 6612)
@@ -18,7 +18,11 @@
float vlen_minnorm2d(vector v)
{
- return min(max(v_x, -v_x), max(v_y, -v_y));
+ 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
}
vector teamradar_3dcoord_to_texcoord(vector in)
Modified: trunk/data/qcsrc/common/util.qc
===================================================================
--- trunk/data/qcsrc/common/util.qc 2009-04-28 15:51:01 UTC (rev 6611)
+++ trunk/data/qcsrc/common/util.qc 2009-04-28 17:47:52 UTC (rev 6612)
@@ -884,10 +884,15 @@
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)
- cvar_set(argv(i + 1), cvar_string(argv(i + 2)));
+ {
+ s1 = argv(i + 1);
+ s2 = argv(i + 2);
+ cvar_set(s1, s2); // fteqcc sucks
+ }
cvar_set("settemp_list", "0");
}
#endif
Modified: trunk/data/qcsrc/menu/item/inputbox.c
===================================================================
--- trunk/data/qcsrc/menu/item/inputbox.c 2009-04-28 15:51:01 UTC (rev 6611)
+++ trunk/data/qcsrc/menu/item/inputbox.c 2009-04-28 17:47:52 UTC (rev 6612)
@@ -87,6 +87,7 @@
float keyDownInputBox(entity me, float key, float ascii, float shift)
{
+ string s1, s2;
me.lastChangeTime = time;
me.dragScrollTimer = time;
if(ascii >= 32 && ascii != 127)
@@ -112,14 +113,22 @@
if(me.cursorPos > 0)
{
me.cursorPos -= 1;
- me.setText(me, strcat(substring(me.text, 0, me.cursorPos), substring(me.text, me.cursorPos + 1, strlen(me.text) - 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
}
return 1;
case K_DEL:
if(shift & S_CTRL)
+ {
me.setText(me, "");
+ }
else
- me.setText(me, strcat(substring(me.text, 0, me.cursorPos), substring(me.text, me.cursorPos + 1, strlen(me.text) - 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
+ }
return 1;
}
return 0;
Modified: trunk/data/qcsrc/menu/menu.qc
===================================================================
--- trunk/data/qcsrc/menu/menu.qc 2009-04-28 15:51:01 UTC (rev 6611)
+++ trunk/data/qcsrc/menu/menu.qc 2009-04-28 17:47:52 UTC (rev 6612)
@@ -54,7 +54,7 @@
void() m_init_delayed =
{
float fh, glob, n, i;
- string s;
+ string s, s1, s2;
dprint_load();
@@ -93,7 +93,11 @@
continue;
n = tokenize_console(s);
if(n >= 2)
- Skin_ApplySetting(argv(0), substring(s, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)));
+ {
+ s1 = argv(0);
+ s2 = substring(s, argv_start_index(1), argv_end_index(-1) - argv_start_index(1));
+ Skin_ApplySetting(s1, s2); // fteqcc sucks
+ }
}
fclose(fh);
Modified: trunk/data/qcsrc/menu/nexuiz/serverlist.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/serverlist.c 2009-04-28 15:51:01 UTC (rev 6611)
+++ trunk/data/qcsrc/menu/nexuiz/serverlist.c 2009-04-28 17:47:52 UTC (rev 6612)
@@ -104,7 +104,7 @@
void ToggleFavorite(string srv)
{
- string s;
+ string s, s1, s2;
float o;
s = cvar_string("net_slist_favorites");
o = strstrofs(strcat(" ", s, " "), strcat(" ", srv, " "), 0);
@@ -114,9 +114,9 @@
}
else
{
- cvar_set("net_slist_favorites", strcat(
- substring(s, 0, o - 1), substring(s, o + strlen(srv), strlen(s) - o - strlen(srv))
- ));
+ 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
}
resorthostcache();
}
Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc 2009-04-28 15:51:01 UTC (rev 6611)
+++ trunk/data/qcsrc/server/cl_client.qc 2009-04-28 17:47:52 UTC (rev 6612)
@@ -2077,7 +2077,11 @@
if(dot2 == -1)
return 1;
else
- return vercmp_recursive(substring(v1, dot1 + 1, 999), substring(v2, dot2 + 1, 999));
+ {
+ s1 = substring(v1, dot1 + 1, -1);
+ s2 = substring(v2, dot2 + 1, -1);
+ return vercmp_recursive(s1, s2); // fteqcc sucks
+ }
}
float vercmp(string v1, string v2)
Modified: trunk/data/qcsrc/server/clientcommands.qc
===================================================================
--- trunk/data/qcsrc/server/clientcommands.qc 2009-04-28 15:51:01 UTC (rev 6611)
+++ trunk/data/qcsrc/server/clientcommands.qc 2009-04-28 17:47:52 UTC (rev 6612)
@@ -101,7 +101,7 @@
float readyrestart_happened;
.float lms_spectate_warning;
void SV_ParseClientCommand(string s) {
- local string cmd;
+ local string cmd, s1, s2;
local float tokens, f, effectnum;
local vector start, end;
@@ -261,7 +261,11 @@
sprint(self, records_reply);
} else if(argv(0) == "voice") {
if(tokens >= 3)
- VoiceMessage(argv(1), substring(s, argv_start_index(2), argv_end_index(-1) - argv_start_index(2)));
+ {
+ s1 = argv(1);
+ s2 = substring(s, argv_start_index(2), argv_end_index(-1) - argv_start_index(2));
+ VoiceMessage(s1, s2); // fteqcc sucks
+ }
else
VoiceMessage(argv(1), "");
} else if(argv(0) == "say") {
More information about the nexuiz-commits
mailing list