X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fsv_main.qc;h=aac9c497d1dabeaf7b901988a098a7128b14ed77;hb=b9671f63469586007314131f3f53728795c035cd;hp=4aa404d75979f85c4c7e320f19e4b8a5f6228e98;hpb=77d6a05629e33da863fccb3cdd03b3c63af890dd;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc index 4aa404d75..aac9c497d 100644 --- a/qcsrc/server/sv_main.qc +++ b/qcsrc/server/sv_main.qc @@ -38,9 +38,9 @@ void CreatureFrame_hotliquids(entity this) if (this.flags & FL_PROJECTILE) { if (this.watertype == CONTENT_LAVA) - Damage (this, world, world, autocvar_g_balance_contents_projectiledamage * autocvar_g_balance_contents_damagerate * this.waterlevel, DEATH_LAVA.m_id, this.origin, '0 0 0'); + Damage (this, NULL, NULL, autocvar_g_balance_contents_projectiledamage * autocvar_g_balance_contents_damagerate * this.waterlevel, DEATH_LAVA.m_id, this.origin, '0 0 0'); else if (this.watertype == CONTENT_SLIME) - Damage (this, world, world, autocvar_g_balance_contents_projectiledamage * autocvar_g_balance_contents_damagerate * this.waterlevel, DEATH_SLIME.m_id, this.origin, '0 0 0'); + Damage (this, NULL, NULL, autocvar_g_balance_contents_projectiledamage * autocvar_g_balance_contents_damagerate * this.waterlevel, DEATH_SLIME.m_id, this.origin, '0 0 0'); } else { @@ -51,9 +51,9 @@ void CreatureFrame_hotliquids(entity this) this.watersound_finished = time + 0.5; sound (this, CH_PLAYER_SINGLE, SND_LAVA, VOL_BASE, ATTEN_NORM); } - Damage (this, world, world, autocvar_g_balance_contents_playerdamage_lava * autocvar_g_balance_contents_damagerate * this.waterlevel, DEATH_LAVA.m_id, this.origin, '0 0 0'); + Damage (this, NULL, NULL, autocvar_g_balance_contents_playerdamage_lava * autocvar_g_balance_contents_damagerate * this.waterlevel, DEATH_LAVA.m_id, this.origin, '0 0 0'); if(autocvar_g_balance_contents_playerdamage_lava_burn) - Fire_AddDamage(this, world, autocvar_g_balance_contents_playerdamage_lava_burn * this.waterlevel, autocvar_g_balance_contents_playerdamage_lava_burn_time * this.waterlevel, DEATH_LAVA.m_id); + Fire_AddDamage(this, NULL, autocvar_g_balance_contents_playerdamage_lava_burn * this.waterlevel, autocvar_g_balance_contents_playerdamage_lava_burn_time * this.waterlevel, DEATH_LAVA.m_id); } else if (this.watertype == CONTENT_SLIME) { @@ -62,7 +62,7 @@ void CreatureFrame_hotliquids(entity this) this.watersound_finished = time + 0.5; sound (this, CH_PLAYER_SINGLE, SND_SLIME, VOL_BASE, ATTEN_NORM); } - Damage (this, world, world, autocvar_g_balance_contents_playerdamage_slime * autocvar_g_balance_contents_damagerate * this.waterlevel, DEATH_SLIME.m_id, this.origin, '0 0 0'); + Damage (this, NULL, NULL, autocvar_g_balance_contents_playerdamage_slime * autocvar_g_balance_contents_damagerate * this.waterlevel, DEATH_SLIME.m_id, this.origin, '0 0 0'); } } } @@ -107,22 +107,22 @@ void CreatureFrame_FallDamage(entity this) else dm = min((dm - autocvar_g_balance_falldamage_minspeed) * autocvar_g_balance_falldamage_factor, autocvar_g_balance_falldamage_maxdamage); if (dm > 0) - Damage (this, world, world, dm, DEATH_FALL.m_id, this.origin, '0 0 0'); + Damage (this, NULL, NULL, dm, DEATH_FALL.m_id, this.origin, '0 0 0'); } if(autocvar_g_maxspeed > 0 && velocity_len > autocvar_g_maxspeed) - Damage (this, world, world, 100000, DEATH_SHOOTING_STAR.m_id, this.origin, '0 0 0'); + Damage (this, NULL, NULL, 100000, DEATH_SHOOTING_STAR.m_id, this.origin, '0 0 0'); } } void CreatureFrame_All() { - FOREACH_ENTITY_FLOAT(damagedbycontents, true, LAMBDA( - if(it.movetype == MOVETYPE_NOCLIP) continue; + FOREACH_ENTITY_FLOAT(damagedbycontents, true, { + if (it.movetype == MOVETYPE_NOCLIP) continue; CreatureFrame_Liquids(it); CreatureFrame_FallDamage(it); it.oldvelocity = it.velocity; - )); + }); } void Pause_TryPause(bool ispaused) @@ -154,8 +154,13 @@ float game_delay_last; bool autocvar_sv_autopause = true; float RedirectionThink(); +void PM_Main(Client this); void StartFrame() { + // TODO: if move is more than 50ms, split it into two moves (this matches QWSV behavior and the client prediction) + FOREACH_ENTITY_CLASS(STR_PLAYER, IS_FAKE_CLIENT(it), PM_Main(it)); + FOREACH_ENTITY_CLASS(STR_PLAYER, IS_FAKE_CLIENT(it), WITHSELF(it, PlayerPreThink())); + execute_next_frame(); if (autocvar_sv_autopause && !server_is_dedicated) Pause_TryPause(true); @@ -185,10 +190,9 @@ void StartFrame() } #endif - FOREACH_ENTITY_FLOAT(csqcprojectile_clientanimate, true, LAMBDA(CSQCProjectile_Check(it))); + FOREACH_ENTITY_FLOAT(csqcprojectile_clientanimate, true, CSQCProjectile_Check(it)); - if(RedirectionThink()) - return; + if (RedirectionThink()) return; UncustomizeEntitiesRun(); InitializeEntitiesRun(); @@ -196,8 +200,7 @@ void StartFrame() WarpZone_StartFrame(); sys_frametime = autocvar_sys_ticrate * autocvar_slowmo; - if(sys_frametime <= 0) - sys_frametime = 1.0 / 60.0; // somewhat safe fallback + if (sys_frametime <= 0) sys_frametime = 1.0 / 60.0; // somewhat safe fallback if (timeout_status == TIMEOUT_LEADTIME) // just before the timeout (when timeout_status will be TIMEOUT_ACTIVE) orig_slowmo = autocvar_slowmo; // slowmo will be restored after the timeout @@ -207,7 +210,7 @@ void StartFrame() // detect when the pre-game countdown (if any) has ended and the game has started game_delay = (time < game_starttime); - if(autocvar_sv_eventlog && game_delay_last && !game_delay) + if (autocvar_sv_eventlog && game_delay_last && !game_delay) GameLogEcho(":startdelay_ended"); game_delay_last = game_delay; @@ -215,12 +218,7 @@ void StartFrame() CreatureFrame_All(); CheckRules_World(); - // if in warmup stage and limit for warmup is hit start match - if(warmup_stage) - if(!gameover) - if((g_warmup_limit > 0 && time >= g_warmup_limit) - || (g_warmup_limit == 0 && autocvar_timelimit != 0 && time >= autocvar_timelimit * 60)) - { + if (warmup_stage && !gameover && warmup_limit > 0 && time >= warmup_limit) { ReadyRestart(); return; } @@ -229,7 +227,8 @@ void StartFrame() anticheat_startframe(); MUTATOR_CALLHOOK(SV_StartFrame); - FOREACH_CLIENT(true, LAMBDA(GlobalStats_update(it))); + FOREACH_CLIENT(true, GlobalStats_update(it)); + FOREACH_ENTITY_CLASS(STR_PLAYER, IS_FAKE_CLIENT(it), WITHSELF(it, PlayerPostThink())); } .vector originjitter; @@ -237,24 +236,26 @@ void StartFrame() .float anglejitter; .string gametypefilter; .string cvarfilter; -float DoesQ3ARemoveThisEntity(); +bool DoesQ3ARemoveThisEntity(entity this); void SV_OnEntityPreSpawnFunction() -{SELFPARAM(); +{ENGINE_EVENT(); + __spawnfunc_expecting = true; __spawnfunc_expect = this; - if (self) - if (self.gametypefilter != "") - if (!isGametypeInFilter(MapInfo_LoadedGametype, teamplay, have_team_spawns, self.gametypefilter)) + if (this) + if (this.gametypefilter != "") + if (!isGametypeInFilter(MapInfo_LoadedGametype, teamplay, have_team_spawns, this.gametypefilter)) { - remove(self); + remove(this); + __spawnfunc_expecting = false; return; } - if(self.cvarfilter != "") + if(this.cvarfilter != "") { float n, i, o, inv; string s, k, v; inv = 0; - s = self.cvarfilter; + s = this.cvarfilter; if(substring(s, 0, 1) == "+") { s = substring(s, 1, -1); @@ -353,41 +354,44 @@ LABEL(cvar_fail) if (!inv) { //print("cvarfilter fail\n"); - remove(self); + remove(this); + __spawnfunc_expecting = false; return; } } - if(DoesQ3ARemoveThisEntity()) + if(DoesQ3ARemoveThisEntity(this)) { - remove(self); + remove(this); + __spawnfunc_expecting = false; return; } // support special -1 and -2 angle from radiant - if (self.angles == '0 -1 0') - self.angles = '-90 0 0'; - else if (self.angles == '0 -2 0') - self.angles = '+90 0 0'; - - if(self.originjitter.x != 0) - self.origin_x = self.origin.x + (random() * 2 - 1) * self.originjitter.x; - if(self.originjitter.y != 0) - self.origin_y = self.origin.y + (random() * 2 - 1) * self.originjitter.y; - if(self.originjitter.z != 0) - self.origin_z = self.origin.z + (random() * 2 - 1) * self.originjitter.z; - if(self.anglesjitter.x != 0) - self.angles_x = self.angles.x + (random() * 2 - 1) * self.anglesjitter.x; - if(self.anglesjitter.y != 0) - self.angles_y = self.angles.y + (random() * 2 - 1) * self.anglesjitter.y; - if(self.anglesjitter.z != 0) - self.angles_z = self.angles.z + (random() * 2 - 1) * self.anglesjitter.z; - if(self.anglejitter != 0) - self.angles_y = self.angles.y + (random() * 2 - 1) * self.anglejitter; - - if(MUTATOR_CALLHOOK(OnEntityPreSpawn)) + if (this.angles == '0 -1 0') + this.angles = '-90 0 0'; + else if (this.angles == '0 -2 0') + this.angles = '+90 0 0'; + + if(this.originjitter.x != 0) + this.origin_x = this.origin.x + (random() * 2 - 1) * this.originjitter.x; + if(this.originjitter.y != 0) + this.origin_y = this.origin.y + (random() * 2 - 1) * this.originjitter.y; + if(this.originjitter.z != 0) + this.origin_z = this.origin.z + (random() * 2 - 1) * this.originjitter.z; + if(this.anglesjitter.x != 0) + this.angles_x = this.angles.x + (random() * 2 - 1) * this.anglesjitter.x; + if(this.anglesjitter.y != 0) + this.angles_y = this.angles.y + (random() * 2 - 1) * this.anglesjitter.y; + if(this.anglesjitter.z != 0) + this.angles_z = this.angles.z + (random() * 2 - 1) * this.anglesjitter.z; + if(this.anglejitter != 0) + this.angles_y = this.angles.y + (random() * 2 - 1) * this.anglejitter; + + if(MUTATOR_CALLHOOK(OnEntityPreSpawn, this)) { - remove(self); + remove(this); + __spawnfunc_expecting = false; return; } } @@ -396,7 +400,7 @@ void WarpZone_PostInitialize_Callback() { // create waypoint links for warpzones entity e; - for(e = world; (e = find(e, classname, "trigger_warpzone")); ) + for(e = NULL; (e = find(e, classname, "trigger_warpzone")); ) { vector src, dst; src = (e.absmin + e.absmax) * 0.5;