From 834c9c0c4efef1cb3860718e374cc7cc23b61985 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sat, 24 May 2008 12:04:59 +0000 Subject: Help --- src/core/application.cc | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'src/core/application.cc') diff --git a/src/core/application.cc b/src/core/application.cc index ac836df..09b3f61 100644 --- a/src/core/application.cc +++ b/src/core/application.cc @@ -16,6 +16,7 @@ #include "math/mathlib.h" #include "filesystem/filesystem.h" #include "core/application.h" +#include "core/core.h" #include "core/cvar.h" #include "core/entity.h" #include "core/func.h" @@ -26,14 +27,15 @@ namespace core { // --------------- engine functions ------------------------------ -void func_print(std::string const &args) -{ - con_print << args << "\n"; -} - void func_help(std::string const &args) { - con_print << "This is the help function\n"; + std::istringstream argstream(args); + std::string topic; + if (!(argstream >> topic)) + topic.assign("help"); + + topic.append(".txt"); + CommandBuffer::print_file("help/" + topic); } void func_quit(std::string const &args) @@ -140,6 +142,10 @@ void Application::init(int count, char **arguments) Cvar::sv_framerate = Cvar::get("sv_framerate", "25"); Cvar::sv_framerate->set_info("[int] server framerate in frames/sec"); + // server settings + Cvar::sv_name = Cvar::get("sv_name", "osirion server", Cvar::Archive); + Cvar::sv_name->set_info("[string] server name"); + // network settings Cvar::net_host = Cvar::get("net_host", "0.0.0.0", Cvar::Archive); Cvar::net_host->set_info("[ip] IP address the network server binds to"); @@ -150,10 +156,10 @@ void Application::init(int count, char **arguments) Cvar::net_maxclients = Cvar::get("net_maxclients", "16", Cvar::Archive); Cvar::net_maxclients->set_info("[int] maximum number of network clients"); - Cvar::net_timeout = Cvar::get("net_timeout", "20", Cvar::Archive); + Cvar::net_timeout = Cvar::get("net_timeout", "20"); Cvar::net_timeout->set_info("[int] network timeout in seconds"); - Cvar::net_framerate = Cvar::get("net_framerate", "25", Cvar::Archive); + Cvar::net_framerate = Cvar::get("net_framerate", "25"); Cvar::net_framerate->set_info("[int] network framerate in frames/sec"); #ifdef _WIN32 @@ -175,9 +181,6 @@ void Application::init(int count, char **arguments) // register our engine functions Func *func = 0; - func = Func::add("print", func_print); - func->set_info("[str] print a message on the console"); - func = Func::add("help", func_help); func->set_info("dummy help function"); -- cgit v1.2.3