From 07f0ebb2d817f6e68b60f883af30da477a0fe883 Mon Sep 17 00:00:00 2001 From: div0 Date: Sat, 2 May 2009 13:18:14 +0000 Subject: [PATCH] revert many fteqcc workarounds, as Blub has a patch to fix the bug this works around for git-svn-id: svn://svn.icculus.org/nexuiz/trunk@6637 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/client/prandom.qc | 5 +---- data/qcsrc/client/teamradar.qc | 6 +----- data/qcsrc/common/util.qc | 7 +------ data/qcsrc/menu/item/inputbox.c | 18 +++--------------- data/qcsrc/menu/menu.qc | 8 ++------ data/qcsrc/menu/nexuiz/serverlist.c | 8 ++++---- data/qcsrc/server/cl_client.qc | 6 +----- data/qcsrc/server/cl_player.qc | 12 ++++-------- data/qcsrc/server/clientcommands.qc | 8 ++------ 9 files changed, 19 insertions(+), 59 deletions(-) diff --git a/data/qcsrc/client/prandom.qc b/data/qcsrc/client/prandom.qc index 03a33758b..0bcb3d6af 100644 --- a/data/qcsrc/client/prandom.qc +++ b/data/qcsrc/client/prandom.qc @@ -5,10 +5,7 @@ float prandom_seed; 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 diff --git a/data/qcsrc/client/teamradar.qc b/data/qcsrc/client/teamradar.qc index 45ef82726..403758c07 100644 --- a/data/qcsrc/client/teamradar.qc +++ b/data/qcsrc/client/teamradar.qc @@ -18,11 +18,7 @@ float vlen_maxnorm2d(vector v) 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) diff --git a/data/qcsrc/common/util.qc b/data/qcsrc/common/util.qc index 692147e92..c6c9eb90e 100644 --- a/data/qcsrc/common/util.qc +++ b/data/qcsrc/common/util.qc @@ -884,15 +884,10 @@ void cvar_settemp(string pKey, string pValue) 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 diff --git a/data/qcsrc/menu/item/inputbox.c b/data/qcsrc/menu/item/inputbox.c index 552decfce..16d2cf401 100644 --- a/data/qcsrc/menu/item/inputbox.c +++ b/data/qcsrc/menu/item/inputbox.c @@ -76,21 +76,17 @@ float mouseReleaseInputBox(entity me, vector pos) 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 @@ float keyDownInputBox(entity me, float key, float ascii, float shift) 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; diff --git a/data/qcsrc/menu/menu.qc b/data/qcsrc/menu/menu.qc index 37b3ea7ab..e16e10923 100644 --- a/data/qcsrc/menu/menu.qc +++ b/data/qcsrc/menu/menu.qc @@ -54,7 +54,7 @@ void UpdateConWidthHeight() void() m_init_delayed = { float fh, glob, n, i; - string s, s1, s2; + string s; dprint_load(); @@ -93,11 +93,7 @@ void() m_init_delayed = 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); diff --git a/data/qcsrc/menu/nexuiz/serverlist.c b/data/qcsrc/menu/nexuiz/serverlist.c index e295965e3..a3953970c 100644 --- a/data/qcsrc/menu/nexuiz/serverlist.c +++ b/data/qcsrc/menu/nexuiz/serverlist.c @@ -104,7 +104,7 @@ float IsFavorite(string srv) 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 @@ void ToggleFavorite(string srv) } 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(); } diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc index 0988d1a00..41d3d4ee2 100644 --- a/data/qcsrc/server/cl_client.qc +++ b/data/qcsrc/server/cl_client.qc @@ -2079,11 +2079,7 @@ float vercmp_recursive(string v1, string v2) 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) diff --git a/data/qcsrc/server/cl_player.qc b/data/qcsrc/server/cl_player.qc index 551842ce5..545a429ce 100644 --- a/data/qcsrc/server/cl_player.qc +++ b/data/qcsrc/server/cl_player.qc @@ -881,18 +881,16 @@ float GetPlayerSoundSampleField_fixed; 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 @@ void GlobalSound(string sample, float chan, float voicetype) { 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) { diff --git a/data/qcsrc/server/clientcommands.qc b/data/qcsrc/server/clientcommands.qc index 2da377566..15885af1b 100644 --- a/data/qcsrc/server/clientcommands.qc +++ b/data/qcsrc/server/clientcommands.qc @@ -101,7 +101,7 @@ entity GetPlayer(string name) 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 @@ void SV_ParseClientCommand(string s) { 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") { -- 2.39.2