Changeset 5822 in orxonox.OLD for trunk/src/orxonox.cc

Timestamp:

Nov 29, 2005, 2:22:37 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/network to the trunk
merged with command:
svn merge -r 5505:HEAD branches/network trunk

conflicts resolved in favor of the trunk (as always
also fixed a typo in the #include "SDL_tread.h"

File:

• trunk/src/orxonox.cc (modified) (1 diff)

trunk/src/orxonox.cc

@@ -379 +379 @@
     {
       if(! strcmp( "--help", argv[i]) || !strcmp("-h", argv[i])) return startHelp(argc, argv);
-      else if(!strcmp( "--benchmark", argv[i]) || !strcmp("-b", argv[i])) return startBenchmarks();
+//      else if(!strcmp( "--benchmark", argv[i]) || !strcmp("-b", argv[i])) return startBenchmarks();
       else if(!strcmp( "--gui", argv[i]) || !strcmp("-g", argv[i])) showGui = true;
       //      else PRINTF(2)("Orxonox does not understand the arguments %s\n", argv[i]);