// CSQC_Init : Called every time the CSQC code is initialized (essentially at map load)\r
// Useful for precaching things\r
\r
-void() menu_sub_null =\r
-{\r
-};\r
+float(float, float, float) menu_sub_null_float = { };\r
+void () menu_sub_null_void = { };\r
\r
#ifdef USE_FTE\r
float __engine_check;\r
drawfont = FONT_USER+1;\r
menu_visible = FALSE;\r
menu_show = menu_show_error;\r
- menu_action = menu_sub_null;\r
+ menu_action = menu_sub_null_float;\r
\r
for(i = 0; i < 255; ++i)\r
if(getplayerkey(i, "viewentity") == "")\r
get_mi_min_max_texcoords(0); // load new texcoords\r
}\r
\r
+ precache_pic(strcat("gfx/hud/", cvar_string("hud_style"), "/bg_radar.tga"));\r
+ precache_pic(strcat("gfx/hud/", cvar_string("hud_style"), "/fg_radar.tga"));\r
+ precache_pic(strcat("gfx/hud/", cvar_string("hud_style"), "/fg_radar_team.tga"));\r
+\r
mi_center = (mi_min + mi_max) * 0.5;\r
mi_scale = mi_max - mi_min;\r
minimapname = strzone(minimapname);\r
\r
WarpZone_Init();\r
+\r
+ draw_currentSkin = strzone(strcat("gfx/menu/", cvar_string("menu_skin")));\r
}\r
\r
// CSQC_Shutdown : Called every time the CSQC code is shutdown (changing maps, quitting, etc)\r
cvar_clientsettemp(argv(1), argv(2));\r
}\r
else if(cmd == "radar") {\r
- ons_showmap = !ons_showmap;\r
+ showmap = !showmap;\r
}\r
else if(cmd == "sbar_columns_set") {\r
Cmd_Sbar_SetFields(argc);\r
self.healthvalue = ReadShort();\r
if(sf & 16)\r
self.armorvalue = ReadShort();\r
+ if(sf & 32)\r
+ self.eaten = ReadByte();\r
\r
entcs_receiver[self.sv_entnum] = self;\r
self.entremove = Ent_RemoveEntCS;\r
float isNew;\r
entity o;\r
\r
- // damnit -.- don't want to go change every single .sv_entnum in sbar.qc AGAIN\r
+ // damnit -.- don't want to go change every single .sv_entnum in hud.qc AGAIN\r
// (no I've never heard of M-x replace-string, sed, or anything like that)\r
isNew = !self.owner; // workaround for DP bug\r
n = ReadByte()-1;\r
case ENT_CLIENT_WARPZONE: WarpZone_Read(bIsNewEntity); break;\r
case ENT_CLIENT_WARPZONE_CAMERA: WarpZone_Camera_Read(bIsNewEntity); break;\r
case ENT_CLIENT_TRIGGER_MUSIC: Ent_ReadTriggerMusic(); break;\r
+ case ENT_CLIENT_PORTRAIT: Ent_ReadPortrait(); break;\r
default:\r
error(strcat("unknown entity type in CSQC_Ent_Update: ", ftos(self.enttype), "\n"));\r
break;\r
\r
self.enttype = 0;\r
self.classname = "";\r
- self.draw = menu_sub_null;\r
- self.entremove = menu_sub_null;\r
+ self.draw = menu_sub_null_void;\r
+ self.entremove = menu_sub_null_void;\r
// TODO possibly set more stuff to defaults\r
}\r
// CSQC_Ent_Remove : Called when the server requests a SSQC / CSQC entity to be removed. Essentially call remove(self) as well.\r
\r
g_power = ReadShort();\r
g_power_reboot = ReadShort();\r
+ g_power_reboot_spawn = ReadByte();\r
\r
if(!postinit)\r
PostInit();\r