Skip to content

Deathmatch gamemode #694

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.

Sign up for GitHub

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

Merged
nullsystem merged 1 commit into from
Oct 16, 2024
Merged

Deathmatch gamemode #694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions mp/src/game/client/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1576,6 +1576,8 @@ target_sources_grouped(
${CMAKE_SOURCE_DIR}/game/shared/neo/neo_version.cpp
${CMAKE_SOURCE_DIR}/game/shared/neo/neo_version_info.cpp
${CMAKE_SOURCE_DIR}/game/shared/neo/neo_version_info.h
${CMAKE_SOURCE_DIR}/game/shared/neo/neo_misc.cpp
${CMAKE_SOURCE_DIR}/game/shared/neo/neo_misc.h
)

target_sources_grouped(
Expand Down
29 changes: 22 additions & 7 deletions mp/src/game/client/neo/ui/neo_hud_friendly_marker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,17 +89,32 @@ void CNEOHud_FriendlyMarker::DrawNeoHudElement()
const auto *pTargetPlayer = (localPlayer->GetObserverMode() == OBS_MODE_IN_EYE) ?
dynamic_cast<C_NEO_Player *>(localPlayer->GetObserverTarget()) : nullptr;

if (m_IsSpectator)
if (NEORules()->IsTeamplay())
{
auto nsf = GetGlobalTeam(TEAM_NSF);
DrawPlayerForTeam(nsf, localPlayer, pTargetPlayer);

auto jinrai = GetGlobalTeam(TEAM_JINRAI);
DrawPlayerForTeam(jinrai, localPlayer, pTargetPlayer);
if (m_IsSpectator)
{
auto nsf = GetGlobalTeam(TEAM_NSF);
DrawPlayerForTeam(nsf, localPlayer, pTargetPlayer);

auto jinrai = GetGlobalTeam(TEAM_JINRAI);
DrawPlayerForTeam(jinrai, localPlayer, pTargetPlayer);
}
else
{
DrawPlayerForTeam(team, localPlayer, pTargetPlayer);
}
}
else
{
DrawPlayerForTeam(team, localPlayer, pTargetPlayer);
if (m_IsSpectator)
{
// TODO: They're not really Jinrai/NSF?
auto nsf = GetGlobalTeam(TEAM_NSF);
DrawPlayerForTeam(nsf, localPlayer, pTargetPlayer);

auto jinrai = GetGlobalTeam(TEAM_JINRAI);
DrawPlayerForTeam(jinrai, localPlayer, pTargetPlayer);
}
}
}

Expand Down
47 changes: 25 additions & 22 deletions mp/src/game/client/neo/ui/neo_hud_game_event.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,30 +140,33 @@ void CNEOHud_GameEvent::DrawNeoHudElement()
surface()->DrawSetTextPos(textPosX, text_y_offset);
surface()->DrawPrintText(messageWord, messageLength); // the address of the null character minus the address of the first character

if (Q_stristr(teamWon, "jinrai"))
if (NEORules()->IsTeamplay())
{
surface()->DrawSetTexture(jinraiWin);
if (Q_stristr(teamWon, "jinrai"))
{
surface()->DrawSetTexture(jinraiWin);
}
else if (Q_stristr(teamWon, "nsf"))
{
surface()->DrawSetTexture(nsfWin);
}
else
{
surface()->DrawSetTexture(tie);
}

const vgui::IntRect texRect{
.x0 = (m_iResX/2) - 256,
.y0 = image_y_offset,
.x1 = (m_iResX / 2) + 256,
.y1 = image_y_offset + 256,
};
surface()->DrawSetColor(Color(0, 0, 0, alpha));
surface()->DrawTexturedRect(texRect.x0 + 2, texRect.y0 + 2, texRect.x1 + 2, texRect.y1 + 2);

surface()->DrawSetColor(Color(255, 255, 255, alpha));
surface()->DrawTexturedRect(texRect.x0, texRect.y0, texRect.x1, texRect.y1);
}
else if (Q_stristr(teamWon, "nsf"))
{
surface()->DrawSetTexture(nsfWin);
}
else
{
surface()->DrawSetTexture(tie);
}

const vgui::IntRect texRect{
.x0 = (m_iResX/2) - 256,
.y0 = image_y_offset,
.x1 = (m_iResX / 2) + 256,
.y1 = image_y_offset + 256,
};
surface()->DrawSetColor(Color(0, 0, 0, alpha));
surface()->DrawTexturedRect(texRect.x0 + 2, texRect.y0 + 2, texRect.x1 + 2, texRect.y1 + 2);

surface()->DrawSetColor(Color(255, 255, 255, alpha));
surface()->DrawTexturedRect(texRect.x0, texRect.y0, texRect.x1, texRect.y1);
}

void CNEOHud_GameEvent::Paint()
Expand Down
2 changes: 1 addition & 1 deletion mp/src/game/client/neo/ui/neo_hud_ghost_cap_point.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ void CNEOHud_GhostCapPoint::UpdateStateForNeoHudElementDraw()

void CNEOHud_GhostCapPoint::DrawNeoHudElement()
{
if (!ShouldDraw() || NEORules()->IsRoundOver())
if (!ShouldDraw() || NEORules()->IsRoundOver() || !NEORules()->IsTeamplay())
{
return;
}
Expand Down
Loading