#include <client/shownames.qh>
#include <client/view.qh>
#include <client/weapons/projectile.qh>
+#include <common/checkextension.qh>
#include <common/deathtypes/all.qh>
#include <common/effects/all.inc>
#include <common/effects/all.qh>
// 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"));
LOG_TRACEF("^4CSQC Build information: ^1%s", WATERMARK);
#endif
+ CheckEngineExtensions();
+
{
int i = 0;
for ( ; i < 255; ++i)
localcmd("\n-button12\n");
+ strfree(gametype_custom_name);
+
deactivate_minigame();
HUD_MinigameMenu_Close(NULL, NULL, NULL);
localcmd("-use\n");
localcmd("-hook\n");
localcmd("-jump\n");
+ localcmd("-forward\n");
+ localcmd("-back\n");
+ localcmd("-moveleft\n");
+ localcmd("-moveright\n");
}
// CSQC_InputEvent : Used to perform actions based on any key pressed, key released and mouse on the client.
Scoreboard_UI_Enable(0);
return true;
}
- if (!isdemo() && cvar("_menu_gamemenu_dialog_available"))
+ if (autocvar_menu_gamemenu && !isdemo() && cvar("_menu_gamemenu_dialog_available"))
{
localcmd("\nmenu_showgamemenudialog\n");
return true;
// --------------------------------------------------------------------------
// BEGIN OPTIONAL CSQC FUNCTIONS
-
+.int survival_status;
void Ent_RemovePlayerScore(entity this)
{
if(this.owner) {
FOREACH(Scores, true, {
this.owner.(scores(it)) = 0; // clear all scores
});
+ this.owner.ready = 0;
+ this.owner.eliminated = 0;
+ this.owner.colormap = 0;
+ // TODO add a hook to reset this Survival field
+ this.owner.survival_status = 0;
}
}
newspectatee_status = 0;
spectatorbutton_zoom = (f & BIT(2));
+ observe_blocked = (f & BIT(3));
if(f & BIT(4))
{
NET_HANDLE(ENT_CLIENT_NAGGER, bool isnew)
{
make_pure(this);
- int i, j, b, f;
int nags = ReadByte(); // NAGS NAGS NAGS NAGS NAGS NAGS NADZ NAGS NAGS NAGS
strcpy(vote_called_vote, ReadString());
}
- if(nags & 1)
- {
- for(j = 0; j < maxclients; ++j)
- if(playerslots[j])
- playerslots[j].ready = true;
- for(i = 1; i <= maxclients; i += 8)
- {
- f = ReadByte();
- for(j = i-1, b = BIT(0); b < BIT(8); b <<= 1, ++j)
- if (!(f & b))
- if(playerslots[j])
- playerslots[j].ready = false;
- }
- }
+ if(nags & BIT(0))
+ 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);
return = true;
{
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)
{
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);
}
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();
{
make_pure(this);
gametype = ReadRegistered(Gametypes);
+ strcpy(gametype_custom_name, ReadString());
teamplay = _MapInfo_GetTeamPlayBool(gametype);
HUD_ModIcons_SetFunc();
FOREACH(Scores, true, {
race_server_record = ReadInt24_t();
break;
case RACE_NET_SPEED_AWARD:
- race_speedaward = ReadInt24_t() * GetSpeedUnitFactor(autocvar_hud_panel_physics_speed_unit);
+ race_speedaward = ReadInt24_t();
strcpy(race_speedaward_holder, ReadString());
break;
case RACE_NET_SPEED_AWARD_BEST:
- race_speedaward_alltimebest = ReadInt24_t() * GetSpeedUnitFactor(autocvar_hud_panel_physics_speed_unit);
+ race_speedaward_alltimebest = ReadInt24_t();
strcpy(race_speedaward_alltimebest_holder, ReadString());
break;
case RACE_NET_RANKINGS_CNT:
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)
bool net_handle_ServerWelcome()
{
- bool campaign = ReadByte();
+ campaign = ReadByte();
if (campaign)
{
- string campaign_title = ReadString();
int campaign_level = ReadByte();
- string campaign_msg = ReadString();
- string welcomedialog_args;
- welcomedialog_args = strcat("HOSTNAME \"", campaign_title, "\"");
+ // Menu can't build the whole campaign message because it lacks getcommandkey and CCR
+ // so we build part of the message here and let the menu insert the level description
+ // (that client doesn't know) by replacing the keyword _LEVEL_DESC
string key = getcommandkey(_("jump"), "+jump");
string msg = strcat(
CCR("^F1"), sprintf(_("Level %d:"), campaign_level),
- sprintf(CCR(" ^BG%s\n^3\n"), campaign_msg),
+ sprintf(CCR(" ^BG%s\n\n"), "_LEVEL_DESC"),
sprintf(CCR(_("^BGPress ^F2%s^BG to enter the game")), key));
msg = MakeConsoleSafe(strreplace("\n", "\\n", msg));
- welcomedialog_args = strcat(welcomedialog_args, " WELCOME \"", msg, "\"");
+ string welcomedialog_args = strcat("CAMPAIGN ", itos(campaign_level), " \"", msg, "\"");
+
localcmd("\nmenu_cmd directmenu Welcome ", welcomedialog_args, "\n");
return true;
}
projects / xonotic / xonotic-data.pk3dir.git / blobdiff