check_unacceptable_compiler_bugs();
+#ifdef WATERMARK
+ print("^4CSQC Build information: ", WATERMARK(), "\n");
+#endif
+
float i;
CSQC_CheckEngine();
// localcmd("alias order \"cmd order $*\""); enable if ctf-command thingy is used
//registercmd("ctf_menu");
registercmd("ons_map");
+ registercmd("hud_configure");
+ registercmd("hud_save");
//registercmd("menu_action");
registercmd("+button3");
#ifndef CAMERATEST
}
#endif
- registercvar("sbar_usecsqc", "1");
- registercvar("sbar_columns", "default", CVAR_SAVE);
+ registercvar("hud_usecsqc", "1");
+ registercvar("hud_columns", "default", CVAR_SAVE);
gametype = 0;
- // sbar_fields uses strunzone on the titles!
- for(i = 0; i < MAX_SBAR_FIELDS; ++i)
- sbar_title[i] = strzone("(null)");
+ // hud_fields uses strunzone on the titles!
+ for(i = 0; i < MAX_HUD_FIELDS; ++i)
+ hud_title[i] = strzone("(null)");
postinit = false;
e.ping_packetloss = 0;
e.ping_movementloss = 0;
//e.gotscores = 0; // we might already have the scores...
- SetTeam(e, GetPlayerColor(i)); // will not hurt; later updates come with Sbar_UpdatePlayerTeams
+ SetTeam(e, GetPlayerColor(i)); // will not hurt; later updates come with HUD_UpdatePlayerTeams
RegisterPlayer(e);
- Sbar_UpdatePlayerPos(e);
+ HUD_UpdatePlayerPos(e);
}
}
}
void PostInit(void)
{
print(strcat("PostInit\n maxclients = ", ftos(maxclients), "\n"));
- localcmd(strcat("\nsbar_columns_set ", cvar_string("sbar_columns"), ";\n"));
+ localcmd(strcat("\nhud_columns_set ", cvar_string("hud_columns"), ";\n"));
entity playerchecker;
playerchecker = spawn();
// CSQC_ConsoleCommand : Used to parse commands in the console that have been registered with the "registercmd" function
// Return value should be 1 if CSQC handled the command, otherwise return 0 to have the engine handle it.
float button_zoom;
-void Cmd_Sbar_SetFields(float);
-void Cmd_Sbar_Help(float);
+void Cmd_HUD_SetFields(float);
+void Cmd_HUD_Help(float);
float CSQC_ConsoleCommand(string strMessage)
{
float argc;
local string strCmd;
strCmd = argv(0);
- if(strCmd == "+button4") { // zoom
+ if(strCmd == "hud_configure") { // config hud
+ cvar_set("_hud_configure", ftos(!cvar("_hud_configure")));
+ return true;
+ } else if(strCmd == "hud_save") { // save hud config
+ if(argv(1) == "" || argv(2)) {
+ print("Usage:\n");
+ print("hud_save configname (saves to hud_skinname_configname.cfg)\n");
+ }
+ else
+ HUD_Panel_ExportCfg(argv(1));
+ return true;
+ } else if(strCmd == "+button4") { // zoom
// return false, because the message shall be sent to the server anyway (for demos/speccing)
if(ignore_plus_zoom)
{
{
print("Usage: cl_cmd COMMAND..., where possible commands are:\n");
print(" settemp cvar value\n");
- print(" radar\n");
- print(" sbar_columns_set ...\n");
- print(" sbar_columns_help\n");
+ print(" hud_columns_set ...\n");
+ print(" hud_columns_help\n");
GameCommand_Generic("help");
return;
}
else if(cmd == "settemp") {
cvar_clientsettemp(argv(1), argv(2));
}
- else if(cmd == "radar") {
- ons_showmap = !ons_showmap;
- }
- else if(cmd == "sbar_columns_set") {
- Cmd_Sbar_SetFields(argc);
+ else if(cmd == "hud_columns_set") {
+ Cmd_HUD_SetFields(argc);
}
- else if(cmd == "sbar_columns_help") {
- Cmd_Sbar_Help(argc);
+ else if(cmd == "hud_columns_help") {
+ Cmd_HUD_Help(argc);
}
#ifdef BLURTEST
else if(cmd == "blurtest") {
localcmd("sv_cmd debug_shotorg\n");
}
else if(cmd == "sendcvar") {
- s = cvar_string(argv(1));
- if(argv(1) == "cl_weaponpriority")
+ // W_FixWeaponOrder will trash argv, so save what we need.
+ string thiscvar;
+ thiscvar = strzone(argv(1));
+ s = cvar_string(thiscvar);
+ if(thiscvar == "cl_weaponpriority")
s = W_FixWeaponOrder(W_NumberWeaponOrder(s), 1);
- else if(substring(argv(1), 0, 17) == "cl_weaponpriority" && strlen(argv(1)) == 18)
+ else if(substring(thiscvar, 0, 17) == "cl_weaponpriority" && strlen(thiscvar) == 18)
s = W_FixWeaponOrder(W_NumberWeaponOrder(s), 0);
- localcmd("cmd sentcvar ", argv(1), " \"", s, "\"\n");
+ localcmd("cmd sentcvar ", thiscvar, " \"", s, "\"\n");
+ strunzone(thiscvar);
}
else if(cmd == "spawn") {
s = argv(1);
// bInputType = 0 is key pressed, 1 is key released, 2 is mouse input.
// In the case of keyboard input, nPrimary is the ascii code, and nSecondary is 0.
// In the case of mouse input, nPrimary is xdelta, nSecondary is ydelta.
+float hudconf_active;
float CSQC_InputEvent(float bInputType, float nPrimary, float nSecondary)
{
local float bSkipKey;
bSkipKey = false;
+ if(hudconf_active)
+ if (HUD_Panel_InputEvent(bInputType, nPrimary, nSecondary))
+ return true;
+
if (MapVote_InputEvent(bInputType, nPrimary, nSecondary))
return true;
float isNew;
entity o;
- // damnit -.- don't want to go change every single .sv_entnum in sbar.qc AGAIN
+ // damnit -.- don't want to go change every single .sv_entnum in hud.qc AGAIN
// (no I've never heard of M-x replace-string, sed, or anything like that)
isNew = !self.owner; // workaround for DP bug
n = ReadByte()-1;
}
if(o.sort_prev)
- Sbar_UpdatePlayerPos(o); // if not registered, we cannot do this yet!
+ HUD_UpdatePlayerPos(o); // if not registered, we cannot do this yet!
self.entremove = Ent_RemovePlayerScore;
}
o.(teamscores[i]) = ReadChar();
}
- Sbar_UpdateTeamPos(o);
+ HUD_UpdateTeamPos(o);
}
void Net_Reset()
teamscores_label[i] = strzone(ReadString());
teamscores_flags[i] = ReadByte();
}
- Sbar_InitScores();
+ HUD_InitScores();
Gamemode_Init();
}
vote_active = 0;
}
+void Net_Notify() {
+ float type;
+ type = ReadByte();
+
+ if(type == CSQC_KILLNOTIFY)
+ {
+ HUD_KillNotify(ReadString(), ReadString(), ReadByte());
+ }
+ else if(type == CSQC_CENTERPRINT)
+ {
+ HUD_Centerprint(ReadString(), ReadByte());
+ }
+}
+
// CSQC_Parse_TempEntity : Handles all temporary entity network data in the CSQC layer.
// You must ALWAYS first acquire the temporary ID, which is sent as a byte.
// Return value should be 1 if CSQC handled the temporary entity, otherwise return 0 to have the engine process the event.
announce_snd = strzone(ReadString());
bHandled = true;
break;
+ case TE_CSQC_NOTIFY:
+ Net_Notify();
+ bHandled = true;
+ break;
default:
// No special logic for this temporary entity; return 0 so the engine can handle it
bHandled = false;
string keys;
float n, j, k, l;
- if (!sbar_showbinds)
+ if (!hud_showbinds)
return text;
keys = db_get(binddb, command);
keys = strcat(keys, ", ", keynumtostring(k));
++l;
- if (sbar_showbinds_limit > 0 && sbar_showbinds_limit >= l) break;
+ if (hud_showbinds_limit > 0 && hud_showbinds_limit >= l) break;
}
}
}
if ("" == keys) {
- if (sbar_showbinds > 1)
+ if (hud_showbinds > 1)
return strcat(text, " (not bound)");
else
return text;
}
- else if (sbar_showbinds > 1)
+ else if (hud_showbinds > 1)
return strcat(text, " (", keys, ")");
else
return keys;
projects / xonotic / xonotic-data.pk3dir.git / blobdiff