diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-04-27 23:30:18 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-04-27 23:30:18 +0200 |
| commit | 5bfc376d1cee0f941657a771b87a3ee030d31c56 (patch) | |
| tree | de739c3845aa3f5bb9cb4bb79236551d5f3fc8b5 /src/game-server/main-game.cpp | |
| parent | c53bc90dbaa876a86f762a3d864b1f920e2b8071 (diff) | |
| parent | d4f3105d9a879f27baad6e43b8b3cb6fe2f0ef50 (diff) | |
| download | manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.gz manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.bz2 manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.xz manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.zip | |
Merge branch 'master' into lpc2012
Diffstat (limited to 'src/game-server/main-game.cpp')
| -rw-r--r-- | src/game-server/main-game.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game-server/main-game.cpp b/src/game-server/main-game.cpp index 3a12cdb8..8866a39b 100644 --- a/src/game-server/main-game.cpp +++ b/src/game-server/main-game.cpp @@ -165,7 +165,7 @@ static void initializeServer() utils::processor::init(); // Seed the random number generator - std::srand( time(NULL) ); + std::srand( time(nullptr) ); } @@ -257,7 +257,7 @@ static void parseOptions(int argc, char *argv[], CommandLineOptions &options) while (optind < argc) { - int result = getopt_long(argc, argv, optString, longOptions, NULL); + int result = getopt_long(argc, argv, optString, longOptions, nullptr); if (result == -1) break; |