Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
SRB2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
STJr
SRB2
Commits
9506ec13
Commit
9506ec13
authored
6 months ago
by
Lactozilla
Browse files
Options
Downloads
Plain Diff
Merge branch 'fix-team-scoreboard-again' into 'next'
Fix team scoreboards: The sequel See merge request
STJr/SRB2!2598
parents
d92e2933
3e4df506
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!2598
Fix team scoreboards: The sequel
Pipeline
#6697
passed
6 months ago
Stage: build
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/y_inter.c
+8
-1
8 additions, 1 deletion
src/y_inter.c
with
8 additions
and
1 deletion
src/y_inter.c
+
8
−
1
View file @
9506ec13
...
...
@@ -1623,6 +1623,7 @@ static void Y_CalculateMatchWinners(void)
boolean
completed
[
MAXPLAYERS
];
// Initialize variables
memset
(
data
.
match
.
ctfteam
,
0
,
sizeof
(
data
.
match
.
ctfteam
));
memset
(
data
.
match
.
scores
,
0
,
sizeof
(
data
.
match
.
scores
));
memset
(
data
.
match
.
color
,
0
,
sizeof
(
data
.
match
.
color
));
memset
(
data
.
match
.
character
,
0
,
sizeof
(
data
.
match
.
character
));
...
...
@@ -1643,8 +1644,15 @@ static void Y_CalculateMatchWinners(void)
if
(
players
[
i
].
score
>=
data
.
match
.
scores
[
data
.
match
.
numplayers
]
&&
completed
[
i
]
==
false
)
{
data
.
match
.
ctfteam
[
data
.
match
.
numplayers
]
=
players
[
i
].
ctfteam
;
data
.
match
.
scores
[
data
.
match
.
numplayers
]
=
players
[
i
].
score
;
data
.
match
.
color
[
data
.
match
.
numplayers
]
=
&
players
[
i
].
skincolor
;
if
(
data
.
match
.
ctfteam
[
data
.
match
.
numplayers
]
==
1
)
// red team
data
.
match
.
color
[
data
.
match
.
numplayers
]
=
&
skincolor_redteam
;
if
(
data
.
match
.
ctfteam
[
data
.
match
.
numplayers
]
==
2
)
// blue team
data
.
match
.
color
[
data
.
match
.
numplayers
]
=
&
skincolor_blueteam
;
data
.
match
.
character
[
data
.
match
.
numplayers
]
=
&
players
[
i
].
skin
;
data
.
match
.
name
[
data
.
match
.
numplayers
]
=
player_names
[
i
];
data
.
match
.
spectator
[
data
.
match
.
numplayers
]
=
players
[
i
].
spectator
;
...
...
@@ -1688,7 +1696,6 @@ static void Y_CalculateTimeRaceWinners(void)
if
(
players
[
i
].
realtime
<=
data
.
match
.
scores
[
data
.
match
.
numplayers
]
&&
completed
[
i
]
==
false
)
{
data
.
match
.
ctfteam
[
data
.
match
.
numplayers
]
=
players
[
i
].
ctfteam
;
data
.
match
.
scores
[
data
.
match
.
numplayers
]
=
players
[
i
].
realtime
;
data
.
match
.
color
[
data
.
match
.
numplayers
]
=
&
players
[
i
].
skincolor
;
data
.
match
.
character
[
data
.
match
.
numplayers
]
=
&
players
[
i
].
skin
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment