From: Mario Date: Sat, 13 Dec 2014 11:45:49 +0000 (+1100) Subject: Remove some old fteqcc legacy bug checks X-Git-Tag: xonotic-v0.8.0~96 X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=451b044bac9a15cd23b242d8ee1af812ee2fcdb1;p=xonotic%2Fxonotic-data.pk3dir.git Remove some old fteqcc legacy bug checks --- diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 8fe7f7d94..9f957ce07 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -1313,8 +1313,6 @@ set sv_accuracy_data_send 1 "1 send weapon accuracy data statistics and improved set cl_accuracy_data_share 0 "1 share my weapon accuracy data statistics with other players, 0 keep my weapon accuracy data statistics hidden" set cl_accuracy_data_receive 0 "1 receive weapon accuracy data statistics at the end of the match" -set developer_fteqccbugs 0 "check fteqcc bugs on startup" -set _allow_unacceptable_compiler_bugs 0 "don't bail out if certain bugs are detected (HANDLE WITH CARE)" set spawn_debug 0 "use all spawns one by one, then abort, to verify all spawnpoints" set loddebug 0 "force this LOD level" set spawn_debugview 0 "display spawnpoints and their rating on spawn to debug spawnpoint rating calculation" diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc index d1fe46d23..58bd4f497 100644 --- a/qcsrc/client/Main.qc +++ b/qcsrc/client/Main.qc @@ -28,29 +28,12 @@ void menu_sub_null() { } -#ifdef USE_FTE -float __engine_check; -#endif - string forcefog; void WaypointSprite_Load(); void ConsoleCommand_macro_init(); void CSQC_Init(void) { prvm_language = cvar_string("prvm_language"); -#ifdef USE_FTE -#pragma target ID - __engine_check = checkextension("DP_SV_WRITEPICTURE"); - if(!__engine_check) - { - print(_("^3Your engine build is outdated\n^3This Server uses a newer QC VM. Please update!\n")); - localcmd("\ndisconnect\n"); - return; - } -#pragma target FTE -#endif - - check_unacceptable_compiler_bugs(); #ifdef WATERMARK dprintf("^4CSQC Build information: ^1%s\n", WATERMARK); @@ -167,13 +150,6 @@ void CSQC_Init(void) // CSQC_Shutdown : Called every time the CSQC code is shutdown (changing maps, quitting, etc) void Shutdown(void) { -#ifdef USE_FTE -#pragma TARGET id - if(!__engine_check) - return 0; -#pragma TARGET fte -#endif - WarpZone_Shutdown(); remove(teams); diff --git a/qcsrc/client/sys-pre.qh b/qcsrc/client/sys-pre.qh index 8ebe91903..2f59e713d 100644 --- a/qcsrc/client/sys-pre.qh +++ b/qcsrc/client/sys-pre.qh @@ -1,7 +1,3 @@ -#ifdef USE_FTE -#pragma target FTE -#endif - #define CSQC #define ATTEN_NORM builtin_ATTEN_NORM diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc index 15cde708a..8099f4506 100644 --- a/qcsrc/common/util.qc +++ b/qcsrc/common/util.qc @@ -1703,19 +1703,6 @@ vector get_shotvelocity(vector myvel, vector mydir, float spd, float newton_styl return myvel + spd * mydir; } -void check_unacceptable_compiler_bugs() -{ - if(cvar("_allow_unacceptable_compiler_bugs")) - return; - tokenize_console("foo bar"); - if(strcat(argv(0), substring("foo bar", 4, 7 - argv_start_index(1))) == "barbar") - error("fteqcc bug introduced with revision 3178 detected. Please upgrade fteqcc to a later revision, downgrade fteqcc to revision 3177, or pester Spike until he fixes it. You can set _allow_unacceptable_compiler_bugs 1 to skip this check, but expect stuff to be horribly broken then."); - - string s = ""; - if (!s) - error("The empty string counts as false. We do not want that!"); -} - float compressShotOrigin(vector v) { float x, y, z; diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh index 61b9ad0e2..4c81ba7fa 100644 --- a/qcsrc/common/util.qh +++ b/qcsrc/common/util.qh @@ -208,8 +208,6 @@ vector solve_quadratic(float a, float b, float c); vector solve_shotdirection(vector myorg, vector myvel, vector eorg, vector evel, float spd, float newton_style); vector get_shotvelocity(vector myvel, vector mydir, float spd, float newton_style, float mi, float ma); -void check_unacceptable_compiler_bugs(); - float compressShotOrigin(vector v); vector decompressShotOrigin(float f); diff --git a/qcsrc/menu/menu.qc b/qcsrc/menu/menu.qc index b17e91f86..260554f8d 100644 --- a/qcsrc/menu/menu.qc +++ b/qcsrc/menu/menu.qc @@ -53,8 +53,6 @@ void m_init() prvm_language = strzone(prvm_language); cvar_set("_menu_prvm_language", prvm_language); - check_unacceptable_compiler_bugs(); - #ifdef WATERMARK dprintf("^4MQC Build information: ^1%s\n", WATERMARK); #endif diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh index bb14c1315..4e1af1721 100644 --- a/qcsrc/server/autocvars.qh +++ b/qcsrc/server/autocvars.qh @@ -64,7 +64,6 @@ float autocvar_bot_wander_enable; float autocvar_captureleadlimit_override; #define autocvar_capturelimit_override cvar("capturelimit_override") #define autocvar_developer cvar("developer") -float autocvar_developer_fteqccbugs; float autocvar_ekg; #define autocvar_fraglimit cvar("fraglimit") #define autocvar_fraglimit_override cvar("fraglimit_override") diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index 019d0a216..8f9578b6b 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -81,32 +81,6 @@ void SetDefaultAlpha() } } -void fteqcc_testbugs() -{ - float a, b; - - if(!autocvar_developer_fteqccbugs) - return; - - dprint("*** fteqcc test: checking for bugs...\n"); - - a = 1; - b = 5; - if(sqrt(a) - sqrt(b - a) == 0) - dprint("*** fteqcc test: found same-function-twice bug\n"); - else - dprint("*** fteqcc test: same-function-twice bug got FINALLY FIXED! HOORAY!\n"); - - world.cnt = -10; - world.enemy = world; - world.enemy.cnt += 10; - if(world.cnt > 0.2 || world.cnt < -0.2) // don't error out if it's just roundoff errors - dprint("*** fteqcc test: found += bug\n"); - else - dprint("*** fteqcc test: += bug got FINALLY FIXED! HOORAY!\n"); - world.cnt = 0; -} - void GotoFirstMap() { float n; @@ -572,8 +546,6 @@ void spawnfunc_worldspawn (void) remove = remove_safely; // during spawning, watch what you remove! - check_unacceptable_compiler_bugs(); - cvar_changes_init(); // do this very early now so it REALLY matches the server config compressShortVector_init(); @@ -722,8 +694,6 @@ void spawnfunc_worldspawn (void) if(autocvar_g_campaign) CampaignPostInit(); - fteqcc_testbugs(); - Ban_LoadBans(); MapInfo_Enumerate();