Don't do intermission in RPG, since no one wins or looses there

diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc
index b497665a19f964f8faf6cbb2240667e16e7825af..04e29f75222dc61747095245d5f40405063f0c8b 100644 (file)
--- a/data/qcsrc/client/View.qc
+++ b/data/qcsrc/client/View.qc
@@ -492,7 +492,7 @@ void CSQC_UpdateView(float w, float h)
 \r
        // Draw Artwork\r
        if(intermission && !isdemo()) // the match has ended\r
 \r
        // Draw Artwork\r
        if(intermission && !isdemo()) // the match has ended\r

-       if(!spectatee_status)\r
+       if(!spectatee_status && gametype != GAME_RPG) // no one wins or loses in RPG\r

        {\r
                if(artwork_image == "")\r
                {\r
        {\r
                if(artwork_image == "")\r
                {\r

diff --git a/data/qcsrc/server/g_world.qc b/data/qcsrc/server/g_world.qc
index 8e37d917db355147720311bdabba2ef205e56c55..ac9acf73d2defbc4d01121ef08eb4572a3c6016a 100644 (file)
--- a/data/qcsrc/server/g_world.qc
+++ b/data/qcsrc/server/g_world.qc
@@ -1351,7 +1351,7 @@ void FixIntermissionClient(entity e)
                                e.weaponentity.weaponentity.effects = EF_NODRAW;\r
                }\r
                if(clienttype(e) == CLIENTTYPE_REAL)\r
                                e.weaponentity.weaponentity.effects = EF_NODRAW;\r
                }\r
                if(clienttype(e) == CLIENTTYPE_REAL)\r

-               if(!e.spectatee_status)\r
+               if(!e.spectatee_status && !cvar("g_rpg")) // no one wins or loses in RPG\r

                {\r
                        stuffcmd(e, "\nscr_printspeed 1000000\n");\r
                        if(e.winning)\r
                {\r
                        stuffcmd(e, "\nscr_printspeed 1000000\n");\r
                        if(e.winning)\r