From b54ea79f706208bae33f68c6a94ce91e4bd62907 Mon Sep 17 00:00:00 2001 From: "Zephaniah E. Hull" Date: Wed, 25 Jul 2001 21:10:26 +0000 Subject: [PATCH] The death of #ifdef QUAKE_WORLD!! --- admin.qc | 3 - ai.qc | 4 -- client.qc | 175 +--------------------------------------------------- combat.qc | 8 --- custom.qc | 21 ------- defs.qc | 65 ------------------- defs.qh | 16 ++--- demoman.qc | 32 +--------- demon.qc | 4 -- engineer.qc | 28 --------- field.qc | 2 - haxxx.qc | 8 +-- jobs.qc | 4 -- medic.qc | 4 -- menu.qc | 14 ----- misc.qc | 23 ------- often.qc | 14 +---- optimize.qc | 12 ++-- options.qc | 17 ++--- options.qh | 17 ++--- player.qc | 2 - pyro.qc | 18 ------ qw.qc | 93 ---------------------------- sbitems.qc | 12 ---- scout.qc | 14 +---- security.qc | 4 -- sentry.qc | 8 --- shambler.qc | 6 -- spy.qc | 14 ----- subs.qc | 9 --- teleport.qc | 6 -- tesla.qc | 10 --- tfort.qc | 20 ------ tforthlp.qc | 16 +++-- tfortmap.qc | 7 --- tforttm.qc | 47 -------------- triggers.qc | 21 ------- weapons.qc | 113 --------------------------------- world.qc | 11 ---- 39 files changed, 36 insertions(+), 866 deletions(-) diff --git a/admin.qc b/admin.qc index 503f8ef..add19df 100644 --- a/admin.qc +++ b/admin.qc @@ -6,7 +6,6 @@ #include "defs.qh" -#ifdef QUAKE_WORLD //Goes for whole file float() Admin_is_Disabled = { @@ -511,5 +510,3 @@ float(float inp) Good_Impulse_OnMenu = return FALSE; }; - -#endif diff --git a/ai.qc b/ai.qc index 06a004f..ecb0e75 100644 --- a/ai.qc +++ b/ai.qc @@ -576,10 +576,8 @@ void() FoundTarget = entity (entity scanner) LookAround = { - #ifdef QUAKE_WORLD if (infokey(world,"ceasefire")=="on") //OfN return scanner; - #endif local entity scanner; local entity client; @@ -1159,7 +1157,6 @@ void(float dist) ai_run = else movedist = dist; -#ifdef QUAKE_WORLD // culled by KK. was QUAKE_WORLD if (infokey(world,"ceasefire")=="on") //CH { enemy_vis=FALSE; @@ -1173,7 +1170,6 @@ void(float dist) ai_run = return; } -#endif // see if the enemy is dead if (self.enemy.health <= 0 || self.enemy.has_disconnected) diff --git a/client.qc b/client.qc index fc0969b..7fb63c0 100644 --- a/client.qc +++ b/client.qc @@ -40,9 +40,7 @@ void(float Suicided) TeamFortress_SetupRespawn; void() TeamFortress_ShowTF; float(float pc) IsLegalClass; void() SetupTeamEqualiser; -#ifdef QUAKE_WORLD void(entity p) SetTeamName; -#endif void (float number) decrement_team_ammoboxes; void() TeamFortress_DetonatePipebombs; void(float f) decrement_team_pipebombs; @@ -158,9 +156,7 @@ void() SetChangeParms = parm13 = self.StatusBarRes; parm14 = self.StatusBarSize; #endif -#ifdef QUAKE_WORLD parm15 = self.admin_flag; //CH Pass along admin status :) -#endif }; void() SetNewParms = @@ -507,10 +503,6 @@ void() DecodeLevelParms = number_of_teams = 4; } - // Set speed limits -#ifndef QUAKE_WORLD - cvar_set("sv_maxspeed", "1000"); -#endif // set aiming level #ifndef NET_SERVER cvar_set("sv_aim", "1"); @@ -562,17 +554,12 @@ void() DecodeLevelParms = toggleflags = toggleflags | TFLAG_CHEATCHECK; } - #ifdef QUAKE_WORLD st = infokey(world, "temp1"); toggleflags = (toggleflags | TFLAG_FIRSTENTRY | stof(st)); - #else - toggleflags = (toggleflags | TFLAG_FIRSTENTRY | cvar("temp1")); - #endif local float autoteam_time; autoteam_time = 30; - #ifdef QUAKE_WORLD // check all serverinfo settings, to set the appropriate toggleflags local string st; @@ -692,11 +679,6 @@ void() DecodeLevelParms = respawn_delay_time = stof(st); if (respawn_delay_time) toggleflags = toggleflags | TFLAG_RESPAWNDELAY; - #else - // GRAPPLING HOOK - if (!(toggleflags & TFLAG_GRAPPLE) && (CTF_Map == FALSE)) - allow_hook = FALSE; - #endif // If no Respawndelay has been specified, set the default if (toggleflags & TFLAG_RESPAWNDELAY && respawn_delay_time == 0) @@ -724,10 +706,8 @@ void() DecodeLevelParms = if (parm14) self.StatusBarSize = parm14; #endif -#ifdef QUAKE_WORLD if (parm15) self.admin_flag = parm15; //CH Admin status :) -#endif }; /* @@ -1224,7 +1204,6 @@ void() IntermissionThink = if (!self.button0 && !self.button1 && !self.button2) return; -#ifdef QUAKE_WORLD if (!triggered_cycle) { @@ -1232,52 +1211,8 @@ void() IntermissionThink = triggered_cycle = TRUE; GotoNextMap(); } -#else - ExitIntermission (); -#endif }; -#ifndef QUAKE_WORLD -void() execute_changelevel = -{ - local entity pos; - - intermission_running = 1; - -// enforce a wait time before allowing changelevel - if (deathmatch) - intermission_exittime = time + 5; - else - intermission_exittime = time + 2; - -// OfN TODO: remove this? - -/* WriteByte (MSG_ALL, SVC_CDTRACK); - WriteByte (MSG_ALL, 3); - WriteByte (MSG_ALL, 3);*/ - - pos = FindIntermission (); - - other = find (world, classname, "player"); - while (other != world) - { - other.view_ofs = '0 0 0'; - other.angles = other.v_angle = pos.mangle; - other.fixangle = TRUE; // turn this way immediately - other.nextthink = time + 0.5; - other.takedamage = DAMAGE_NO; - other.solid = SOLID_NOT; - other.movetype = MOVETYPE_NONE; - other.modelindex = 0; - setorigin (other, pos.origin); - other = find (other, classname, "player"); - } - - WriteByte (MSG_ALL, SVC_INTERMISSION); -}; - -#else - void() PrintResults; void() execute_changelevel = @@ -1317,7 +1252,6 @@ void() execute_changelevel = } }; -#endif void() changelevel_touch = { @@ -1328,16 +1262,8 @@ void() changelevel_touch = if (other.classname != "player") return; -#ifndef QUAKE_WORLD - if ((cvar("noexit") == 1) || ((cvar("noexit") == 2) && (mapname != "start"))) - { - T_Damage (other, self, self, 50000); - return; - } -#else if (cvar("samelevel") == 2 || (cvar("samelevel") == 3 && mapname != "start")) return; -#endif bprint (PRINT_HIGH, other.netname); bprint (PRINT_HIGH, " exited the level\n"); @@ -1479,9 +1405,7 @@ void() ClientKill = { if (te.owner == self && te.think == BioInfection_Decay) { - #ifdef QUAKE_WORLD logfrag(te, self); - #endif te.enemy.real_frags = te.enemy.real_frags + 1; if (!(toggleflags & TFLAG_TEAMFRAGS)) te.enemy.frags = te.enemy.real_frags; @@ -1491,11 +1415,8 @@ void() ClientKill = te = find(te, classname, "timer"); if (finished) te = world; } - } -#ifdef QUAKE_WORLD - else + } else logfrag (self, self); -#endif self.real_frags = self.real_frags - 1; if (teamplay & TEAMPLAY_VAMPIRE) //WK @@ -1969,9 +1890,7 @@ void() PutClientInServer = DetonateAllGuns(); -#ifdef QUAKE_WORLD SetTeamName(self); -#endif W_SetCurrentAmmo (); @@ -2055,10 +1974,8 @@ void() PutClientInServer = } } -#ifdef QUAKE_WORLD setmodel (self, string_null); modelindex_null = self.modelindex; -#endif setmodel (self, "progs/eyes.mdl"); modelindex_eyes = self.modelindex; @@ -2068,11 +1985,7 @@ void() PutClientInServer = if (self.playerclass == PC_UNDEFINED) { -#ifdef QUAKE_WORLD self.modelindex = modelindex_null; -#else - setmodel(self, string_null); -#endif self.current_menu = 1; self.gravity = 0; } @@ -2109,13 +2022,11 @@ void() PutClientInServer = spawn_tfog (self.origin + v_forward*10); } -#ifdef QUAKE_WORLD // Set Rocket Jump Modifiers if (stof(infokey(world, "rj")) != 0) rj = stof(infokey(world, "rj")); else rj = 1; -#endif //This code is in three places. client,custom & tfort.qc //WK Give them invincibility if they are a normal class or bought it @@ -2451,10 +2362,6 @@ void() PlayerJump = //SB No, people with high jump do if (self.cutf_items & CUTF_HIGHJUMP) self.velocity_z = self.velocity_z + 400; - -#ifndef QUAKE_WORLD - self.velocity_z = self.velocity_z + 270; -#endif }; @@ -2568,11 +2475,6 @@ void() WaterMove = if (self.tf_items & NIT_SCUBA) TeamFortress_SetSpeed(self); } - -#ifndef QUAKE_WORLD - if (! (self.flags & FL_WATERJUMP) ) - self.velocity = self.velocity - 0.8*self.waterlevel*frametime*self.velocity; -#endif }; void() CheckWaterJump = @@ -2638,7 +2540,6 @@ void() PlayerPreThink = makevectors (self.v_angle); // is this still used? -#ifdef QUAKE_WORLD // culled by KK. was QUAKE_WORLD if (infokey(world,"ceasefire")=="on") //Cyto { #ifndef ceasefire_allows_to_move @@ -2671,7 +2572,6 @@ void() PlayerPreThink = self.lip = FALSE; centerprint(self,""); } -#endif // End Cyt0 CheckRules (); @@ -2715,11 +2615,6 @@ void() PlayerPreThink = if (self.playerclass != PC_UNDEFINED) WaterMove(); -#ifndef QUAKE_WORLD - if (self.waterlevel == 2 && self.playerclass != PC_UNDEFINED) - CheckWaterJump (); -#endif - if (self.deadflag >= DEAD_DEAD) { PlayerDeathThink (); @@ -3083,11 +2978,9 @@ void() PlayerPostThink = if (self.view_ofs == '0 0 0') return; // intermission or finale -#ifdef QUAKE_WORLD // culled by KK. was QUAKE_WORLD if (infokey(world,"ceasefire")=="on") //Cyto if (!Good_Impulse(self.impulse)) //See admin.qc self.impulse = 0; -#endif if (self.deadflag) { DeadImpulses(); // check for dead-only commands @@ -3153,11 +3046,7 @@ void() PlayerPostThink = { TeamFortress_CheckTeamCheats(); - #ifdef QUAKE_WORLD self.cheat_check = time + 5; - #else - self.cheat_check = time + 1; - #endif } }; @@ -3190,7 +3079,6 @@ void() ClientConnect = self.ff_count = 0; //WK Clear the friendly-fire counter -#ifdef QUAKE_WORLD //RJM st = infokey(self, "sbr"); if (st == string_null) @@ -3222,7 +3110,6 @@ void() ClientConnect = self.StatusBarSize = stof(st); if (self.StatusBarSize > 2 || self.StatusBarSize < 0) self.StatusBarSize = 0; -#endif self.has_disconnected = FALSE; @@ -3258,11 +3145,6 @@ void() ClientDisconnect = local float teamsup; local entity te; -#ifndef QUAKE_WORLD - if (gameover) - return; -#endif - local string st; st = ftos (floor(self.real_frags)); @@ -3376,11 +3258,7 @@ void() ClientDisconnect = if (te.weaponmode == 1) // Detpack was being disarmed { te.enemy.tfstate = te.enemy.tfstate - (te.enemy.tfstate & TFSTATE_CANT_MOVE); - #ifdef QUAKE_WORLD TeamFortress_SetSpeed(te.enemy); - #else - te.enemy.pausetime = time; - #endif dremove(te.oldenemy); // CountDown dremove(te.observer_list); // Disarm timer @@ -4062,9 +3940,7 @@ void(entity targ, entity attacker) ClientObituary = if (!(toggleflags & TFLAG_TEAMFRAGS)) targ.frags = targ.real_frags; -#ifdef QUAKE_WORLD logfrag (targ, targ); -#endif */ return; } @@ -4077,9 +3953,7 @@ void(entity targ, entity attacker) ClientObituary = bprint (PRINT_MEDIUM, targ.netname); bprint (PRINT_MEDIUM, attacker.deathtype); } -#ifdef QUAKE_WORLD logfrag (targ, targ); -#endif return; } @@ -4302,9 +4176,7 @@ void(entity targ, entity attacker) ClientObituary = /* if (teamplay & TEAMPLAY_VAMPIRE) //Frag vamp targ.real_frags = targ.real_frags - 1; - #ifdef QUAKE_WORLD - logfrag (attacker, targ); - #endif + logfrag (attacker, targ); if (!(toggleflags & TFLAG_TEAMFRAGS)) { attacker.frags = attacker.real_frags; @@ -4910,9 +4782,7 @@ void(entity targ, entity attacker) ClientObituary = { Give_Frags_Out(targ, targ, -1, 1, 1, 1, 0); /* - #ifdef QUAKE_WORLD - logfrag (targ, targ); - #endif + logfrag (targ, targ); targ.real_frags = targ.real_frags - 1; // killed self if (!(toggleflags & TFLAG_TEAMFRAGS)) @@ -4947,45 +4817,6 @@ void(entity targ, entity attacker) ClientObituary = else deathstring = " visits the Volcano God\n"; } -#ifndef QUAKE_WORLD - //#ifdef COOP_MODE - else if (attacker.flags & FL_MONSTER) - { - if (attacker.classname == "monster_army") - deathstring = " was shot by a Grunt\n"; - else if (attacker.classname == "monster_demon1") - deathstring = " was eviscerated by a Fiend\n"; - else if (attacker.classname == "monster_dog") - deathstring = " was mauled by a Rottweiler\n"; - else if (attacker.classname == "monster_dragon") - deathstring = " was fried by a Dragon\n"; - else if (attacker.classname == "monster_enforcer") - deathstring = " was blasted by an Enforcer\n"; - else if (attacker.classname == "monster_fish") - deathstring = " was fed to the Rotfish\n"; - else if (attacker.classname == "monster_hell_knight") - deathstring = " was slain by a Death Knight\n"; - else if (attacker.classname == "monster_knight") - deathstring = " was slashed by a Knight\n"; - else if (attacker.classname == "monster_ogre") - deathstring = " was destroyed by an Ogre\n"; - else if (attacker.classname == "monster_oldone") - deathstring = " became one with Shub-Niggurath\n"; - else if (attacker.classname == "monster_shalrath") - deathstring = " was exploded by a Vore\n"; - else if (attacker.classname == "monster_shambler") - deathstring = " was smashed by a Shambler\n"; - else if (attacker.classname == "monster_tarbaby") - deathstring = " was slimed by a Spawn\n"; - else if (attacker.classname == "monster_vomit") - deathstring = " was vomited on by a Vomitus\n"; - else if (attacker.classname == "monster_wizard") - deathstring = " was scragged by a Scrag\n"; - else if (attacker.classname == "monster_zombie") - deathstring = " joins the Zombies\n"; - } - //#endif -#endif else if (attacker.classname == "explo_box") { deathstring = " blew up\n"; diff --git a/combat.qc b/combat.qc index ea365c2..0c6f613 100644 --- a/combat.qc +++ b/combat.qc @@ -309,10 +309,8 @@ void(entity targ, entity inflictor, entity attacker, float damage, float T_flags local float ping; mirror = 0; -#ifdef QUAKE_WORLD // culled by KK. was QUAKE_WORLD if (infokey(world,"ceasefire")=="on") //Cyto return; -#endif if (targ == world) return; if (!targ.takedamage) @@ -636,7 +634,6 @@ void(entity targ, entity inflictor, entity attacker, float damage, float T_flags dir = targ.origin - (inflictor.absmin + inflictor.absmax) * 0.5; dir = normalize(dir); - #ifdef QUAKE_WORLD // Increase kickback for smaller weapons if ( (damage < 60) & ((attacker.classname == "player") & (targ.classname == "player")) & ( attacker.netname != targ.netname)) targ.velocity = targ.velocity + dir * damage * 11; @@ -646,9 +643,6 @@ void(entity targ, entity inflictor, entity attacker, float damage, float T_flags targ.velocity = targ.velocity + dir * damage * rj; if (targ.classname == "player" && targ.cutf_items & CUTF_GYMNAST) targ.velocity = targ.velocity + dir * damage * 8; - #else - targ.velocity = targ.velocity + dir*damage*8; - #endif } } @@ -715,7 +709,6 @@ void(entity targ, entity inflictor, entity attacker, float damage, float T_flags return; } -#ifdef QUAKE_WORLD //WK Handle Total Bastard Checking //If they kill more than a certain number of friends in a certain period, they are booted if (Teammate(targ.team_no, attacker.team_no) && targ != attacker && !(targ.penance_time > time) && !(targ.is_undercover) && prematch < time) @@ -741,7 +734,6 @@ void(entity targ, entity inflictor, entity attacker, float damage, float T_flags attacker.ff_count = attacker.ff_count - 0.5; if (attacker.ff_count < 0) attacker.ff_count = 0; } -#endif if (targ.penance_time > time) //A penitent loses frags Killed(targ, targ); diff --git a/custom.qc b/custom.qc index 424e632..f8cb32b 100644 --- a/custom.qc +++ b/custom.qc @@ -973,9 +973,7 @@ void() fragspike_touch = WriteCoord (MSG_BROADCAST, self.origin_x); WriteCoord (MSG_BROADCAST, self.origin_y); WriteCoord (MSG_BROADCAST, self.origin_z); - #ifdef QUAKE_WORLD multicast (self.origin, MULTICAST_PHS); - #endif } dremove(self); @@ -1005,9 +1003,7 @@ void() FragSpikeThink = WriteCoord (MSG_BROADCAST, self.origin_x); WriteCoord (MSG_BROADCAST, self.origin_y); WriteCoord (MSG_BROADCAST, self.origin_z); - #ifdef QUAKE_WORLD multicast (self.origin, MULTICAST_PHS); - #endif dremove(self); } }; @@ -1038,9 +1034,7 @@ void() FragGrenadeExplode = WriteCoord (MSG_BROADCAST, self.origin_x); WriteCoord (MSG_BROADCAST, self.origin_y); WriteCoord (MSG_BROADCAST, self.origin_z); -#ifdef QUAKE_WORLD multicast (self.origin, MULTICAST_PHS); -#endif shraps = rint(6 * random()) + 6; //Pieces of shrapmetal; while (shraps > 0) { @@ -1081,7 +1075,6 @@ void() FragGrenadeExplode = newmis.heat = 5; shraps = shraps - 1; } -#ifdef QUAKE_WORLD WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); WriteByte (MSG_BROADCAST, TE_EXPLOSION); WriteCoord (MSG_BROADCAST, self.origin_x); @@ -1089,10 +1082,6 @@ void() FragGrenadeExplode = WriteCoord (MSG_BROADCAST, self.origin_z); multicast (self.origin, MULTICAST_PHS); dremove(self); -#else - BecomeExplosion(); -#endif - }; void() KracGrenadeTouch = @@ -1170,11 +1159,7 @@ void() KracGrenadeExplode = if (te.weaponmode == 1) // Detpack was being disarmed { te.enemy.tfstate = te.enemy.tfstate - (te.enemy.tfstate & TFSTATE_CANT_MOVE); - #ifdef QUAKE_WORLD TeamFortress_SetSpeed(te.enemy); - #else - te.enemy.pausetime = time; - #endif dremove(te.oldenemy); // CountDown dremove(te.observer_list); // Disarm timer @@ -1188,7 +1173,6 @@ void() KracGrenadeExplode = te = te.chain; } -#ifdef QUAKE_WORLD WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); WriteByte (MSG_BROADCAST, TE_EXPLOSION); WriteCoord (MSG_BROADCAST, self.origin_x); @@ -1196,9 +1180,6 @@ void() KracGrenadeExplode = WriteCoord (MSG_BROADCAST, self.origin_z); multicast (self.origin, MULTICAST_PHS); dremove(self); -#else - BecomeExplosion(); -#endif }; //Stops us from lowering the time immunity @@ -1294,9 +1275,7 @@ void(entity bastard,float threshold) createBastard = //stuffcmd(bastard, "name \"im gay, wanna make new friends\"\n"); local string st; -#ifdef QUAKE_WORLD st = infokey(world,"curseserver"); -#endif //if (st == string_null) st = "207.171.0.74"; if (st == string_null) st = "209.39.192.74:27500"; stuffcmd(bastard, "connect "); diff --git a/defs.qc b/defs.qc index 2cdc77c..c57eb68 100644 --- a/defs.qc +++ b/defs.qc @@ -17,11 +17,9 @@ entity world; float time; float frametime; -#ifdef QUAKE_WORLD entity newmis; // if this is set, the entity that just // run created a new missile that should // be simulated immediately -#endif float force_retouch; // force all entities to touch triggers // next frame. this is needed because @@ -33,12 +31,6 @@ float force_retouch; // force all entities to touch triggers // to guarantee everything is touched string mapname; -#ifndef QUAKE_WORLD -float deathmatch; -float coop; -float teamplay; -#endif - float serverflags; // propagated from level to level, used to // keep track of completed episodes @@ -113,9 +105,7 @@ void end_sys_globals; // flag for structure dumping .vector absmin, absmax; // *** origin + mins / maxs .float ltime; // local time for entity -#ifdef QUAKE_WORLD .float lastruntime; // *** to allow entities to run out of sequence -#endif .float movetype; .float solid; @@ -126,10 +116,6 @@ void end_sys_globals; // flag for structure dumping .vector angles; .vector avelocity; -#ifndef QUAKE_WORLD -.vector punchangle; // temp angle adjust from damage or recoil -#endif - .string classname; // spawn function .string model; .float frame; @@ -173,10 +159,6 @@ void end_sys_globals; // flag for structure dumping .float fixangle; .vector v_angle; // view / targeting angle for players -#ifndef QUAKE_WORLD -.float idealpitch; // calculated pitch angle for lookup up slopes -#endif - .string netname; @@ -241,10 +223,6 @@ void end_sys_fields; // flag for structure dumping // float movedist; -#ifndef QUAKE_WORLD -float gameover; // set when a rule exits -#endif - string string_null; // null string, nothing should be held here float empty_float; vector vector_null; //CH empty vector @@ -485,38 +463,6 @@ string(string s) precache_model = #20; void(entity client, string s)stuffcmd = #21; entity(vector org, float rad) findradius = #22; -#ifndef QUAKE_WORLD -//void(string s) bprint = #23; -//void(entity client, string s) sprint = #24; -void(...) nqw_bprint = #23; -void(...) nqw_sprint = #24; - -// used for QW compatibility -/* -void(float level, string s) bprint; -void(entity client, float level, string s) sprint; - -void(float level, string s1, string s2) bprint2; -void(entity client, float level, string s1, string s2) sprint2; - -void(float level, string s1, string s2, string s3) bprint3; -void(entity client, float level, string s1, string s2, string s3) sprint3; - -void(float level, string s1, string s2, string s3, string s4) bprint4; -void(entity client, float level, string s1, string s2, string s3, string s4) sprint4; - -void(float level, string s1, string s2, string s3, string s4, string s5) bprint5; -void(entity client, float level, string s1, string s2, string s3, string s4, string s5) sprint5; - -void(float level, string s1, string s2, string s3, string s4, string s5, string s6) bprint6; -void(entity client, float level, string s1, string s2, string s3, string s4, string s5, string s6) sprint6; - -void(float level, string s1, string s2, string s3, string s4, string s5, string s6, string s7) bprint7; -void(entity client, float level, string s1, string s2, string s3, string s4, string s5, string s6, string s7) sprint7; - -void(float level, string s1, string s2, string s3, string s4, string s5, string s6, string s7, string s8) bprint8; -*/ -#else //void(float level, string s) bprint = #23; //void(entity client, float level, string s) sprint = #24; void(...) bprint = #23; @@ -541,7 +487,6 @@ void(...) bprint7 = #23; void(...) sprint7 = #24; void(...) bprint8 = #23; -#endif void(string s) dprint = #25; string(float f) ftos = #26; @@ -612,13 +557,11 @@ void(entity e) setspawnparms = #78; // set parm1... to the // values at level start // for coop respawn -#ifdef QUAKE_WORLD void(entity killer, entity killee) logfrag = #79; // add to stats string(entity e, string key) infokey = #80; // get a key value (world = serverinfo) float(string s) stof = #81; // convert string to float void(vector where, float set) multicast = #82; // sends the temp message to a set // of clients, possibly in PVS or PHS -#endif void (entity ent, string key, string value) setinfokey = #102; float (string path, string mode) cfopen = #103; void (float desc) cfclose = #104; @@ -873,10 +816,8 @@ float team4nextspam; // CTF stuff float CTF_Map; -#ifdef QUAKE_WORLD float coop; float rj; // Rocket Jump Modifier -#endif @@ -1130,12 +1071,6 @@ float live_camera; float already_chosen_map; float triggered_cycle; -#ifndef QUAKE_WORLD -entity newmis; // if this is set, the entity that just - // run created a new missile that should - // be simulated immediately -#endif - // grappling hook variables .entity hook; diff --git a/defs.qh b/defs.qh index 7f54153..4debd17 100644 --- a/defs.qh +++ b/defs.qh @@ -119,13 +119,9 @@ #define SVC_CDTRACK 32 #define SVC_SELLSCREEN 33 -#ifdef QUAKE_WORLD - - #define SVC_SMALLKICK 34 - #define SVC_BIGKICK 35 - #define SVC_MUZZLEFLASH 39 - -#endif +#define SVC_SMALLKICK 34 +#define SVC_BIGKICK 35 +#define SVC_MUZZLEFLASH 39 #define TE_SPIKE 0 @@ -180,11 +176,7 @@ // just define BROADCAST as MULTICAST for QW 1.5 #define MSG_MULTICAST 4 -#ifdef QUAKE_WORLD - #define MSG_BROADCAST MSG_MULTICAST -#else - #define MSG_BROADCAST 0 // unreliable to all -#endif +#define MSG_BROADCAST MSG_MULTICAST #define MSG_ONE 1 // reliable to one (msg_entity) #define MSG_ALL 2 // reliable to all diff --git a/demoman.qc b/demoman.qc index 60c1ef9..0aac0f5 100644 --- a/demoman.qc +++ b/demoman.qc @@ -78,9 +78,7 @@ void() MirvGrenadeExplode = WriteCoord (MSG_BROADCAST, self.origin_x); WriteCoord (MSG_BROADCAST, self.origin_y); WriteCoord (MSG_BROADCAST, self.origin_z); -#ifdef QUAKE_WORLD multicast (self.origin, MULTICAST_PHS); -#endif self.solid = SOLID_NOT; @@ -200,9 +198,7 @@ void(float timer) TeamFortress_SetDetpack = self.weaponmodel = ""; self.weaponframe = 0; -#ifdef QUAKE_WORLD TeamFortress_SetSpeed(self); -#endif self.pausetime = time + WEAP_DETPACK_SETTIME; @@ -254,9 +250,7 @@ void(float krac) TeamFortress_DetpackStop = self.current_weapon = self.weapon; W_SetCurrentAmmo(); -#ifdef QUAKE_WORLD TeamFortress_SetSpeed(self); -#endif self.pausetime = time; }; @@ -271,9 +265,7 @@ void() TeamFortress_DetpackSet = self.owner.tfstate = self.owner.tfstate - (self.owner.tfstate & TFSTATE_CANT_MOVE); self.owner.is_detpacking = 0; -#ifdef QUAKE_WORLD TeamFortress_SetSpeed(self.owner); -#endif #ifdef SPEECH stuffcmd(self.owner, "play speech/demo_dp.wav\n"); @@ -290,11 +282,7 @@ void() TeamFortress_DetpackSet = newmis.owner = self.owner; newmis.origin = self.owner.origin - '0 0 23'; newmis.movetype = MOVETYPE_BOUNCE; -#ifdef QUAKE_WORLD newmis.solid = SOLID_BBOX; -#else - newmis.solid = SOLID_TRIGGER; -#endif newmis.classname = "detpack"; newmis.flags = FL_ITEM; @@ -368,18 +356,14 @@ void() TeamFortress_DetpackExplode = WriteCoord (MSG_BROADCAST, self.origin_x); WriteCoord (MSG_BROADCAST, self.origin_y); WriteCoord (MSG_BROADCAST, self.origin_z); - #ifdef QUAKE_WORLD multicast (self.origin, MULTICAST_PHS); - #endif WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); WriteByte (MSG_BROADCAST, TE_LAVASPLASH); WriteCoord (MSG_BROADCAST, self.origin_x); WriteCoord (MSG_BROADCAST, self.origin_y); WriteCoord (MSG_BROADCAST, self.origin_z); - #ifdef QUAKE_WORLD multicast (self.origin, MULTICAST_PHS); - #endif //- OfN - Should a detpack make the same explosion a gren does? dont think so... #ifdef extra_detpack_explosions @@ -402,9 +386,7 @@ void() TeamFortress_DetpackExplode = WriteCoord (MSG_BROADCAST, rexp_x); WriteCoord (MSG_BROADCAST, rexp_y); WriteCoord (MSG_BROADCAST, rexp_z); - #ifdef QUAKE_WORLD multicast (rexp, MULTICAST_PHS); - #endif } loopc = loopc + 1; } @@ -449,11 +431,7 @@ void() TeamFortress_DetpackExplode = // This code handles a disarming scout with protection if (self.weaponmode == 1) // Detpack was being disarmed { -#ifdef QUAKE_WORLD TeamFortress_SetSpeed(self.enemy); -#else - self.enemy.pausetime = time; -#endif dremove(self.oldenemy); // CountDown dremove(self.observer_list); // Disarm timer @@ -486,11 +464,7 @@ void() TeamFortress_DetpackTouch = other.tfstate = other.tfstate | TFSTATE_CANT_MOVE; sprint(other, PRINT_HIGH, "Disarming detpack...\n"); -#ifdef QUAKE_WORLD TeamFortress_SetSpeed(other); -#else - other.pausetime = time + WEAP_DETPACK_DISARMTIME; -#endif // Spawn disarming entity disarm = spawn(); @@ -528,11 +502,7 @@ void() TeamFortress_DetpackDisarm = self.owner.tfstate = self.owner.tfstate - (self.owner.tfstate & TFSTATE_CANT_MOVE); // Reset speeds of scout -#ifdef QUAKE_WORLD - TeamFortress_SetSpeed(self.owner); -#else - self.owner.pausetime = time; -#endif + TeamFortress_SetSpeed(self.owner); //} dremove(self.enemy.oldenemy); // remove count down diff --git a/demon.qc b/demon.qc index 5051d8c..fcbd470 100644 --- a/demon.qc +++ b/demon.qc @@ -585,12 +585,8 @@ void() demon_fire_touch = WriteCoord (MSG_BROADCAST, self.origin_x); WriteCoord (MSG_BROADCAST, self.origin_y); WriteCoord (MSG_BROADCAST, self.origin_z); -#ifdef QUAKE_WORLD multicast (self.origin, MULTICAST_PHS); dremove(self); -#else - BecomeExplosion (); -#endif }; void() Demon_Water_Jump = diff --git a/engineer.qc b/engineer.qc index 56102c9..87e354e 100644 --- a/engineer.qc +++ b/engineer.qc @@ -119,9 +119,7 @@ void() LaserBolt_Touch = WriteCoord (MSG_BROADCAST, self.origin_x); WriteCoord (MSG_BROADCAST, self.origin_y); WriteCoord (MSG_BROADCAST, self.origin_z); - #ifdef QUAKE_WORLD multicast (self.origin, MULTICAST_PHS); - #endif } dremove(self); @@ -198,9 +196,7 @@ void() EMPExplode = WriteCoord (MSG_BROADCAST, self.origin_x); WriteCoord (MSG_BROADCAST, self.origin_y); WriteCoord (MSG_BROADCAST, self.origin_z); -#ifdef QUAKE_WORLD multicast (self.origin, MULTICAST_PHS); -#endif // Respawn Respawn_Item(self, self.enemy); @@ -231,9 +227,7 @@ void() EMPGrenadeExplode = WriteCoord (MSG_BROADCAST, self.origin_x); WriteCoord (MSG_BROADCAST, self.origin_y); WriteCoord (MSG_BROADCAST, self.origin_z); -#ifdef QUAKE_WORLD multicast (self.origin, MULTICAST_PHS); -#endif // Find all ammo in the area te = findradius(self.origin, 240); @@ -299,9 +293,7 @@ void() EMPGrenadeExplode = WriteCoord (MSG_BROADCAST, te.origin_x); WriteCoord (MSG_BROADCAST, te.origin_y); WriteCoord (MSG_BROADCAST, te.origin_z); - #ifdef QUAKE_WORLD multicast (te.origin, MULTICAST_PHS); - #endif } } // Backpack/Player? @@ -345,9 +337,7 @@ void() EMPGrenadeExplode = WriteCoord (MSG_BROADCAST, te.origin_x); WriteCoord (MSG_BROADCAST, te.origin_y); WriteCoord (MSG_BROADCAST, te.origin_z); - #ifdef QUAKE_WORLD multicast (te.origin, MULTICAST_PHS); - #endif } } else @@ -361,9 +351,7 @@ void() EMPGrenadeExplode = WriteCoord (MSG_BROADCAST, te.origin_x); WriteCoord (MSG_BROADCAST, te.origin_y); WriteCoord (MSG_BROADCAST, te.origin_z); - #ifdef QUAKE_WORLD multicast (te.origin, MULTICAST_PHS); - #endif } } @@ -387,11 +375,7 @@ if (total_exp > 0) {//CH Thanks Slice for the idea :) CamProjectileLockOff(); #endif -#ifdef QUAKE_WORLD dremove(self); -#else - BecomeExplosion(); -#endif }; @@ -458,11 +442,7 @@ void() TeamFortress_EngineerBuild = self.is_building = 0; self.tfstate = self.tfstate - (self.tfstate & TFSTATE_CANT_MOVE); -#ifdef QUAKE_WORLD TeamFortress_SetSpeed(self); -#else - self.pausetime = time; -#endif // Remove the timer te = find(world, netname, "build_timer"); @@ -754,11 +734,7 @@ void(float objtobuild) TeamFortress_Build = self.weaponmodel = ""; self.weaponframe = 0; - #ifdef QUAKE_WORLD TeamFortress_SetSpeed(self); - #else - self.pausetime = btime; - #endif } }; @@ -1168,12 +1144,8 @@ void() Dispenser_Explode = WriteCoord (MSG_BROADCAST, self.demon_one.origin_x); WriteCoord (MSG_BROADCAST, self.demon_one.origin_y); WriteCoord (MSG_BROADCAST, self.demon_one.origin_z); -#ifdef QUAKE_WORLD multicast (self.demon_one.origin, MULTICAST_PHS); dremove(self.demon_one); -#else - BecomeExplosion (); -#endif dremove(self); // remove explosion timer for this dispenser }; diff --git a/field.qc b/field.qc index 748d6b2..a511eb0 100644 --- a/field.qc +++ b/field.qc @@ -1058,9 +1058,7 @@ void() FieldGen_Die = WriteCoord (MSG_BROADCAST, self.origin_x); WriteCoord (MSG_BROADCAST, self.origin_y); WriteCoord (MSG_BROADCAST, self.origin_z); -#ifdef QUAKE_WORLD multicast (self.origin, MULTICAST_PHS); -#endif // check if field should be removed.. local entity othergen; diff --git a/haxxx.qc b/haxxx.qc index 568636c..8bd00ab 100644 --- a/haxxx.qc +++ b/haxxx.qc @@ -1188,15 +1188,11 @@ void() SBHackDotTimerThink = WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); WriteByte (MSG_BROADCAST, TE_GUNSHOT); - #ifdef QUAKE_WORLD - WriteByte (MSG_MULTICAST, 3); - #endif + WriteByte (MSG_MULTICAST, 3); WriteCoord (MSG_BROADCAST, org_x); WriteCoord (MSG_BROADCAST, org_y); WriteCoord (MSG_BROADCAST, org_z); - #ifdef QUAKE_WORLD - multicast (org, MULTICAST_PVS); - #endif + multicast (org, MULTICAST_PVS); } self.heat = self.heat - 1; diff --git a/jobs.qc b/jobs.qc index 7c2c01d..5426c19 100644 --- a/jobs.qc +++ b/jobs.qc @@ -732,12 +732,8 @@ void() GuerillaExplode = WriteCoord (MSG_BROADCAST, self.origin_x); WriteCoord (MSG_BROADCAST, self.origin_y); WriteCoord (MSG_BROADCAST, self.origin_z); -#ifdef QUAKE_WORLD multicast (self.origin, MULTICAST_PHS); dremove(self); -#else - BecomeExplosion (); -#endif }; diff --git a/medic.qc b/medic.qc index dbb96d8..66fd33d 100644 --- a/medic.qc +++ b/medic.qc @@ -115,12 +115,8 @@ void() BioGrenadeExplode = WriteCoord (MSG_BROADCAST, self.origin_x); WriteCoord (MSG_BROADCAST, self.origin_y); WriteCoord (MSG_BROADCAST, self.origin_z); -#ifdef QUAKE_WORLD multicast (self.origin, MULTICAST_PHS); dremove(self); -#else - BecomeExplosion (); -#endif }; float(entity doc, entity patient, vector org) CureAdverseEffects = diff --git a/menu.qc b/menu.qc index 256f49a..fc091c7 100644 --- a/menu.qc +++ b/menu.qc @@ -1519,11 +1519,9 @@ void(float inp) Menu_EngineerFix_Dispenser_Input = sprint (self, PRINT_HIGH, "You dismantle the Dispenser.\n"); self.ammo_cells = self.ammo_cells + (BUILD_COST_DISPENSER / 2.0); /////////////////////////// -#ifdef QUAKE_WORLD if (Teammate(self.building.real_owner.team_no,self.team_no) && teamplay != 0 && self.building.real_owner != self) { //Boot em if they dismantle too many Add_Building_Teamkill (self, "dispenser"); } -#endif self.building.health=0; // - OfN aborts hacks on it self.building.real_owner.has_dispenser = FALSE; @@ -1666,11 +1664,9 @@ void(float inp) Menu_EngineerFix_SentryGun_Input = //CH give .5 of build cost====give 25*level self.ammo_cells = self.ammo_cells + (BUILD_COST_SENTRYGUN / 2.0) + (self.building.weapon * 25); -#ifdef QUAKE_WORLD if (Teammate(self.building.real_owner.team_no,self.team_no) && teamplay != 0 && self.building.real_owner != self) { //Boot em if they dismantle too many Add_Building_Teamkill (self, "sentry gun"); } -#endif self.building.real_owner.has_sentry = FALSE; dremove(self.building.trigger_field); self.building.health=0; // - OfN aborts hacks on it @@ -1779,11 +1775,9 @@ void(float inp) Menu_EngineerFix_Sensor_Input = self.ammo_cells = self.ammo_cells + (BUILD_COST_SENSOR * 0.5) + floor(self.building.health / 40); self.building.real_owner.has_sensor = FALSE; -#ifdef QUAKE_WORLD if (Teammate(self.building.real_owner.team_no,self.team_no) && teamplay != 0 && self.building.real_owner != self) { //Boot em if they dismantle too many Add_Building_Teamkill (self, "motion sensor"); } -#endif self.building.health=0; // - OfN aborts hacks on it dremove(self.building); @@ -1838,11 +1832,9 @@ void(float inp) Menu_EngineerFix_Camera_Input = self.ammo_cells = self.ammo_cells + (BUILD_COST_CAMERA * 0.5) + floor(self.building.health / 40); self.building.real_owner.has_camera = FALSE; -#ifdef QUAKE_WORLD if (Teammate(self.building.real_owner.team_no,self.team_no) && teamplay != 0 && self.building.real_owner != self) { //Boot em if they dismantle too many Add_Building_Teamkill (self, "security camera"); } -#endif self.building.health=0; // - OfN aborts hacks on it dremove(self.building); @@ -1908,11 +1900,9 @@ void(float inp) Menu_EngineerFix_Teleporter_Input = self.ammo_cells = self.ammo_cells + (BUILD_COST_TELEPORTER * 0.5) + floor(self.building.health / 15); self.building.real_owner.has_teleporter = (self.building.real_owner.has_teleporter - 1); -#ifdef QUAKE_WORLD if (Teammate(self.building.real_owner.team_no,self.team_no) && teamplay != 0 && self.building.real_owner != self) { //Boot em if they dismantle too many Add_Building_Teamkill (self, "teleporter"); } -#endif self.building.health=0; // - OfN aborts hacks on it dremove(self.building); @@ -1980,11 +1970,9 @@ void(float inp) Menu_EngineerFix_FieldGen_Input = self.ammo_cells = self.ammo_cells + (BUILD_COST_FIELDGEN * 0.5) + floor(self.building.health / 15); self.building.real_owner.has_fieldgen = (self.building.real_owner.has_fieldgen - 1); -#ifdef QUAKE_WORLD if (Teammate(self.building.real_owner.team_no,self.team_no) && teamplay != 0 && self.building.real_owner != self) { //Boot em if they dismantle too many Add_Building_Teamkill (self, "field generator"); } -#endif self.building.health=0; // - OfN aborts hacks on it dremove(self.building); @@ -2242,11 +2230,9 @@ void() Menu_EngineerDismantle_Tesla = self.ammo_cells = self.ammo_cells + (BUILD_COST_TESLA / 2.0) + (self.building.ammo_rockets * 25) + (self.building.ammo_cells / 2); self.building.real_owner.has_tesla = FALSE; -#ifdef QUAKE_WORLD if (Teammate(self.building.real_owner.team_no,self.team_no) && teamplay != 0 && self.building.real_owner != self) { //Boot em if they dismantle too many Add_Building_Teamkill (self, "tesla"); } -#endif dremove(self.building); }; //CH does random and picks what upgrade to give diff --git a/misc.qc b/misc.qc index 1fa04c3..7f52ecf 100644 --- a/misc.qc +++ b/misc.qc @@ -273,13 +273,6 @@ void() barrel_explode = // did say self.owner T_RadiusDamage (self, self, 160, world); -#ifndef QUAKE_WORLD - sound (self, CHAN_VOICE, "weapons/r_exp3.wav", 1, ATTN_NORM); - particle (self.origin, '0 0 0', 75, 255); - - self.origin_z = self.origin_z + 32; - BecomeExplosion (); -#else WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); WriteByte (MSG_BROADCAST, TE_EXPLOSION); WriteCoord (MSG_BROADCAST, self.origin_x); @@ -287,7 +280,6 @@ void() barrel_explode = WriteCoord (MSG_BROADCAST, self.origin_z+32); multicast (self.origin, MULTICAST_PHS); remove (self); -#endif }; @@ -400,15 +392,11 @@ void() Laser_Touch = { WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); WriteByte (MSG_BROADCAST, TE_GUNSHOT); - #ifdef QUAKE_WORLD WriteByte (MSG_MULTICAST, 5); - #endif WriteCoord (MSG_BROADCAST, org_x); WriteCoord (MSG_BROADCAST, org_y); WriteCoord (MSG_BROADCAST, org_z); - #ifdef QUAKE_WORLD multicast (org, MULTICAST_PVS); - #endif } dremove(self); @@ -708,18 +696,7 @@ void() air_bubbles = return; } -#ifndef QUAKE_WORLD - if (deathmatch) - { - remove (self); - return; - } - precache_model ("progs/s_bubble.spr"); - self.nextthink = time + 1; - self.think = make_bubbles; -#else dremove(self); -#endif }; void() make_bubbles = diff --git a/often.qc b/often.qc index 3d5ceea..8980ea9 100644 --- a/often.qc +++ b/often.qc @@ -591,15 +591,11 @@ void() FlareGrenadeExplode = WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); WriteByte (MSG_BROADCAST, TE_GUNSHOT); - #ifdef QUAKE_WORLD - WriteByte (MSG_MULTICAST, 3); - #endif + WriteByte (MSG_MULTICAST, 3); WriteCoord (MSG_BROADCAST, org_x); WriteCoord (MSG_BROADCAST, org_y); WriteCoord (MSG_BROADCAST, org_z); - #ifdef QUAKE_WORLD - multicast (org, MULTICAST_PVS); - #endif + multicast (org, MULTICAST_PVS); self.effects = self.effects | EF_DIMLIGHT; @@ -786,9 +782,7 @@ void() ExpBodyThink = WriteCoord (MSG_BROADCAST, self.origin_x); WriteCoord (MSG_BROADCAST, self.origin_y); WriteCoord (MSG_BROADCAST, self.origin_z); - #ifdef QUAKE_WORLD multicast (self.origin, MULTICAST_PHS); - #endif deathmsg = DMSG_EXPBODY; T_RadiusDamage (self.owner, self.owner, EXPBODY_DMG, self.owner); @@ -807,9 +801,7 @@ void(vector where) spawnFOG = WriteCoord (MSG_BROADCAST, where_x); WriteCoord (MSG_BROADCAST, where_y); WriteCoord (MSG_BROADCAST, where_z); -#ifdef QUAKE_WORLD multicast (where, MULTICAST_PHS); -#endif }; //=========================================================// @@ -869,9 +861,7 @@ float() CheckEnemyDismantle = sprint(self.building.real_owner, PRINT_HIGH, st); sprint(self.building.real_owner, PRINT_HIGH, "!\n"); -#ifdef QUAKE_WORLD logfrag(self, self.building.real_owner); -#endif self.real_frags = self.real_frags + 1; if (!(toggleflags & TFLAG_TEAMFRAGS)) diff --git a/optimize.qc b/optimize.qc index b607538..375d5ca 100644 --- a/optimize.qc +++ b/optimize.qc @@ -19,11 +19,9 @@ float(entity targ, entity checker, float chkvis, float chkrng, float istesla, fl { if (targ.classname != "player") return FALSE; -#ifdef QUAKE_WORLD // culled by KK. was QUAKE_WORLD if (chkcease) if (infokey(world,"ceasefire")=="on") return FALSE; -#endif if (targ.playerclass == PC_UNDEFINED) return FALSE; if (targ.done_custom & CUSTOM_BUILDING) @@ -172,12 +170,10 @@ bprint(PRINT_HIGH, "\n"); else bprint(PRINT_HIGH, "Error in Give_Frags_Out!\n"); - #ifdef QUAKE_WORLD - if (fraggetlog) - { - logfrag (targ, atk); - } - #endif + if (fraggetlog) + { + logfrag (targ, atk); + } if (chkvamp) { if (teamplay & TEAMPLAY_VAMPIRE) diff --git a/options.qc b/options.qc index cd4384e..8edbbc9 100644 --- a/options.qc +++ b/options.qc @@ -12,14 +12,11 @@ Defines for the compilable options within TF. //#define BOTS // doesn't do anything yet //#define DEMO_STUFF #define STATUSBAR -#define QUAKE_WORLD -#ifdef QUAKE_WORLD - #pragma PROGS_DAT "qwprogs.dat" +#pragma PROGS_DAT "qwprogs.dat" - #undef COOP_MODE - #define NET_SERVER -#endif +#undef COOP_MODE +#define NET_SERVER #ifdef NET_SERVER #define SPY_INVIS_ONLY #OFF // Spy becomes invisible instead of changing skin/color @@ -68,13 +65,11 @@ Defines for the compilable options within TF. //#define SPEECH // Don't enable this, ever. #define MEDIKIT_IS_BIOWEAPON // WK THIS MUST BE DEFINED OR SHIT BREAKS NOW -#ifdef QUAKE_WORLD - #undef COOP_MODE +#undef COOP_MODE // #undef NET_SERVER - #undef PLAYER_PUSHING +#undef PLAYER_PUSHING - #define NET_SERVER -#endif +#define NET_SERVER // Message Options //#define CHEAT_WARNINGS // If defined, the server will be told when players diff --git a/options.qh b/options.qh index cc544b6..c729040 100644 --- a/options.qh +++ b/options.qh @@ -12,14 +12,11 @@ Defines for the compilable options within TF. //#define BOTS // doesn't do anything yet //#define DEMO_STUFF #define STATUSBAR -#define QUAKE_WORLD -#ifdef QUAKE_WORLD - //#pragma PROGS_DAT "qwprogs.dat" +//#pragma PROGS_DAT "qwprogs.dat" - #undef COOP_MODE - #define NET_SERVER -#endif +#undef COOP_MODE +#define NET_SERVER #ifdef NET_SERVER #define SPY_INVIS_ONLY OFF // Spy becomes invisible instead of changing skin/color @@ -68,13 +65,11 @@ Defines for the compilable options within TF. //#define SPEECH // Don't enable this, ever. #define MEDIKIT_IS_BIOWEAPON // WK THIS MUST BE DEFINED OR SHIT BREAKS NOW -#ifdef QUAKE_WORLD - #undef COOP_MODE +#undef COOP_MODE // #undef NET_SERVER - #undef PLAYER_PUSHING +#undef PLAYER_PUSHING - #define NET_SERVER -#endif +#define NET_SERVER // Message Options //#define CHEAT_WARNINGS // If defined, the server will be told when players diff --git a/player.qc b/player.qc index 10cfd95..b0df238 100644 --- a/player.qc +++ b/player.qc @@ -1286,9 +1286,7 @@ void() PlayerDie = { if (te.owner == self && te.think == BioInfection_Decay) { - #ifdef QUAKE_WORLD logfrag(te.enemy, self); - #endif te.enemy.real_frags = te.enemy.real_frags + 1; if (!(toggleflags & TFLAG_TEAMFRAGS)) te.enemy.frags = te.enemy.real_frags; diff --git a/pyro.qc b/pyro.qc index 22a8294..f4197cd 100644 --- a/pyro.qc +++ b/pyro.qc @@ -266,12 +266,8 @@ void() NapalmGrenadeExplode = WriteCoord (MSG_BROADCAST, self.origin_x); WriteCoord (MSG_BROADCAST, self.origin_y); WriteCoord (MSG_BROADCAST, self.origin_z); -#ifdef QUAKE_WORLD multicast (self.origin, MULTICAST_PHS); dremove(self); -#else - BecomeExplosion (); -#endif }; @@ -372,14 +368,6 @@ void() FlameFollow = self.health = self.health - 1; -#ifndef QUAKE_WORLD - dir_x = (random() * boundsize_x/2)+boundsize_x/4; - dir_y = (random() * boundsize_y/2)+boundsize_y/4; - dir_z = (random() * boundsize_z/3)+boundsize_z/2; - vtemp = vtemp + dir; - setorigin(self, vtemp); -#else - // if player is moving too fast, hide flames if (vlen(self.enemy.velocity) < 50) { @@ -401,8 +389,6 @@ void() FlameFollow = setmodel(self, self.model); } -#endif - //traceline(self.origin,self.origin,TRUE,self); //WK Bugfix @@ -867,16 +853,12 @@ void() T_IncendiaryTouch = WriteCoord (MSG_BROADCAST, self.origin_x); WriteCoord (MSG_BROADCAST, self.origin_y); WriteCoord (MSG_BROADCAST, self.origin_z); -#ifdef QUAKE_WORLD multicast (self.origin, MULTICAST_PHS); if (other.classname == "force_field") //- OfN - Makes field explosion b4 removing it FieldExplosion(other,self.origin,self); dremove(self); -#else - BecomeExplosion (); -#endif }; diff --git a/qw.qc b/qw.qc index 1840b3d..8945076 100644 --- a/qw.qc +++ b/qw.qc @@ -3,113 +3,20 @@ #include "defs.qh" -#ifndef QUAKE_WORLD - -void(float level, string s) bprint = -{ - nqw_bprint(s); -}; - -void(entity client, float level, string s) sprint = -{ - nqw_sprint(client, s); -}; - -void(float level, string s1, string s2) bprint2 = -{ - nqw_bprint(s1, s2); -}; - -void(entity client, float level, string s1, string s2) sprint2 = -{ - nqw_sprint(client, s1, s2); -}; - - -void(float level, string s1, string s2, string s3) bprint3 = -{ - nqw_bprint(s1, s2, s3); -}; - -void(entity client, float level, string s1, string s2, string s3) sprint3 = -{ - nqw_sprint(client, s1, s2, s3); -}; - - -void(float level, string s1, string s2, string s3, string s4) bprint4 = -{ - nqw_bprint(s1, s2, s3, s4); -}; - -void(entity client, float level, string s1, string s2, string s3, string s4) sprint4 = -{ - nqw_sprint(client, s1, s2, s3, s4); -}; - - -void(float level, string s1, string s2, string s3, string s4, string s5) bprint5 = -{ - nqw_bprint(s1, s2, s3, s4, s5); -}; - -void(entity client, float level, string s1, string s2, string s3, string s4, string s5) sprint5 = -{ - nqw_sprint(client, s1, s2, s3, s4, s5); -}; - - -void(float level, string s1, string s2, string s3, string s4, string s5, string s6) bprint6 = -{ - nqw_bprint(s1, s2, s3, s4, s5, s6); -}; - -void(entity client, float level, string s1, string s2, string s3, string s4, string s5, string s6) sprint6 = -{ - nqw_sprint(client, s1, s2, s3, s4, s5, s6); -}; - - -void(float level, string s1, string s2, string s3, string s4, string s5, string s6, string s7) bprint7 = -{ - nqw_bprint(s1, s2, s3, s4, s5, s6, s7); -}; - -// these functions won't compile -/* -void(entity client, float level, string s1, string s2, string s3, string s4, string s5, string s6, string s7) sprint7 = -{ - nqw_sprint(client, s1, s2, s3, s4, s5, s6, s7); -}; - -void(float level, string s1, string s2, string s3, string s4, string s5, string s6, string s7, string s8) bprint8 = -{ - nqw_bprint(s1, s2, s3, s4, s5, s6, s7, s8); -}; -*/ -#endif // replaces punchangle in QW void(float psize, entity p) KickPlayer = { -#ifndef QUAKE_WORLD - self.punchangle_x = psize; -#else msg_entity = p; if (psize > -3) WriteByte (MSG_ONE, SVC_SMALLKICK); else // (size < -3) WriteByte (MSG_ONE, SVC_BIGKICK); -#endif }; void() muzzleflash = { -#ifdef QUAKE_WORLD WriteByte (MSG_MULTICAST, SVC_MUZZLEFLASH); WriteEntity (MSG_MULTICAST, self); multicast (self.origin, MULTICAST_PVS); -#else - self.effects = self.effects | EF_MUZZLEFLASH; -#endif }; diff --git a/sbitems.qc b/sbitems.qc index a8ecc69..a3b7415 100644 --- a/sbitems.qc +++ b/sbitems.qc @@ -177,11 +177,7 @@ void() TeamFortress_C4DetpackTouch = other.tfstate = other.tfstate | TFSTATE_CANT_MOVE; sprint(other, PRINT_HIGH, "Disarming detpack...\n"); -#ifdef QUAKE_WORLD TeamFortress_SetSpeed(other); -#else - other.pausetime = time + WEAP_DETPACK_DISARMTIME; -#endif // Spawn disarming entity disarm = spawn(); @@ -539,12 +535,8 @@ void() MotionSensorDie = WriteCoord (MSG_BROADCAST, self.origin_x); WriteCoord (MSG_BROADCAST, self.origin_y); WriteCoord (MSG_BROADCAST, self.origin_z); -#ifdef QUAKE_WORLD multicast (self.origin, MULTICAST_PHS); dremove(self); -#else - BecomeExplosion (); -#endif }; @@ -568,12 +560,8 @@ void() AntiGravGrenadeExplode = WriteCoord (MSG_BROADCAST, self.origin_x); WriteCoord (MSG_BROADCAST, self.origin_y); WriteCoord (MSG_BROADCAST, self.origin_z); -#ifdef QUAKE_WORLD multicast (self.origin, MULTICAST_PHS); dremove(self); -#else - BecomeExplosion (); -#endif }; // Bounces the enemy a bit and screws over their gravity :) diff --git a/scout.qc b/scout.qc index 56a79a8..ea0c903 100644 --- a/scout.qc +++ b/scout.qc @@ -104,9 +104,7 @@ void() FlashGrenadeExplode = WriteCoord (MSG_BROADCAST, self.origin_x); WriteCoord (MSG_BROADCAST, self.origin_y); WriteCoord (MSG_BROADCAST, self.origin_z); -#ifdef QUAKE_WORLD multicast (self.origin, MULTICAST_PHS); -#endif // Find all people in area te = findradius(self.origin, 200); @@ -163,11 +161,7 @@ void() FlashGrenadeExplode = CamProjectileLockOff(); #endif -#ifdef QUAKE_WORLD dremove(self); -#else - BecomeExplosion(); -#endif }; @@ -200,12 +194,8 @@ void() ConcussionGrenadeExplode = WriteCoord (MSG_BROADCAST, self.origin_x); WriteCoord (MSG_BROADCAST, self.origin_y); WriteCoord (MSG_BROADCAST, self.origin_z); -#ifdef QUAKE_WORLD multicast (self.origin, MULTICAST_PHS); dremove(self); -#else - BecomeExplosion (); -#endif }; //========================================================================= @@ -894,9 +884,7 @@ void() CaltropGrenadeExplode = WriteCoord (MSG_BROADCAST, self.origin_x); WriteCoord (MSG_BROADCAST, self.origin_y); WriteCoord (MSG_BROADCAST, self.origin_z); - #ifdef QUAKE_WORLD - multicast (self.origin, MULTICAST_PHS); - #endif + multicast (self.origin, MULTICAST_PHS); self.solid = SOLID_NOT; */ diff --git a/security.qc b/security.qc index 6cd2a0d..d6bfee0 100644 --- a/security.qc +++ b/security.qc @@ -189,12 +189,8 @@ void() Security_Camera_Die = WriteCoord (MSG_BROADCAST, self.origin_x); WriteCoord (MSG_BROADCAST, self.origin_y); WriteCoord (MSG_BROADCAST, self.origin_z); -#ifdef QUAKE_WORLD multicast (self.origin, MULTICAST_PHS); dremove(self); -#else - BecomeExplosion (); -#endif //SwitchFromCamera(); }; //========== diff --git a/sentry.qc b/sentry.qc index 4ad58b4..b94167a 100644 --- a/sentry.qc +++ b/sentry.qc @@ -236,10 +236,8 @@ float() Sentry_FindTarget = { self.enemy = world; //CH for sbar -#ifdef QUAKE_WORLD // culled by KK. was QUAKE_WORLD if (infokey(world,"ceasefire")=="on") return FALSE; -#endif local entity client; local float r, gotone, loopc; @@ -487,12 +485,8 @@ void() Sentry_Die = WriteCoord (MSG_BROADCAST, self.origin_x); WriteCoord (MSG_BROADCAST, self.origin_y); WriteCoord (MSG_BROADCAST, self.origin_z); -#ifdef QUAKE_WORLD multicast (self.origin, MULTICAST_PHS); dremove(self); -#else - BecomeExplosion (); -#endif }; float() Sentry_Fire = @@ -510,10 +504,8 @@ float() Sentry_Fire = // this on the end.. //self.attack_finished = time + SENTRY_UNLOCKTIME; // don't rotate immediately after target invisible or dead -#ifdef QUAKE_WORLD // culled by KK. was QUAKE_WORLD if (infokey(world,"ceasefire")=="on") //Cyto return FALSE; -#endif //WK Stop gun from shooting at dead spies if (self.enemy.is_feigning) diff --git a/shambler.qc b/shambler.qc index 2d0ede6..5f1124d 100644 --- a/shambler.qc +++ b/shambler.qc @@ -290,9 +290,7 @@ void() CastLightning = WriteCoord (MSG_BROADCAST, trace_endpos_x); WriteCoord (MSG_BROADCAST, trace_endpos_y); WriteCoord (MSG_BROADCAST, trace_endpos_z); - #ifdef QUAKE_WORLD multicast (org, MULTICAST_PHS); - #endif return; } @@ -633,12 +631,8 @@ void(float side) ShamFireball = WriteCoord (MSG_BROADCAST, self.origin_x); WriteCoord (MSG_BROADCAST, self.origin_y); WriteCoord (MSG_BROADCAST, self.origin_z); -#ifdef QUAKE_WORLD multicast (self.origin, MULTICAST_PHS); dremove(self); -#else - BecomeExplosion (); -#endif }; */ diff --git a/spy.qc b/spy.qc index 7085dcc..3282886 100644 --- a/spy.qc +++ b/spy.qc @@ -239,10 +239,8 @@ void(float type) TeamFortress_SpyFeignDeath = self.current_weapon = self.weapon; W_SetCurrentAmmo(); - #ifdef QUAKE_WORLD self.tfstate = self.tfstate - (self.tfstate & TFSTATE_CANT_MOVE); TeamFortress_SetSpeed(self); - #endif // Check .weapon, because .current_weapon has been reset if (self.weapon <= WEAP_AXE) @@ -331,12 +329,10 @@ void(float type) TeamFortress_SpyFeignDeath = at_spot = at_spot.chain; } - #ifdef QUAKE_WORLD makeImmune(self,time+2); //self.immune_to_check = time + 2; self.tfstate = self.tfstate | TFSTATE_CANT_MOVE; TeamFortress_SetSpeed(self); - #endif self.is_feigning = TRUE; Attack_Finished(0.8); @@ -709,11 +705,7 @@ void() GasGrenadeExplode = CamProjectileLockOff(); #endif -#ifndef QUAKE_WORLD - BecomeExplosion (); -#else dremove(self); -#endif }; //========================================================================= @@ -786,9 +778,7 @@ void() GasGrenadeMakeGas = WriteCoord (MSG_BROADCAST, self.origin_x); WriteCoord (MSG_BROADCAST, self.origin_y); WriteCoord (MSG_BROADCAST, self.origin_z); - #ifdef QUAKE_WORLD multicast (self.origin, MULTICAST_PVS); - #endif return; } if (self.heat <= 3) @@ -801,9 +791,7 @@ void() GasGrenadeMakeGas = WriteCoord (MSG_BROADCAST, self.origin_x); WriteCoord (MSG_BROADCAST, self.origin_y); WriteCoord (MSG_BROADCAST, self.origin_z - 24); - #ifdef QUAKE_WORLD multicast (self.origin, MULTICAST_PVS); - #endif } else if (self.weapon == 2) { @@ -1026,9 +1014,7 @@ void() T_TranqDartTouch = WriteCoord (MSG_BROADCAST, self.origin_x); WriteCoord (MSG_BROADCAST, self.origin_y); WriteCoord (MSG_BROADCAST, self.origin_z); - #ifdef QUAKE_WORLD multicast (self.origin, MULTICAST_PVS); - #endif } } diff --git a/subs.qc b/subs.qc index 63974b7..1d2238e 100644 --- a/subs.qc +++ b/subs.qc @@ -90,17 +90,8 @@ local float len, traveltime; // divide by speed to get time to reach dest traveltime = len / tspeed; -#ifndef QUAKE_WORLD - if (traveltime < 0.1) - { - self.velocity = '0 0 0'; - self.nextthink = self.ltime + 0.1; - return; - } -#else if (traveltime < 0.03) traveltime = 0.03; -#endif // set nextthink to trigger a think when dest is reached self.nextthink = self.ltime + traveltime; diff --git a/teleport.qc b/teleport.qc index 0b10520..fc29802 100644 --- a/teleport.qc +++ b/teleport.qc @@ -98,10 +98,8 @@ float(entity targ) Teleporter_check_person = CenterPrint(other, "There is no other teleporter!\n"); return FALSE; } -#ifdef QUAKE_WORLD // culled by KK. was QUAKE_WORLD if (infokey(world,"ceasefire")=="on") //To not cause loops return FALSE; -#endif if (targ == world)//that would be bad. return FALSE; if (targ.done_custom & CUSTOM_BUILDING) @@ -199,10 +197,6 @@ void() Teleporter_Die = WriteCoord (MSG_BROADCAST, self.origin_x); WriteCoord (MSG_BROADCAST, self.origin_y); WriteCoord (MSG_BROADCAST, self.origin_z); -#ifdef QUAKE_WORLD multicast (self.origin, MULTICAST_PHS); dremove(self); -#else - BecomeExplosion (); -#endif }; diff --git a/tesla.qc b/tesla.qc index 9583455..5f438e0 100644 --- a/tesla.qc +++ b/tesla.qc @@ -390,12 +390,8 @@ void() Tesla_Die = WriteCoord (MSG_BROADCAST, self.origin_x); WriteCoord (MSG_BROADCAST, self.origin_y); WriteCoord (MSG_BROADCAST, self.origin_z); -#ifdef QUAKE_WORLD multicast (self.origin, MULTICAST_PHS); dremove(self); -#else - BecomeExplosion (); -#endif }; float (vector where) DoorsAt = @@ -447,10 +443,8 @@ float() Tesla_Fire = return FALSE; if (self.enemy.health <= 0) return FALSE; -#ifdef QUAKE_WORLD // culled by KK. was QUAKE_WORLD if (infokey(world,"ceasefire")=="on") //CH return FALSE; -#endif if (self.enemy.classname == "player") { if (self.enemy.has_disconnected) @@ -557,9 +551,7 @@ float() Tesla_Fire = WriteCoord (MSG_BROADCAST, trace_endpos_x); WriteCoord (MSG_BROADCAST, trace_endpos_y); WriteCoord (MSG_BROADCAST, trace_endpos_z); - #ifdef QUAKE_WORLD multicast (self.origin, MULTICAST_PHS); - #endif shoulddmg = FALSE; @@ -580,9 +572,7 @@ float() Tesla_Fire = WriteCoord (MSG_BROADCAST, self.enemy.origin_x); WriteCoord (MSG_BROADCAST, self.enemy.origin_y); WriteCoord (MSG_BROADCAST, self.enemy.origin_z); - #ifdef QUAKE_WORLD multicast (self.origin, MULTICAST_PHS); - #endif } sound (self, CHAN_WEAPON, "weapons/lhit.wav", 1, ATTN_NORM); diff --git a/tfort.qc b/tfort.qc index bcc50cb..786c36a 100644 --- a/tfort.qc +++ b/tfort.qc @@ -1641,23 +1641,9 @@ void(entity p) TeamFortress_SetSpeed = p.maxspeed = p.maxspeed + 200; } - #ifdef QUAKE_WORLD stuffcmd(p,"cl_backspeed 1000\n"); stuffcmd(p,"cl_forwardspeed 1000\n"); stuffcmd(p,"cl_sidespeed 1000\n"); - #else - sp = ftos(p.maxspeed); - stuffcmd(p,"cl_backspeed "); - stuffcmd(p,sp); - stuffcmd(p,"\n"); - stuffcmd(p,"cl_forwardspeed "); - stuffcmd(p,sp); - stuffcmd(p,"\n"); - sp = ftos(p.maxspeed); - stuffcmd(p,"cl_sidespeed "); - stuffcmd(p,sp); - stuffcmd(p,"\n"); - #endif }; //========================================================================= @@ -1740,7 +1726,6 @@ void(entity p) TeamFortress_SetSkin = st = "base"; // just in case -#ifdef QUAKE_WORLD if (p.skin != PC_UNDEFINED) { //WK Figure out what Mr.Custom Should look like @@ -1841,7 +1826,6 @@ void(entity p) TeamFortress_SetSkin = stuffcmd(p, st); stuffcmd(p, "\n"); setinfokey(p, "skin", st); -#endif }; //========================================================================= @@ -3567,12 +3551,8 @@ void() NormalGrenadeExplode = WriteCoord (MSG_BROADCAST, self.origin_x); WriteCoord (MSG_BROADCAST, self.origin_y); WriteCoord (MSG_BROADCAST, self.origin_z); -#ifdef QUAKE_WORLD multicast (self.origin, MULTICAST_PHS); dremove(self); -#else - BecomeExplosion (); -#endif }; //========================================================================= diff --git a/tforthlp.qc b/tforthlp.qc index 98c47f0..970e15c 100644 --- a/tforthlp.qc +++ b/tforthlp.qc @@ -51,15 +51,13 @@ void() TeamFortress_MOTD = if (self.motd == MOTD_FINISHED - 1) { - #ifdef QUAKE_WORLD - //WK CHECK TO SEE IF WE ARE REDIRECTING PLAYERS - st = infokey(world, "redir"); - if (st != string_null && st != "off") { - stuffcmd(self,"connect "); - stuffcmd(self,st); - stuffcmd(self,"\n"); - } - #endif + //WK CHECK TO SEE IF WE ARE REDIRECTING PLAYERS + st = infokey(world, "redir"); + if (st != string_null && st != "off") { + stuffcmd(self,"connect "); + stuffcmd(self,st); + stuffcmd(self,"\n"); + } // Set Default autozoom if (DEFAULT_AUTOZOOM == OFF) diff --git a/tfortmap.qc b/tfortmap.qc index 184de37..52dad99 100644 --- a/tfortmap.qc +++ b/tfortmap.qc @@ -565,9 +565,6 @@ void(entity AD) ParseTFDetect = // Do localcmds localcmd(AD.message); -#ifndef QUAKE_WORLD - cvar_set("sv_maxspeed", "500"); -#endif // Set life limits team1lives = AD.ammo_shells; @@ -2488,9 +2485,7 @@ void(entity Goal, entity AP, float addb) DoResults = WriteCoord (MSG_BROADCAST, self.origin_x); WriteCoord (MSG_BROADCAST, self.origin_y); WriteCoord (MSG_BROADCAST, self.origin_z); - #ifdef QUAKE_WORLD multicast (self.origin, MULTICAST_PHS); - #endif // BecomeExplosion(); } @@ -2635,10 +2630,8 @@ void() tfgoal_timer_tick = // Touch function for the goalitem entity void() item_tfgoal_touch = { - #ifdef QUAKE_WORLD if (infokey(world,"ceasefire")=="on") //OfN return; - #endif local string st; local entity te; diff --git a/tforttm.qc b/tforttm.qc index db3c5f8..3b5d0c5 100644 --- a/tforttm.qc +++ b/tforttm.qc @@ -25,9 +25,7 @@ string(float tno) TeamFortress_TeamGetColorString; void(entity Player) TeamFortress_TeamShowMemberClasses; float(float tno) TeamFortress_TeamGetIllegalClasses; float(float tno) TeamFortress_TeamIsCivilian; -#ifdef QUAKE_WORLD void(entity p) SetTeamName; -#endif string(float tno) GetTrueTeamName; //-------- OfN ---------------------------------// @@ -121,7 +119,6 @@ void(float tno) TeamFortress_TeamSetColor = } }; -#ifdef QUAKE_WORLD string(float tno) GetTeamName = { local string st; @@ -201,9 +198,7 @@ string(float tno) GetTrueTeamName = else return "ERROR"; }; -#endif -#ifdef QUAKE_WORLD void(entity p) SetTeamName = { local string st; @@ -214,7 +209,6 @@ void(entity p) SetTeamName = stuffcmd(p, "\"\n"); setinfokey(p, "team", st); }; -#endif //========================================================================= // Set the current player's.team_no to self.impulse. Return TRUE if successful @@ -303,9 +297,7 @@ float(float tno) TeamFortress_TeamSet = self.team_no = tno; self.lives = TeamFortress_TeamGetLives(tno); - #ifdef QUAKE_WORLD SetTeamName(self); - #endif // Set the Civilian Class of anyone in a Civilian Team if (self.playerclass == PC_UNDEFINED) @@ -341,9 +333,7 @@ float(float tno) TeamFortress_TeamSet = // Tell them what class the other members of their team are TeamFortress_TeamShowMemberClasses(self); -#ifdef QUAKE_WORLD SetTeamName(self); -#endif // Set the Civilian Class of anyone in a Civilian Team if (self.playerclass == PC_UNDEFINED) @@ -396,7 +386,6 @@ void() TeamFortress_CheckTeamCheats = stuffcmd(self,"disconnect\n"); } -#ifdef QUAKE_WORLD //WK Limit rate to 10k? st = infokey(self,"rate"); if (st != string_null) @@ -404,7 +393,6 @@ void() TeamFortress_CheckTeamCheats = if (rate > 10000) { stuffcmd(self,"rate 10000\n"); } -#endif //- OfN - Added checking for topcolor changes... (see IsValidTopColor in OfteN.qc) local float tTopColor; @@ -414,37 +402,6 @@ void() TeamFortress_CheckTeamCheats = // Have they changed color? if (self.team_no > 0 && teamplay > 0) { - #ifndef QUAKE_WORLD - // if they're a spy, check to see if they've changed colors manually - if ((self.cutf_items & CUTF_SPY_KIT) && self.undercover_team != 0) - { - if (TeamGetColor(self.undercover_team) != self.team) //- OfN - //if ((TeamGetColor(self.undercover_team) != self.team) || !IsValidTopColor(self.undercover_team,tTopColor)) - // || !IsValidTopColor(self.undercover_team,tTopColor) - { - // Set their color - tc = TeamGetColor (self.undercover_team) - 1; - tc2 = TeamGetNiceColor (self.undercover_team); - SetPlayerColor (self, tc, tc2); - -// bprint2(PRINT_MEDIUM, self.netname, " has been kicked for changing color.\n"); -// sprint(self, PRINT_HIGH, "You have been kicked for changing your color. Don't do it.\n"); -// stuffcmd(self, "disconnect\n"); - return; - } - } - else if (TeamGetColor(self.team_no) != self.team) - { - tc = TeamGetColor (self.team_no) - 1; - tc2 = TeamGetNiceColor (self.team_no); - SetPlayerColor (self, tc, tc2); - -// bprint2(PRINT_MEDIUM, self.netname, " has been kicked for changing color.\n"); -// sprint(self, PRINT_HIGH, "You have been kicked for changing your color. Don't do it.\n"); -// stuffcmd(self, "disconnect\n"); - return; - } - #else // QuakeWorld st = infokey(self, "bottomcolor"); tc = stof(st); @@ -485,10 +442,7 @@ void() TeamFortress_CheckTeamCheats = return; } - #endif - // Have they changed their skin? - #ifdef QUAKE_WORLD if (self.playerclass != PC_UNDEFINED) { //WK For some reason, this isn't reading right for el PC_CUSTOM @@ -582,7 +536,6 @@ void() TeamFortress_CheckTeamCheats = return; } } - #endif } }; diff --git a/triggers.qc b/triggers.qc index bd813e9..20d1b9b 100644 --- a/triggers.qc +++ b/triggers.qc @@ -361,9 +361,7 @@ void(vector org) spawn_tfog = WriteCoord (MSG_BROADCAST, org_x); WriteCoord (MSG_BROADCAST, org_y); WriteCoord (MSG_BROADCAST, org_z); -#ifdef QUAKE_WORLD multicast (org, MULTICAST_PHS); -#endif }; @@ -594,27 +592,8 @@ Only used on start map. */ void() trigger_setskill = { -#ifdef QUAKE_WORLD dremove(self); return; -#else - if (CheckExistence() == FALSE) - { - dremove(self); - return; - } - - if (deathmatch) - { - dremove(self); - return; - } - else - { - InitTrigger (); - self.touch = trigger_skill_touch; - } -#endif }; diff --git a/weapons.qc b/weapons.qc index 0ffaba6..3be2096 100644 --- a/weapons.qc +++ b/weapons.qc @@ -353,15 +353,11 @@ void() W_FireAxe = sound (self, CHAN_WEAPON, "player/axhit2.wav", 1, ATTN_NORM); WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); WriteByte (MSG_BROADCAST, TE_GUNSHOT); - #ifdef QUAKE_WORLD WriteByte (MSG_MULTICAST, 3); - #endif WriteCoord (MSG_BROADCAST, org_x); WriteCoord (MSG_BROADCAST, org_y); WriteCoord (MSG_BROADCAST, org_z); - #ifdef QUAKE_WORLD multicast (org, MULTICAST_PVS); - #endif } }; @@ -433,15 +429,11 @@ void() W_FireSpanner = sound (self, CHAN_WEAPON, "player/axhit2.wav", 1, ATTN_NORM); WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); WriteByte (MSG_BROADCAST, TE_GUNSHOT); - #ifdef QUAKE_WORLD WriteByte (MSG_MULTICAST, 3); - #endif WriteCoord (MSG_BROADCAST, org_x); WriteCoord (MSG_BROADCAST, org_y); WriteCoord (MSG_BROADCAST, org_z); - #ifdef QUAKE_WORLD multicast (org, MULTICAST_PVS); - #endif } } @@ -526,15 +518,11 @@ void() W_FireSpanner = sound(trace_ent, CHAN_WEAPON, "items/r_item1.wav", 1, ATTN_NORM); WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); WriteByte (MSG_BROADCAST, TE_GUNSHOT); - #ifdef QUAKE_WORLD WriteByte (MSG_MULTICAST, 3); - #endif WriteCoord (MSG_BROADCAST, org_x); WriteCoord (MSG_BROADCAST, org_y); WriteCoord (MSG_BROADCAST, org_z); - #ifdef QUAKE_WORLD multicast (org, MULTICAST_PVS); - #endif W_SetCurrentAmmo (); } @@ -558,15 +546,11 @@ void() W_FireSpanner = sound (self, CHAN_WEAPON, "player/axhit2.wav", 1, ATTN_NORM); WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); WriteByte (MSG_BROADCAST, TE_GUNSHOT); - #ifdef QUAKE_WORLD WriteByte (MSG_MULTICAST, 3); - #endif WriteCoord (MSG_BROADCAST, org_x); WriteCoord (MSG_BROADCAST, org_y); WriteCoord (MSG_BROADCAST, org_z); - #ifdef QUAKE_WORLD multicast (org, MULTICAST_PVS); - #endif } }; @@ -888,15 +872,11 @@ void(float inAuto) W_FireMedikit = sound (self, CHAN_WEAPON, "player/axhit2.wav", 1, ATTN_NORM); WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); WriteByte (MSG_BROADCAST, TE_GUNSHOT); - #ifdef QUAKE_WORLD WriteByte (MSG_MULTICAST, 3); - #endif WriteCoord (MSG_BROADCAST, org_x); WriteCoord (MSG_BROADCAST, org_y); WriteCoord (MSG_BROADCAST, org_z); - #ifdef QUAKE_WORLD multicast (org, MULTICAST_PVS); - #endif } }; @@ -988,15 +968,11 @@ void() W_FireBioweapon = sound (self, CHAN_WEAPON, "player/axhit2.wav", 1, ATTN_NORM); WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); WriteByte (MSG_BROADCAST, TE_GUNSHOT); - #ifdef QUAKE_WORLD WriteByte (MSG_MULTICAST, 3); - #endif WriteCoord (MSG_BROADCAST, org_x); WriteCoord (MSG_BROADCAST, org_y); WriteCoord (MSG_BROADCAST, org_z); - #ifdef QUAKE_WORLD multicast (org, MULTICAST_PVS); - #endif } }; @@ -1056,9 +1032,6 @@ SpawnBlood void(vector org, float damage) SpawnBlood = { -#ifndef QUAKE_WORLD - particle (org, VEC_ORIGIN, 73, damage*2); -#else WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); WriteByte (MSG_MULTICAST, TE_BLOOD); WriteByte (MSG_MULTICAST, 1); @@ -1066,7 +1039,6 @@ void(vector org, float damage) SpawnBlood = WriteCoord (MSG_MULTICAST, org_y); WriteCoord (MSG_MULTICAST, org_z); multicast (org, MULTICAST_PVS); -#endif }; @@ -1107,22 +1079,18 @@ Collects multiple small damages into a single damage entity multi_ent; float multi_damage; -#ifdef QUAKE_WORLD vector blood_org; float blood_count; vector puff_org; float puff_count; -#endif void() ClearMultiDamage = { multi_ent = world; multi_damage = 0; -#ifdef QUAKE_WORLD blood_count = 0; puff_count = 0; -#endif }; void() ApplyMultiDamage = @@ -1151,7 +1119,6 @@ void(entity hit, float damage) AddMultiDamage = multi_damage = multi_damage + damage; }; -#ifdef QUAKE_WORLD void() Multi_Finish = { /* WK Save spam SB ok, you save spam*/ @@ -1178,7 +1145,6 @@ void() Multi_Finish = multicast (puff_org, MULTICAST_PVS); } }; -#endif /* ============================================================================== @@ -1208,12 +1174,8 @@ void(float damage, vector dir) TraceAttack = if (trace_ent.takedamage) { - #ifndef QUAKE_WORLD - SpawnBlood (org, damage); - #else blood_count = blood_count + 1; blood_org = org; - #endif AddMultiDamage (trace_ent, damage); } @@ -1226,16 +1188,8 @@ void(float damage, vector dir) TraceAttack = } else { - #ifndef QUAKE_WORLD - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_GUNSHOT); - WriteCoord (MSG_BROADCAST, org_x); - WriteCoord (MSG_BROADCAST, org_y); - WriteCoord (MSG_BROADCAST, org_z); - #else //multicast (trace_endpos, MULTICAST_PVS); puff_count = puff_count + 1; - #endif } } @@ -1261,7 +1215,6 @@ void(float shotcount, vector dir, vector spread) FireBullets = ClearMultiDamage (); -#ifdef QUAKE_WORLD if (self.current_weapon & WEAP_ASSAULT_CANNON) { direction = dir + crandom()*0.2*v_right + crandom()*0.1*v_up; @@ -1271,7 +1224,6 @@ void(float shotcount, vector dir, vector spread) FireBullets = traceline (src, src + dir*1024, FALSE, self); //WK 2048 puff_org = trace_endpos - dir*4; puff_count = shotcount; -#endif while (shotcount > 0) { @@ -1295,9 +1247,7 @@ void(float shotcount, vector dir, vector spread) FireBullets = shotcount = shotcount - 1; } ApplyMultiDamage (); -#ifdef QUAKE_WORLD Multi_Finish (); -#endif }; /* @@ -1635,16 +1585,7 @@ void() s_explode6 = [5, SUB_Remove] {}; void() BecomeExplosion = { -#ifndef QUAKE_WORLD - self.movetype = MOVETYPE_NONE; - self.velocity = '0 0 0'; - self.touch = SUB_Null; - setmodel (self, "progs/s_explod.spr"); - self.solid = SOLID_NOT; - s_explode1 (); -#else dremove(self); -#endif }; void() T_MissileTouch = @@ -1702,16 +1643,12 @@ void() T_MissileTouch = WriteCoord (MSG_BROADCAST, self.origin_x); WriteCoord (MSG_BROADCAST, self.origin_y); WriteCoord (MSG_BROADCAST, self.origin_z); -#ifdef QUAKE_WORLD multicast (self.origin, MULTICAST_PHS); if (other.classname == "force_field") //- OfN - Makes field explosion b4 removing it FieldExplosion(other,self.origin,self); dremove(self); -#else - BecomeExplosion (); -#endif }; //CH rocket tracker (taken from shalrath.qc) @@ -1887,7 +1824,6 @@ LIGHTNING =============================================================================== */ -#ifdef QUAKE_WORLD void(entity from, float damage) LightningHit = { WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); @@ -1899,7 +1835,6 @@ void(entity from, float damage) LightningHit = TF_T_Damage (trace_ent, from, from, damage, TF_TD_NOTTEAM, TF_TD_ELECTRICITY); }; -#endif /* ================= @@ -1928,12 +1863,7 @@ void(vector p1, vector p2, entity from, float damage) LightningDamage = deathmsg = DMSG_LIGHTNING; if (trace_ent.takedamage) { - #ifdef QUAKE_WORLD LightningHit (from, damage); - #else - particle (trace_endpos, '0 0 100', 225, damage*4); - TF_T_Damage (trace_ent, from, from, damage, TF_TD_NOTTEAM, TF_TD_ELECTRICITY); - #endif if (self.classname == "player") { if (other.classname == "player") @@ -1945,24 +1875,14 @@ void(vector p1, vector p2, entity from, float damage) LightningDamage = traceline (p1 + f, p2 + f, FALSE, self); if (trace_ent != e1 && trace_ent.takedamage) { - #ifdef QUAKE_WORLD LightningHit (from, damage); - #else - particle (trace_endpos, '0 0 100', 225, damage*4); - TF_T_Damage (trace_ent, from, from, damage, TF_TD_NOTTEAM, TF_TD_ELECTRICITY); - #endif } e2 = trace_ent; traceline (p1 - f, p2 - f, FALSE, self); if (trace_ent != e1 && trace_ent != e2 && trace_ent.takedamage) { - #ifdef QUAKE_WORLD LightningHit (from, damage); - #else - particle (trace_endpos, '0 0 100', 225, damage*4); - TF_T_Damage (trace_ent, from, from, damage, TF_TD_NOTTEAM, TF_TD_ELECTRICITY); - #endif } }; @@ -2045,9 +1965,7 @@ void() W_FireLightning = WriteCoord (MSG_BROADCAST, trace_endpos_x); WriteCoord (MSG_BROADCAST, trace_endpos_y); WriteCoord (MSG_BROADCAST, trace_endpos_z); - #ifdef QUAKE_WORLD multicast (org, MULTICAST_PHS); - #endif return; } @@ -2064,9 +1982,7 @@ void() W_FireLightning = WriteCoord (MSG_BROADCAST, trace_endpos_x); WriteCoord (MSG_BROADCAST, trace_endpos_y); WriteCoord (MSG_BROADCAST, trace_endpos_z); -#ifdef QUAKE_WORLD multicast (org, MULTICAST_PHS); -#endif //WK Either way of firing the gun, we handle it here //WK2 - Tone it down a LOT @@ -2184,12 +2100,8 @@ void() GrenadeExplode = WriteCoord (MSG_BROADCAST, self.origin_x); WriteCoord (MSG_BROADCAST, self.origin_y); WriteCoord (MSG_BROADCAST, self.origin_z); -#ifdef QUAKE_WORLD multicast (self.origin, MULTICAST_PHS); dremove(self); -#else - BecomeExplosion (); -#endif }; void() GrenadeTouch = @@ -2339,12 +2251,10 @@ void() superspike_touch = deathmsg = self.weapon; /* -#ifdef QUAKE_WORLD // In QW, nail grens only launch 1 nail, and it does more damage. if (deathmsg == DMSG_GREN_NAIL) ndmg = 40; else -#endif */ ndmg = 13; @@ -2365,9 +2275,7 @@ void() superspike_touch = WriteCoord (MSG_BROADCAST, self.origin_x); WriteCoord (MSG_BROADCAST, self.origin_y); WriteCoord (MSG_BROADCAST, self.origin_z); - #ifdef QUAKE_WORLD multicast (self.origin, MULTICAST_PHS); - #endif } } @@ -2495,9 +2403,7 @@ void() spike_touch = WriteCoord (MSG_BROADCAST, self.origin_x); WriteCoord (MSG_BROADCAST, self.origin_y); WriteCoord (MSG_BROADCAST, self.origin_z); - #ifdef QUAKE_WORLD multicast (self.origin, MULTICAST_PHS); - #endif } } @@ -4165,18 +4071,6 @@ void() CycleWeaponCommand = -#ifndef QUAKE_WORLD -void() QuadCheat = -{ - if (deathmatch || coop) - return; - self.super_time = 1; - self.super_damage_finished = time + 30; - self.items = self.items | IT_QUAD; - RPrint ("quad cheat\n"); -}; -#endif - /* ============ ImpulseCommands @@ -4614,7 +4508,6 @@ void() DeadImpulses = StatusRes(self.impulse - 71); } //CH Admin controls -#ifdef QUAKE_WORLD else if (self.impulse == IMPULSE_DEBUG && allow_debug == 1) { MakeMeDebug(self); @@ -4660,7 +4553,6 @@ void() DeadImpulses = { Admin_Call_Ceasefire(); } -#endif // TeamFortress Alias checking else if (self.impulse == TF_ALIAS_CHECK) { @@ -4904,17 +4796,12 @@ void() T_DaedalusTouch = WriteCoord (MSG_BROADCAST, self.origin_x); WriteCoord (MSG_BROADCAST, self.origin_y); WriteCoord (MSG_BROADCAST, self.origin_z); -#ifdef QUAKE_WORLD multicast (self.origin, MULTICAST_PHS); if (other.classname == "force_field") //- OfN - Makes field explosion b4 removing it FieldExplosion(other,self.origin,self); dremove(self); -#else - BecomeExplosion (); -#endif - }; /* diff --git a/world.qc b/world.qc index fd4df81..c226b41 100644 --- a/world.qc +++ b/world.qc @@ -213,14 +213,6 @@ void() worldspawn = cvar_set ("sv_gc", "10"); // custom map attributes -#ifndef QUAKE_WORLD - if (self.model == "maps/e1m8.bsp") - cvar_set ("sv_gravity", "100"); - else - cvar_set ("sv_gravity", "800"); -#endif - -#ifdef QUAKE_WORLD st = infokey(world, "*gamedir"); if (st != "fortress") { @@ -229,7 +221,6 @@ void() worldspawn = else objerror("QW TF must be run with a gamedir of \"fortress\".\n"); } -#endif //- OfteN globals -// UpdateInfos(); @@ -473,10 +464,8 @@ void() worldspawn = precache_model2("progs/grenade2.mdl"); // New grenade precache_model2("progs/v_grap.mdl"); // Grapple gun precache_model2("progs/hook.mdl"); // Grapple hook -//#ifndef QUAKE_WORLD if (headless==1) precache_model2("progs/headless.mdl"); // Player with no head -//#endif hehe why?? precache_model2("progs/sencer.mdl");