don't show porto preview beams when secondary exists

diff --git a/qcsrc/client/Defs.qc b/qcsrc/client/Defs.qc
index 2a1c9e67c7970f44d8418607809b5299306c6f31..9bd8e8c8a35807e0bd5cab007646136a3159edbb 100644 (file)
--- a/qcsrc/client/Defs.qc
+++ b/qcsrc/client/Defs.qc
@@ -275,3 +275,5 @@ float uid2name_dialog;
 .float csqcmodel_isdead; // used by shownames and miscfunctions (float getplayerisdead(float) {}) to know when a player is dead
 
 #define player_currententnum (spectatee_status > 0 ? spectatee_status : player_localnum + 1)
 .float csqcmodel_isdead; // used by shownames and miscfunctions (float getplayerisdead(float) {}) to know when a player is dead
 
 #define player_currententnum (spectatee_status > 0 ? spectatee_status : player_localnum + 1)

+
+float g_balance_porto_secondary;

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index 81c1369a0e61e45b660d73dd82130eeaf33388c7..d09f5ebb24edc94fdf9158c1b371d6fe71d1c0cf 100644 (file)
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -881,6 +881,7 @@ void Ent_Init()
        hagar_maxrockets = ReadByte();
 
        g_trueaim_minrange = ReadCoord();
        hagar_maxrockets = ReadByte();
 
        g_trueaim_minrange = ReadCoord();

+       g_balance_porto_secondary = ReadByte();

 
        if(!postinit)
                PostInit();
 
        if(!postinit)
                PostInit();

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index afccaf45dc6ab6f217fb0503381ed1ca2a17148b..82cff78234d316c953e7f7d947e5de8508034c79 100644 (file)
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -12,6 +12,8 @@ void Porto_Draw()
 
        if(activeweapon != WEP_PORTO || spectatee_status || gametype == MAPINFO_TYPE_NEXBALL)
                return;
 
        if(activeweapon != WEP_PORTO || spectatee_status || gametype == MAPINFO_TYPE_NEXBALL)
                return;

+       if(g_balance_porto_secondary)
+               return;

        if(intermission == 1)
                return;
        if(intermission == 2)
        if(intermission == 1)
                return;
        if(intermission == 2)

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index f4666eb13428166b9f4cf6c4044b3bef43c5010f..627e7529a73b1f706cfd3864b4159ed84cfcc1b5 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -967,6 +967,7 @@ float ClientInit_SendEntity(entity to, float sf)
        WriteByte(MSG_ENTITY, autocvar_g_balance_minelayer_limit); // minelayer max mines
        WriteByte(MSG_ENTITY, autocvar_g_balance_hagar_secondary_load_max); // hagar max loadable rockets
        WriteCoord(MSG_ENTITY, autocvar_g_trueaim_minrange);
        WriteByte(MSG_ENTITY, autocvar_g_balance_minelayer_limit); // minelayer max mines
        WriteByte(MSG_ENTITY, autocvar_g_balance_hagar_secondary_load_max); // hagar max loadable rockets
        WriteCoord(MSG_ENTITY, autocvar_g_trueaim_minrange);

+       WriteByte(MSG_ENTITY, autocvar_g_balance_porto_secondary);

        return TRUE;
 }
 
        return TRUE;
 }