Changeset 8623 in orxonox.OLD for trunk/src/lib/shell

Timestamp:

Jun 20, 2006, 1:39:01 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the network branche back here
merged with command:
svn merge -r8230:HEAD ​https://svn.orxonox.net/orxonox/branches/network .
conflicts resolved in favour of the network branche (conflicts were in network)

File:

• trunk/src/lib/shell/some_shell_commands.cc (modified) (1 diff)

trunk/src/lib/shell/some_shell_commands.cc

@@ -28 +28 @@
 using namespace OrxShell;
 
+#include "network_game_rules.h"
+  SHELL_COMMAND(say, NetworkGameRules, shellSay)->setAlias("say");
 
+#include "player_stats.h"
+  SHELL_COMMAND(nick, PlayerStats, shellNick)->setAlias("nick");
 
 #include "class_list.h"