Skip to content

Commit ef830f9

Browse files
committed
Fix exception when calling OnClient() or OnServer() when game isn't started
1 parent 46df6ba commit ef830f9

File tree

1 file changed

+14
-3
lines changed

1 file changed

+14
-3
lines changed

src/xrGame/game_type.cpp

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,17 @@
22
#include "game_type.h"
33
#include "Level.h"
44

5-
bool OnServer() throw() { return Level().IsServer(); }
6-
bool OnClient() throw() { return Level().IsClient(); }
7-
bool IsGameTypeSingle() throw() { return (g_pGamePersistent->GameType() == eGameIDSingle); }
5+
bool OnServer() noexcept
6+
{
7+
return g_pGameLevel != nullptr ? Level().IsServer() : false;
8+
}
9+
10+
bool OnClient() noexcept
11+
{
12+
return g_pGameLevel != nullptr ? Level().IsClient() : false;
13+
}
14+
15+
bool IsGameTypeSingle() throw()
16+
{
17+
return g_pGamePersistent->GameType() == eGameIDSingle;
18+
}

0 commit comments

Comments
 (0)