openbsd-ports/games/tbftss/patches/patch-src_battle_hud_c
bentley f5df14f58c Fix conflict with clock(3).
Maybe fixes build on macppc.
2018-03-07 03:49:47 +00:00

39 lines
1.4 KiB
Plaintext

$OpenBSD: patch-src_battle_hud_c,v 1.1 2018/03/07 03:49:47 bentley Exp $
Index: src/battle/hud.c
--- src/battle/hud.c.orig
+++ src/battle/hud.c
@@ -45,7 +45,7 @@ static SDL_Texture *shield;
static SDL_Texture *ecm;
static SDL_Texture *boost;
static SDL_Texture *nextGun;
-static SDL_Texture *clock;
+static SDL_Texture *hudclock;
static SDL_Texture *objectives;
static int numMessages;
static const char *gunName[BT_MAX];
@@ -98,7 +98,7 @@ void initHud(void)
ecm = getTexture("gfx/hud/ecm.png");
boost = getTexture("gfx/hud/boost.png");
nextGun = getTexture("gfx/hud/nextGun.png");
- clock = getTexture("gfx/hud/clock.png");
+ hudclock = getTexture("gfx/hud/clock.png");
objectives = getTexture("gfx/hud/objectives.png");
}
@@ -473,13 +473,13 @@ static void drawObjectives(void)
{
timeRemaining = game.currentMission->challengeData.timeLimit - battle.stats[STAT_TIME];
- blit(clock, (SCREEN_WIDTH / 2) - 50, 14, 0);
+ blit(hudclock, (SCREEN_WIDTH / 2) - 50, 14, 0);
drawText(SCREEN_WIDTH / 2, 10, 16, TA_CENTER, (timeRemaining < 11 * FPS) ? colors.red : colors.white, timeToString(timeRemaining, 0));
}
else
{
drawText(SCREEN_WIDTH / 2, 10, 16, TA_CENTER, colors.white, timeToString(battle.stats[STAT_TIME], 0));
- blit(clock, (SCREEN_WIDTH / 2) - 50, 14, 0);
+ blit(hudclock, (SCREEN_WIDTH / 2) - 50, 14, 0);
}
if (game.currentMission->challengeData.killLimit)