float view_set;\r
float camera_mode;\r
float chase_active_old;\r
+float artwork_fade;\r
string artwork_image;\r
+string intermission_song;\r
string NextFrameCommand;\r
void CSQC_UpdateView(float w, float h)\r
{\r
)\r
teamradar_view();\r
\r
- // Draw Artwork\r
- if(intermission && !isdemo()) // match has ended\r
+ // Draw artwork and play intermission music\r
+ if(intermission && !isdemo() && gametype != GAME_RPG && !spectatee_status) // the match has ended. Don't do this for RPG because no one wins or loses there\r
{\r
- if(artwork_image == "")\r
+ if(cvar("cl_artwork"))\r
{\r
- if(getstati(STAT_WINNING))\r
- artwork_image = strcat("gfx/artwork_won_", ftos(floor(1 + (random() * 2)))); // CCCCVVVVVAAAAAAAAARRRRRRRRRRRRRRR!!!!!!\r
+ if(artwork_image == "")\r
+ {\r
+ if(getstati(STAT_WINNING)) // we are the winner\r
+ {\r
+ if(cvar("cl_artwork_win"))\r
+ {\r
+ artwork_image = strcat("gfx/artwork_won_", ftos(floor(1 + (random() * cvar("cl_artwork_win")))));\r
+ artwork_image = strzone(artwork_image);\r
+ }\r
+ }\r
+ else // we have lost\r
+ {\r
+ if(cvar("cl_artwork_lose"))\r
+ {\r
+ artwork_image = strcat("gfx/artwork_lost_", ftos(floor(1 + (random() * cvar("cl_artwork_lose")))));\r
+ artwork_image = strzone(artwork_image);\r
+ }\r
+ }\r
+ }\r
+\r
+ if(cvar("cl_artwork_stretch"))\r
+ {\r
+ artwork_size_x = vid_conwidth;\r
+ artwork_size_y = vid_conheight;\r
+ artwork_pos_x = 0;\r
+ artwork_pos_y = 0;\r
+ }\r
else\r
- artwork_image = strcat("gfx/artwork_lost_", ftos(floor(1 + (random() * 2)))); // CCCCVVVVVAAAAAAAAARRRRRRRRRRRRRRR!!!!!!\r
- artwork_image = strzone(artwork_image);\r
- }\r
+ {\r
+ artwork_size_x = max(vid_conwidth, vid_conheight);\r
+ artwork_size_y = max(vid_conwidth, vid_conheight);\r
+ artwork_pos_x = (vid_conwidth - artwork_size_x) / 2;\r
+ artwork_pos_y = (vid_conheight - artwork_size_y) / 2;\r
+ }\r
\r
- if(cvar("cl_artwork_stretch"))\r
- {\r
- artwork_size_x = vid_conwidth;\r
- artwork_size_y = vid_conheight;\r
- artwork_pos_x = 0;\r
- artwork_pos_y = 0;\r
+ if(artwork_fade < cvar("cl_artwork_alpha") && cvar("cl_artwork_fade"))\r
+ artwork_fade += frametime * cvar("cl_artwork_fade");\r
+ else\r
+ artwork_fade = cvar("cl_artwork_alpha");\r
+\r
+ if(artwork_image != "")\r
+ drawpic(artwork_pos, artwork_image, artwork_size, '1 1 1', artwork_fade, DRAWFLAG_NORMAL);\r
}\r
- else\r
+\r
+ if(cvar("cl_intermission") && intermission_song == "") // don't start the song each frame\r
{\r
- artwork_size_x = max(vid_conwidth, vid_conheight);\r
- artwork_size_y = max(vid_conwidth, vid_conheight);\r
- artwork_pos_x = (vid_conwidth - artwork_size_x) / 2;\r
- artwork_pos_y = (vid_conheight - artwork_size_y) / 2;\r
+ if(getstati(STAT_WINNING))\r
+ intermission_song = cvar_string("cl_intermission_cdtrack_win");\r
+ else\r
+ intermission_song = cvar_string("cl_intermission_cdtrack_lose");\r
+ if(intermission_song != "")\r
+ {\r
+ localcmd(strcat("\ncd play ", intermission_song, "\n"));\r
+ intermission_song = strzone(intermission_song);\r
+ }\r
}\r
-\r
- drawpic(artwork_pos, artwork_image, artwork_size, '1 1 1', 1, DRAWFLAG_NORMAL);\r
}\r
else\r
{\r
+ artwork_fade = 0;\r
if(artwork_image != "")\r
{\r
strunzone(artwork_image);\r
artwork_image = "";\r
}\r
+\r
+ if(intermission_song != "")\r
+ {\r
+ strunzone(intermission_song);\r
+ intermission_song = "";\r
+ }\r
}\r
\r
// draw sbar\r