Changeset 7770 for code

Timestamp:

Dec 15, 2010, 9:57:17 PM (14 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:

• libraries/network/MasterServer.h (modified) (2 diffs)
• libraries/network/MasterServerComm.h (modified) (2 diffs)
• libraries/network/MasterServerProtocol.h (modified) (3 diffs)
• libraries/network/WANDiscovery.h (modified) (2 diffs)
• modules/pickup/PickupManager.cc (modified) (1 diff)

code/branches/presentation/src/libraries/network/MasterServer.h

@@ -27 +27 @@
  */
 
-#ifndef _MasterServer_
-#define _MasterServer_
+#ifndef _MasterServer_H__
+#define _MasterServer_H__
 
 /* orxonox includes */
@@ -80 +80 @@
 }
 
-#endif /* _MasterServer_ */
+#endif /* _MasterServer_H__ */

code/branches/presentation/src/libraries/network/MasterServerComm.h

@@ -27 +27 @@
  */
 
-#ifndef MASTERSERVERCOMM_H
-#define MASTERSERVERCOMM_H
+#ifndef _MasterServerComm_H__
+#define _MasterServerComm_H__
 
 #include <cstdlib>
@@ -106 +106 @@
 } 
 
-#endif /* MASTERSERVERCOMM_H */
+#endif /* _MasterServerComm_H__ */

code/branches/presentation/src/libraries/network/MasterServerProtocol.h

@@ -27 +27 @@
  */
 
-#ifndef MASTER_SERVER_PROTO
-#define MASTER_SERVER_PROTO
+#ifndef _MasterServerProtocol_H__
+#define _MasterServerProtocol_H__
 
 /* master server address (to be moved elsewhere later) */
@@ -80 +80 @@
 
 /* default master server port */
-#define ORX_MSERVER_PORT 55566
+#define ORX_MSERVER_PORT 55557
 
 
@@ -90 +90 @@
 
 
-#endif /* MASTER_SERVER_PROTO */
+#endif /* _MasterServerProtocol_H__ */

code/branches/presentation/src/libraries/network/WANDiscovery.h

@@ -24 +24 @@
  */
 
-#ifndef WANDISCOVERY_H 
-#define WANDISCOVERY_H
+#ifndef _WANDiscovery_H__
+#define _WANDiscovery_H__
 
 #include "NetworkPrereqs.h"
@@ -110 +110 @@
 } // tolua_export
 
-#endif // WANDISCOVERY_H
+#endif // _WANDiscovery_H__

code/branches/presentation/src/modules/pickup/PickupManager.cc

@@ -61 +61 @@
     /*static*/ const std::string PickupManager::guiName_s = "PickupInventory";
 
-    // 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.
+    // 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.
     registerStaticNetworkFunction(PickupManager::pickupChangedUsedNetwork);
     registerStaticNetworkFunction(PickupManager::pickupChangedPickedUpNetwork);