Modernize client code (#6250)

[oweals/minetest.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 2ad4e2780624cccb9e2978baeaffda7031e50d00..b9530c55ec586940823a962bc3270666212b37a1 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -107,24 +107,6 @@ static bool migrate_map_database(const GameParams &game_params, const Settings &
 
 /**********************************************************************/
 
-/*
-       gettime.h implementation
-*/
-
-#ifdef SERVER
-
-u32 getTimeMs()
-{
-       /* Use imprecise system calls directly (from porting.h) */
-       return porting::getTime(PRECISION_MILLI);
-}
-
-u32 getTime(TimePrecision prec)
-{
-       return porting::getTime(prec);
-}
-
-#endif
 
 FileLogOutput file_log_output;
 
@@ -337,7 +319,7 @@ static void print_allowed_options(const OptionList &allowed_options)
 
                std::cout << padStringRight(os1.str(), 30);
 
-               if (i->second.help != NULL)
+               if (i->second.help)
                        std::cout << i->second.help;
 
                std::cout << std::endl;