Make the portrait slide in and out of the left edge

[voretournament/voretournament.git] / data / qcsrc / client / Main.qc

diff --git a/data/qcsrc/client/Main.qc b/data/qcsrc/client/Main.qc
index 6e731232c8ec3639d439858ac040af8e5e6acdcf..4a106a31007690603b2e9de09b776937967260dc 100644 (file)
--- a/data/qcsrc/client/Main.qc
+++ b/data/qcsrc/client/Main.qc
@@ -182,6 +182,8 @@ void CSQC_Init(void)
        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
@@ -686,8 +688,6 @@ void Ent_ReadEntCS()
                self.healthvalue = ReadShort();\r
        if(sf & 16)\r
                self.armorvalue = ReadShort();\r
-       if(sf & 32)\r
-               self.predator = ReadByte();\r
 \r
        entcs_receiver[self.sv_entnum] = self;\r
        self.entremove = Ent_RemoveEntCS;\r
@@ -716,7 +716,7 @@ void Ent_ReadPlayerScore()
        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
@@ -948,6 +948,7 @@ void(float bIsNewEntity) CSQC_Ent_Update =
                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
@@ -1056,14 +1057,17 @@ void Ent_Init()
        g_weaponswitchdelay = ReadByte() / 255.0;\r
 \r
        g_vore = ReadShort();\r
-       g_balance_vore_swallow_limit = 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
@@ -1253,7 +1257,7 @@ void Net_ReadOtherPLReport()
 {\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