else\r
get_mi_min_max_texcoords(0); // load new texcoords\r
}\r
+ precache_pic("gfx/hud/bg_radar.tga");\r
+ precache_pic("gfx/hud/fg_radar.tga");\r
+ precache_pic("gfx/hud/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
g_weaponswitchdelay = ReadByte() / 255.0;\r
\r
g_vore = ReadShort();\r
- g_healthsize = ReadShort();\r
+ g_healthsize_center = ReadShort();\r
g_healthsize_min = ReadShort();\r
g_healthsize_max = ReadShort();\r
\r
armor_max = ReadCoord();\r
teamheal_max = ReadCoord();\r
\r
+ g_power = ReadShort();\r
+ g_power_reboot = ReadShort();\r
+ g_power_reboot_spawn = ReadByte();\r
+\r
if(!postinit)\r
PostInit();\r
}\r
{\r
float e, ph, pn;\r
e = ReadByte();\r
- ph = ReadByte();\r
+ ph = ReadShort(); // not ReadByte because we show minus health too\r
pn = ReadByte();\r
if not(playerslots[e])\r
return;\r