X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fmain.qc;h=9c610aabca53484a66ec502772e79dc483336010;hb=HEAD;hp=5f2332c69096896ce639fce443df27d95eca1362;hpb=ff0befb7d2c673b926cbc9bf0bbf8a1e07f2aff6;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc index 5f2332c69..36dbd7e22 100644 --- a/qcsrc/client/main.qc +++ b/qcsrc/client/main.qc @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -42,7 +43,7 @@ // CSQC_Init : Called every time the CSQC code is initialized (essentially at map load) // Useful for precaching things -void CSQC_Init() +void CSQC_Init(float apilevel, string enginename, float engineversion) { prvm_language = strzone(cvar_string("prvm_language")); @@ -50,6 +51,8 @@ void CSQC_Init() LOG_TRACEF("^4CSQC Build information: ^1%s", WATERMARK); #endif + CheckEngineExtensions(); + { int i = 0; for ( ; i < 255; ++i) @@ -195,6 +198,8 @@ void Shutdown() localcmd("\n-button12\n"); + strfree(gametype_custom_name); + deactivate_minigame(); HUD_MinigameMenu_Close(NULL, NULL, NULL); @@ -691,9 +696,6 @@ NET_HANDLE(ENT_CLIENT_CLIENTDATA, bool isnew) if(newspectatee_status != spectatee_status) { - // clear race stuff - race_laptime = 0; - race_checkpointtime = 0; hud_dynamic_shake_factor = -1; spectatee_status_changed_time = time; } @@ -744,7 +746,7 @@ NET_HANDLE(ENT_CLIENT_NAGGER, bool isnew) for(int i = 0; i < maxclients;) for(int f = ReadByte(), b = 0; b < 8 && i < maxclients; ++b, ++i) if(playerslots[i]) - playerslots[i].ready = (f & BIT(b)); + playerslots[i].ready = f & BIT(b); return = true; @@ -872,11 +874,13 @@ NET_HANDLE(ENT_CLIENT_SPAWNEVENT, bool is_new) { this.origin = ReadVector(); + int particlesAndOrSound = ReadByte(); + if(is_new) { float teamnum = entcs_GetTeam(entnum - 1); - if(autocvar_cl_spawn_event_particles) + if(autocvar_cl_spawn_event_particles && (particlesAndOrSound & BIT(0))) { switch(teamnum) { @@ -887,7 +891,8 @@ NET_HANDLE(ENT_CLIENT_SPAWNEVENT, bool is_new) default: pointparticles(EFFECT_SPAWN_NEUTRAL, this.origin, '0 0 0', 1); break; } } - if(autocvar_cl_spawn_event_sound) + + if(autocvar_cl_spawn_event_sound && (particlesAndOrSound & BIT(1))) { sound(this, CH_TRIGGER, SND_SPAWN, VOL_BASE, ATTEN_NORM); } @@ -1060,13 +1065,25 @@ bool CSQC_Parse_TempEntity() return false; } +bool autocvar_r_drawfog; +bool autocvar_r_fog_exp2; string forcefog; void Fog_Force() { if (autocvar_cl_orthoview && autocvar_cl_orthoview_nofog) - localcmd("\nr_drawfog 0\n"); + { + if (autocvar_r_drawfog) + cvar_set("r_drawfog", "0"); + } else if (forcefog != "") - localcmd(sprintf("\nfog %s\nr_fog_exp2 0\nr_drawfog 1\n", forcefog)); + { + // using cvar_set as it's faster and safer than a command + if (!autocvar_r_drawfog) + cvar_set("r_drawfog", "1"); + if (autocvar_r_fog_exp2) + cvar_set("r_fog_exp2", "0"); + localcmd(sprintf("\nfog %s\n", forcefog)); + } } bool net_handle_ServerWelcome(); @@ -1074,6 +1091,7 @@ NET_HANDLE(ENT_CLIENT_SCORES_INFO, bool isnew) { make_pure(this); gametype = ReadRegistered(Gametypes); + strcpy(gametype_custom_name, ReadString()); teamplay = _MapInfo_GetTeamPlayBool(gametype); HUD_ModIcons_SetFunc(); FOREACH(Scores, true, { @@ -1177,6 +1195,29 @@ NET_HANDLE(TE_CSQC_RACE, bool isNew) race_penaltyaccumulator = 0; race_laptime = time; // valid } + + // show checkpoint splits after a run + // specs can switch players for confusing splits, deny service + // if hit 255 finish line or if finish line is 0 or if restarted + if (!entcs_IsSpectating(player_localnum) + && (race_checkpoint == 255 + || race_checkpoint < race_checkpoint_splits_previous)) + { + LOG_HELP(_("Checkpoint times:")); + for (int i = 0; i < 255; ++i) + { + // does this index have a split? + if (race_checkpoint_splits[i]) + { + // print it and free it + LOG_HELP(race_checkpoint_splits[i]); + strfree(race_checkpoint_splits[i]); + } + } + + // allow registering 0th cp in case we start at 254 start line + race_checkpoint_splits_previous = 0; + } break; case RACE_NET_CHECKPOINT_CLEAR: @@ -1366,7 +1407,7 @@ string translate_weaponarena(string s) int n = tokenizebyseparator(s, " & "); string wpn_list = ""; - for (int i = 0; i < n; i++) + for (int i = 0; i < n; ++i) { Weapon wep = Weapon_from_name(argv(i)); if (wep == WEP_Null) @@ -1399,7 +1440,9 @@ string GetVersionMessage(string hostversion, bool version_mismatch, bool version bool net_handle_ServerWelcome() { - campaign = ReadByte(); + int flags = ReadByte(); + + campaign = flags & 1; if (campaign) { int campaign_level = ReadByte(); @@ -1420,8 +1463,10 @@ bool net_handle_ServerWelcome() strcpy(hostname, ReadString()); string hostversion = ReadString(); - bool version_mismatch = ReadByte(); - bool version_check = ReadByte(); + bool version_mismatch = flags & 2; + bool version_check = flags & 4; + MapInfo_Map_titlestring = ReadString(); + MapInfo_Map_author = flags & 8 ? ReadString() : ""; srv_minplayers = ReadByte(); srv_maxplayers = ReadByte(); string modifications = translate_modifications(ReadString()); @@ -1433,15 +1478,9 @@ bool net_handle_ServerWelcome() msg = strcat(msg, "\n\n", _("Gametype:"), " ^1", MapInfo_Type_ToText(gametype), "\n"); - msg = strcat(msg, "\n", _("Map:"), " ^2"); - if (world.message == "") - msg = strcat(msg, mi_shortname, "\n"); - else - { - int i = strstrofs(world.message, " by ", 0); // matches _MapInfo_Generate() - string longname = i >= 0 ? substring(world.message, 0, i) : world.message; - msg = strcat(msg, (strcasecmp(longname, mi_shortname) ? strcat(mi_shortname, " ^7// ^2") : ""), longname, "\n"); - } + msg = strcat(msg, "\n", _("Map:"), " ", MapInfo_Map_titlestring, "\n"); + if (flags & 8) + msg = strcat(msg, "^9", _("by:"), " ", MapInfo_Map_author, "\n"); if (srv_minplayers || srv_maxplayers) {