Skip to content

Commit 15b6f32

Browse files
committed
build fixes
1 parent 86170e7 commit 15b6f32

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

src/engine/engine.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ extern const char *platnames[MAX_PLATFORMS], *platlongnames[MAX_PLATFORMS];
3030
#define plat_name(a) (sup_platform(a) ? platnames[a] : "unk")
3131
#define plat_longname(a) (sup_platform(a) ? platlongnames[a] : "unknown")
3232

33+
extern const char *timestr(int dur, int style = 0);
34+
3335
extern void setupmaster();
3436
extern void checkmaster();
3537
extern void cleanupmaster();
@@ -441,7 +443,6 @@ extern bool depthfxing;
441443
extern void drawdepthfxtex();
442444

443445
// server
444-
extern const char *timestr(int dur, int style = 0);
445446
extern vector<char *> gameargs;
446447
extern void initgame();
447448
extern void changeservertype();

src/game/server.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4619,7 +4619,7 @@ namespace server
46194619
int waituntil = maxshutdownwait*(gamestate == G_S_PLAYING ? 2000 : 1000);
46204620
if(totalmillis >= shutdownwait+waituntil)
46214621
{
4622-
srvoutf(4, "waited \fs\fc%s\fS to shutdown (max: \fs\fc%s\fS), overriding and exiting...", timestr(totalmillis-shutdownwait, 4), timestr(waituntil, 4));
4622+
srvoutf(4, "waited \fs\fc%s\fS to shutdown, overriding and exiting...", timestr(totalmillis-shutdownwait, 4));
46234623
exit(EXIT_SUCCESS);
46244624
return;
46254625
}

0 commit comments

Comments
 (0)