Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7770


Ignore:
Timestamp:
Dec 15, 2010, 9:57:17 PM (13 years ago)
Author:
dafrick
Message:

Changing masterserver port to 55557. Some minor adjustments: Fixed typo, adjusted some #define variables to naming convention.

Location:
code/branches/presentation/src
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • code/branches/presentation/src/libraries/network/MasterServer.h

    r7739 r7770  
    2727 */
    2828
    29 #ifndef _MasterServer_
    30 #define _MasterServer_
     29#ifndef _MasterServer_H__
     30#define _MasterServer_H__
    3131
    3232/* orxonox includes */
     
    8080}
    8181
    82 #endif /* _MasterServer_ */
     82#endif /* _MasterServer_H__ */
  • code/branches/presentation/src/libraries/network/MasterServerComm.h

    r7769 r7770  
    2727 */
    2828
    29 #ifndef MASTERSERVERCOMM_H
    30 #define MASTERSERVERCOMM_H
     29#ifndef _MasterServerComm_H__
     30#define _MasterServerComm_H__
    3131
    3232#include <cstdlib>
     
    106106}
    107107
    108 #endif /* MASTERSERVERCOMM_H */
     108#endif /* _MasterServerComm_H__ */
  • code/branches/presentation/src/libraries/network/MasterServerProtocol.h

    r7763 r7770  
    2727 */
    2828
    29 #ifndef MASTER_SERVER_PROTO
    30 #define MASTER_SERVER_PROTO
     29#ifndef _MasterServerProtocol_H__
     30#define _MasterServerProtocol_H__
    3131
    3232/* master server address (to be moved elsewhere later) */
     
    8080
    8181/* default master server port */
    82 #define ORX_MSERVER_PORT 55566
     82#define ORX_MSERVER_PORT 55557
    8383
    8484
     
    9090
    9191
    92 #endif /* MASTER_SERVER_PROTO */
     92#endif /* _MasterServerProtocol_H__ */
  • code/branches/presentation/src/libraries/network/WANDiscovery.h

    r7763 r7770  
    2424 */
    2525
    26 #ifndef WANDISCOVERY_H
    27 #define WANDISCOVERY_H
     26#ifndef _WANDiscovery_H__
     27#define _WANDiscovery_H__
    2828
    2929#include "NetworkPrereqs.h"
     
    110110} // tolua_export
    111111
    112 #endif // WANDISCOVERY_H
     112#endif // _WANDiscovery_H__
  • code/branches/presentation/src/modules/pickup/PickupManager.cc

    r7549 r7770  
    6161    /*static*/ const std::string PickupManager::guiName_s = "PickupInventory";
    6262
    63     // Register static newtork functions that are used to communicate changes to pickups over the network, such that the PickupInventory can display the information about the pickups properly.
     63    // Register static network functions that are used to communicate changes to pickups over the network, such that the PickupInventory can display the information about the pickups properly.
    6464    registerStaticNetworkFunction(PickupManager::pickupChangedUsedNetwork);
    6565    registerStaticNetworkFunction(PickupManager::pickupChangedPickedUpNetwork);
Note: See TracChangeset for help on using the changeset viewer.