Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5996 in orxonox.OLD for trunk/src/defs


Ignore:
Timestamp:
Dec 9, 2005, 12:31:01 PM (19 years ago)
Author:
patrick
Message:

orxonox/trunk: merged network branche into trunk with command svn merge -r 5824:HEAD

Location:
trunk/src/defs
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/defs/class_id.h

    r5915 r5996  
    224224  CL_NETWORK_PROTOCOL           =    0x00000b02,
    225225  CL_NETWORK_SOCKET             =    0x00000b03,
    226   CL_CONNECTION_MONITOR         =    0x00000b04,
     226  CL_SERVER_SOCKET              =    0X00000b04,
     227  CL_CONNECTION_MONITOR         =    0x00000b05,
    227228
    228229

  • trunk/src/defs/debug.h

    r5944 r5996  
    110110#endif
    111111#ifndef NO_SHELL
    112 #define PRINT_EXEC       ShellBuffer::addBufferLineStatic
     112#define PRINT_EXEC       printf //ShellBuffer::addBufferLineStatic
    113113#else /* NO_SHELL */
    114114#define PRINT_EXEC       printf

  • trunk/src/defs/globals.h

    r5978 r5996  
    9191
    9292#define  ORXONOX_LICENSE_SHORT \
    93 "orxonox - the future of 3D-vertical-scrollers\n" \
    94 "\n" \
    95 "Copyright (C) 2004 orx\n" \
    96 "\n" \
    97 "This program is free software; you can redistribute it and/or modify\n" \
    98 "it under the terms of the GNU General Public License as published by\n" \
    99 "the Free Software Foundation; either version 2, or (at your option)\n" \
    100 "any later version.\n"
     93    "Orxonox - The Future of 3D-Action-Game\n" \
     94    "\n" \
     95    "Copyright (C) 2004 orx\n" \
     96    "\n" \
     97    "This program is free software; you can redistribute it and/or modify\n" \
     98    "it under the terms of the GNU General Public License as published by\n" \
     99    "the Free Software Foundation; either version 2, or (at your option)\n" \
     100    "any later version.\n" \
     101    "\n" \
     102    "This program is distributed in the hope that it will be useful,\n" \
     103    "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"  \
     104    "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"   \
     105    "GNU General Public License for more details.\n" \
     106    "\n" \
     107    "You should have received a copy of the GNU General Public License\n" \
     108    "along with this program; if not, write to the Free Software Foundation,\n" \
     109    "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
    101110
    102111
Note: See TracChangeset for help on using the changeset viewer.