Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bring back the classic intermission screen to Odamex. #440

Merged
merged 4 commits into from Aug 5, 2021

Conversation

Ch0wW
Copy link
Contributor

@Ch0wW Ch0wW commented Jul 30, 2021

This was done originally with #80 but I rewrote it since it broke compilation with no apparent reason.

This commits reenables wi_newintermission's original functionality that was disabled long ago.

It also partially fixes coop movies that were desynced due to Odamex's intermission's timer method.

Also, it is disabled automatically whenever 5+ players are playing at the same time online.

COOP demo:
image

Online:
image

@rakohus
Copy link
Contributor

rakohus commented Jul 30, 2021

Is there an elegant way we can include the player names in this scenario?

Copy link
Contributor

@AlexMax AlexMax left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aside from my notes, I actually like the idea that @rakohus had. Would it be possible to just print the name in either smallfont or digfont above or below each player? I feel that would preserve some of the usefulness of the screen.

//else
WI_drawDeathmatchStats();
if (demoplayback)
WI_drawNetgameStats();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd prefer it if either both parts of an if statement have braces or neither.

@@ -180,7 +180,7 @@ CVAR_RANGE_FUNC_DECL(msgmidcolor, "5", "Color used for centered messages.",
// ------------

// Determines whether to draw the scores on intermission.
CVAR( wi_newintermission, "0", "Draw the scores on intermission",
CVAR( wi_newintermission, "0", "Use Odamex's intermission screen if there are 4 players or less on cooperative gamemodes.",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a convenient place to slot this into the menu system?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's already there for years... It just was left for many releases.
image

@Ch0wW
Copy link
Contributor Author

Ch0wW commented Jul 31, 2021

Current status online looks like this.

image

@AlexMax AlexMax merged commit fbf435d into odamex:stable Aug 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants