X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fmiscfunctions.qc;h=a5311d54fe8040858e2d862ecfe642e1537e1c31;hp=0b5b42781229f0df535621e4b373a0e36302329a;hb=31bf64ba7821ebb5c0aba8a154472810074ed11e;hpb=49af10f3413b96e52055359d42288dbf5ec6972b diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index 0b5b427812..a5311d54fe 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -96,9 +96,11 @@ const string STR_OBSERVER = "observer"; #define FOR_EACH_REALCLIENT(v) FOR_EACH_CLIENT(v) if(IS_REAL_CLIENT(v)) #define FOR_EACH_PLAYER(v) FOR_EACH_CLIENT(v) if(IS_PLAYER(v)) -#define FOR_EACH_SPEC(v) FOR_EACH_CLIENT(v) if not(IS_PLAYER(v)) // Samual: shouldn't this be IS_SPEC(v)? and rather create a separate macro to include observers too +#define FOR_EACH_SPEC(v) FOR_EACH_CLIENT(v) if (!IS_PLAYER(v)) // Samual: shouldn't this be IS_SPEC(v)? and rather create a separate macro to include observers too #define FOR_EACH_REALPLAYER(v) FOR_EACH_REALCLIENT(v) if(IS_PLAYER(v)) +#define FOR_EACH_MONSTER(v) for(v = world; (v = findflags(v, flags, FL_MONSTER)) != world; ) + #define CENTER_OR_VIEWOFS(ent) (ent.origin + (IS_PLAYER(ent) ? ent.view_ofs : ((ent.mins + ent.maxs) * 0.5))) // copies a string to a tempstring (so one can strunzone it) @@ -615,6 +617,7 @@ float start_armorvalue; WepSet warmup_start_weapons; WepSet warmup_start_weapons_default; WepSet warmup_start_weapons_defaultmask; +#define WARMUP_START_WEAPONS ((g_warmup_allguns == 1) ? (warmup_start_weapons & (weaponsInMap | start_weapons)) : warmup_start_weapons) float warmup_start_ammo_shells; float warmup_start_ammo_nails; float warmup_start_ammo_rockets; @@ -647,16 +650,16 @@ float want_weapon(string cvarprefix, entity weaponinfo, float allguns) d = 0; // weapon is set a few lines later else d = (i == WEP_LASER || i == WEP_SHOTGUN); - + if(g_grappling_hook) // if possible, redirect off-hand hook to on-hand hook d |= (i == WEP_HOOK); if(weaponinfo.spawnflags & WEP_FLAG_MUTATORBLOCKED) // never default mutator blocked guns d = 0; var float t = cvar(strcat(cvarprefix, weaponinfo.netname)); - + //print(strcat("want_weapon: ", weaponinfo.netname, " - d: ", ftos(d), ", t: ", ftos(t), ". \n")); - + // bit order in t: // 1: want or not // 2: is default? @@ -712,7 +715,7 @@ void readplayerstartcvars() for (j = WEP_FIRST; j <= WEP_LAST; ++j) { e = get_weaponinfo(j); - if not(e.spawnflags & WEP_FLAG_MUTATORBLOCKED) + if (!(e.spawnflags & WEP_FLAG_MUTATORBLOCKED)) g_weaponarena_weapons |= WepSet_FromWeapon(j); } } @@ -723,7 +726,7 @@ void readplayerstartcvars() for (j = WEP_FIRST; j <= WEP_LAST; ++j) { e = get_weaponinfo(j); - if not(e.spawnflags & WEP_FLAG_MUTATORBLOCKED) + if (!(e.spawnflags & WEP_FLAG_MUTATORBLOCKED)) if (e.spawnflags & WEP_FLAG_NORMAL) g_weaponarena_weapons |= WepSet_FromWeapon(j); } @@ -788,7 +791,7 @@ void readplayerstartcvars() if(!cvar("g_use_ammunition")) start_items |= IT_UNLIMITED_AMMO; - + if(start_items & IT_UNLIMITED_WEAPON_AMMO) { start_ammo_rockets = 999; @@ -834,7 +837,7 @@ void readplayerstartcvars() for (i = WEP_FIRST; i <= WEP_LAST; ++i) { e = get_weaponinfo(i); - float w = want_weapon("g_start_weapon_", e, cvar("g_warmup_allguns")); + float w = want_weapon("g_start_weapon_", e, g_warmup_allguns); if(w & 1) warmup_start_weapons |= WepSet_FromWeapon(i); if(w & 2) @@ -858,10 +861,13 @@ void readplayerstartcvars() warmup_start_ammo_fuel = max(warmup_start_ammo_fuel, cvar("g_balance_fuel_rotstable")); } + WepSet precache_weapons = start_weapons; + if (g_warmup_allguns != 1) + precache_weapons |= warmup_start_weapons; for (i = WEP_FIRST; i <= WEP_LAST; ++i) { e = get_weaponinfo(i); - if((start_weapons | warmup_start_weapons) & WepSet_FromWeapon(i)) + if(precache_weapons & WepSet_FromWeapon(i)) weapon_action(i, WR_PRECACHE); } @@ -903,9 +909,9 @@ void readlevelcvars(void) // load mutators #define CHECK_MUTATOR_ADD(mut_cvar,mut_name,dependence) \ { if(cvar(mut_cvar) && dependence) { MUTATOR_ADD(mut_name); } } - + CHECK_MUTATOR_ADD("g_dodging", mutator_dodging, 1); - CHECK_MUTATOR_ADD("g_spawn_near_teammate", mutator_spawn_near_teammate, 1); + CHECK_MUTATOR_ADD("g_spawn_near_teammate", mutator_spawn_near_teammate, teamplay); CHECK_MUTATOR_ADD("g_physical_items", mutator_physical_items, 1); CHECK_MUTATOR_ADD("g_touchexplode", mutator_touchexplode, 1); CHECK_MUTATOR_ADD("g_minstagib", mutator_minstagib, 1); @@ -924,9 +930,10 @@ void readlevelcvars(void) CHECK_MUTATOR_ADD("g_nades", mutator_nades, 1); CHECK_MUTATOR_ADD("g_sandbox", sandbox, 1); CHECK_MUTATOR_ADD("g_campcheck", mutator_campcheck, 1); - + CHECK_MUTATOR_ADD("g_buffs", mutator_buffs, 1); + #undef CHECK_MUTATOR_ADD - + if(cvar("sv_allow_fullbright")) serverflags |= SERVERFLAG_ALLOW_FULLBRIGHT; @@ -945,14 +952,12 @@ void readlevelcvars(void) g_bugrigs_speed_ref = cvar("g_bugrigs_speed_ref"); g_bugrigs_speed_pow = cvar("g_bugrigs_speed_pow"); g_bugrigs_steer = cvar("g_bugrigs_steer"); - + g_minstagib = cvar("g_minstagib"); sv_clones = cvar("sv_clones"); sv_foginterval = cvar("sv_foginterval"); g_cloaked = cvar("g_cloaked"); - if(g_cts) - g_cloaked = 1; // always enable cloak in CTS g_footsteps = cvar("g_footsteps"); g_grappling_hook = cvar("g_grappling_hook"); g_jetpack = cvar("g_jetpack"); @@ -966,7 +971,7 @@ void readlevelcvars(void) g_warmup_allguns = cvar("g_warmup_allguns"); g_warmup_allow_timeout = cvar("g_warmup_allow_timeout"); - if ((g_race && g_race_qualifying == 2) || g_arena || g_assault || cvar("g_campaign")) + if ((g_race && g_race_qualifying == 2) || g_assault || cvar("g_campaign")) warmup_stage = 0; // these modes cannot work together, sorry g_pickup_respawntime_weapon = cvar("g_pickup_respawntime_weapon"); @@ -1033,7 +1038,7 @@ void readlevelcvars(void) if(!g_weapon_stay) g_weapon_stay = cvar("g_weapon_stay"); - if not(warmup_stage) + if (!warmup_stage) game_starttime = time + cvar("g_start_delay"); readplayerstartcvars(); @@ -1076,15 +1081,6 @@ float sound_allowed(float dest, entity e) return TRUE; } -#ifdef COMPAT_XON010_CHANNELS -void(entity e, float chan, string samp, float vol, float atten) builtin_sound = #8; -void sound(entity e, float chan, string samp, float vol, float atten) -{ - if (!sound_allowed(MSG_BROADCAST, e)) - return; - builtin_sound(e, chan, samp, vol, atten); -} -#else #undef sound void sound(entity e, float chan, string samp, float vol, float atten) { @@ -1092,7 +1088,6 @@ void sound(entity e, float chan, string samp, float vol, float atten) return; sound7(e, chan, samp, vol, atten, 0, 0); } -#endif void soundtoat(float dest, entity e, vector o, float chan, string samp, float vol, float atten) { @@ -1641,7 +1636,7 @@ void adaptor_think2use() void adaptor_think2use_hittype_splash() // for timed projectile detonation { - if not(self.flags & FL_ONGROUND) // if onground, we ARE touching something, but HITTYPE_SPLASH is to be networked if the damage causing projectile is not touching ANYTHING + if(!(self.flags & FL_ONGROUND)) // if onground, we ARE touching something, but HITTYPE_SPLASH is to be networked if the damage causing projectile is not touching ANYTHING self.projectiledeathtype |= HITTYPE_SPLASH; adaptor_think2use(); } @@ -1718,7 +1713,7 @@ float SUB_NoImpactCheck() if(trace_dphitcontents == 0) { //dprint("A hit happened with zero hit contents... DEBUG THIS, this should never happen for projectiles! Projectile will self-destruct.\n"); - dprint(sprintf("A hit from a projectile happened with no hit contents! DEBUG THIS, this should never happen for projectiles! Profectile will self-destruct. (edict: %d, classname: %s, origin: %s)\n", num_for_edict(self), self.classname, vtos(self.origin))); + dprintf("A hit from a projectile happened with no hit contents! DEBUG THIS, this should never happen for projectiles! Profectile will self-destruct. (edict: %d, classname: %s, origin: %s)\n", num_for_edict(self), self.classname, vtos(self.origin)); checkclient(); } if (trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT) @@ -1814,88 +1809,12 @@ string uid2name(string myuid) { db_put(ServerProgsDB, strcat("uid2name", myuid), ""); } } - + if(s == "") s = "^1Unregistered Player"; return s; } -float race_readTime(string map, float pos) -{ - string rr; - if(g_cts) - rr = CTS_RECORD; - else - rr = RACE_RECORD; - - return stof(db_get(ServerProgsDB, strcat(map, rr, "time", ftos(pos)))); -} - -string race_readUID(string map, float pos) -{ - string rr; - if(g_cts) - rr = CTS_RECORD; - else - rr = RACE_RECORD; - - return db_get(ServerProgsDB, strcat(map, rr, "crypto_idfp", ftos(pos))); -} - -float race_readPos(string map, float t) { - float i; - for (i = 1; i <= RANKINGS_CNT; ++i) - if (race_readTime(map, i) == 0 || race_readTime(map, i) > t) - return i; - - return 0; // pos is zero if unranked -} - -void race_writeTime(string map, float t, string myuid) -{ - string rr; - if(g_cts) - rr = CTS_RECORD; - else - rr = RACE_RECORD; - - float newpos; - newpos = race_readPos(map, t); - - float i, prevpos = 0; - for(i = 1; i <= RANKINGS_CNT; ++i) - { - if(race_readUID(map, i) == myuid) - prevpos = i; - } - if (prevpos) { // player improved his existing record, only have to iterate on ranks between new and old recs - for (i = prevpos; i > newpos; --i) { - db_put(ServerProgsDB, strcat(map, rr, "time", ftos(i)), ftos(race_readTime(map, i - 1))); - db_put(ServerProgsDB, strcat(map, rr, "crypto_idfp", ftos(i)), race_readUID(map, i - 1)); - } - } else { // player has no ranked record yet - for (i = RANKINGS_CNT; i > newpos; --i) { - db_put(ServerProgsDB, strcat(map, rr, "time", ftos(i)), ftos(race_readTime(map, i - 1))); - db_put(ServerProgsDB, strcat(map, rr, "crypto_idfp", ftos(i)), race_readUID(map, i - 1)); - } - } - - // store new time itself - db_put(ServerProgsDB, strcat(map, rr, "time", ftos(newpos)), ftos(t)); - db_put(ServerProgsDB, strcat(map, rr, "crypto_idfp", ftos(newpos)), myuid); -} - -string race_readName(string map, float pos) -{ - string rr; - if(g_cts) - rr = CTS_RECORD; - else - rr = RACE_RECORD; - - return uid2name(db_get(ServerProgsDB, strcat(map, rr, "crypto_idfp", ftos(pos)))); -} - float MoveToRandomMapLocation(entity e, float goodcontents, float badcontents, float badsurfaceflags, float attempts, float maxaboveground, float minviewdistance) { float m, i; @@ -2007,65 +1926,6 @@ float MoveToRandomMapLocation(entity e, float goodcontents, float badcontents, f return FALSE; } -float zcurveparticles_effectno; -vector zcurveparticles_start; -float zcurveparticles_spd; - -void endzcurveparticles() -{ - if(zcurveparticles_effectno) - { - // terminator - WriteShort(MSG_BROADCAST, zcurveparticles_spd | 0x8000); - } - zcurveparticles_effectno = 0; -} - -void zcurveparticles(float effectno, vector start, vector end, float end_dz, float spd) -{ - spd = bound(0, floor(spd / 16), 32767); - if(effectno != zcurveparticles_effectno || start != zcurveparticles_start) - { - endzcurveparticles(); - WriteByte(MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte(MSG_BROADCAST, TE_CSQC_ZCURVEPARTICLES); - WriteShort(MSG_BROADCAST, effectno); - WriteCoord(MSG_BROADCAST, start_x); - WriteCoord(MSG_BROADCAST, start_y); - WriteCoord(MSG_BROADCAST, start_z); - zcurveparticles_effectno = effectno; - zcurveparticles_start = start; - } - else - WriteShort(MSG_BROADCAST, zcurveparticles_spd); - WriteCoord(MSG_BROADCAST, end_x); - WriteCoord(MSG_BROADCAST, end_y); - WriteCoord(MSG_BROADCAST, end_z); - WriteCoord(MSG_BROADCAST, end_dz); - zcurveparticles_spd = spd; -} - -void zcurveparticles_from_tracetoss(float effectno, vector start, vector end, vector vel) -{ - float end_dz; - vector vecxy, velxy; - - vecxy = end - start; - vecxy_z = 0; - velxy = vel; - velxy_z = 0; - - if (vlen(velxy) < 0.000001 * fabs(vel_z)) - { - endzcurveparticles(); - trailparticles(world, effectno, start, end); - return; - } - - end_dz = vlen(vecxy) / vlen(velxy) * vel_z - (end_z - start_z); - zcurveparticles(effectno, start, end, end_dz, vlen(vel)); -} - void write_recordmarker(entity pl, float tstart, float dt) { GameLogEcho(strcat(":recordset:", ftos(pl.playerid), ":", ftos(dt))); @@ -2332,7 +2192,7 @@ void shockwave_spawn(string m, vector org, float sz, float t1, float t2) float randombit(float bits) { - if not(bits & (bits-1)) // this ONLY holds for powers of two! + if(!(bits & (bits-1))) // this ONLY holds for powers of two! return bits; float n, f, b, r; @@ -2400,7 +2260,7 @@ float ExponentialFalloff(float mindist, float maxdist, float halflifedist, float #else string cvar_string_normal(string n) { - if not(cvar_type(n) & 1) + if (!(cvar_type(n) & 1)) backtrace(strcat("Attempt to access undefined cvar: ", n)); return builtin_cvar_string(n); }