[Orxonox-commit 3076] r7770 - in code/branches/presentation/src: libraries/network modules/pickup

[dafrick at orxonox.net]

Author: dafrick
Date: 2010-12-15 21:57:17 +0100 (Wed, 15 Dec 2010)
New Revision: 7770

Modified:
   code/branches/presentation/src/libraries/network/MasterServer.h
   code/branches/presentation/src/libraries/network/MasterServerComm.h
   code/branches/presentation/src/libraries/network/MasterServerProtocol.h
   code/branches/presentation/src/libraries/network/WANDiscovery.h
   code/branches/presentation/src/modules/pickup/PickupManager.cc
Log:
Changing masterserver port to 55557. Some minor adjustments: Fixed typo, adjusted some #define variables to naming convention.


Modified: code/branches/presentation/src/libraries/network/MasterServer.h
===================================================================
--- code/branches/presentation/src/libraries/network/MasterServer.h	2010-12-15 18:12:32 UTC (rev 7769)
+++ code/branches/presentation/src/libraries/network/MasterServer.h	2010-12-15 20:57:17 UTC (rev 7770)
@@ -26,8 +26,8 @@
  *
  */
 
-#ifndef _MasterServer_
-#define _MasterServer_
+#ifndef _MasterServer_H__
+#define _MasterServer_H__
 
 /* orxonox includes */
 #include <enet/enet.h>
@@ -79,4 +79,4 @@
   };
 }
 
-#endif /* _MasterServer_ */
+#endif /* _MasterServer_H__ */

Modified: code/branches/presentation/src/libraries/network/MasterServerComm.h
===================================================================
--- code/branches/presentation/src/libraries/network/MasterServerComm.h	2010-12-15 18:12:32 UTC (rev 7769)
+++ code/branches/presentation/src/libraries/network/MasterServerComm.h	2010-12-15 20:57:17 UTC (rev 7770)
@@ -26,8 +26,8 @@
  *
  */
 
-#ifndef MASTERSERVERCOMM_H
-#define MASTERSERVERCOMM_H
+#ifndef _MasterServerComm_H__
+#define _MasterServerComm_H__
 
 #include <cstdlib>
 #include <cstdio>
@@ -105,4 +105,4 @@
 
 } 
 
-#endif /* MASTERSERVERCOMM_H */
+#endif /* _MasterServerComm_H__ */

Modified: code/branches/presentation/src/libraries/network/MasterServerProtocol.h
===================================================================
--- code/branches/presentation/src/libraries/network/MasterServerProtocol.h	2010-12-15 18:12:32 UTC (rev 7769)
+++ code/branches/presentation/src/libraries/network/MasterServerProtocol.h	2010-12-15 20:57:17 UTC (rev 7770)
@@ -26,8 +26,8 @@
  *
  */
 
-#ifndef MASTER_SERVER_PROTO
-#define MASTER_SERVER_PROTO
+#ifndef _MasterServerProtocol_H__
+#define _MasterServerProtocol_H__
 
 /* master server address (to be moved elsewhere later) */
 #define MS_ADDRESS "129.132.3.8"
@@ -79,7 +79,7 @@
 
 
 /* default master server port */
-#define ORX_MSERVER_PORT 55566
+#define ORX_MSERVER_PORT 55557
 
 
 /* some constants for the networking of the master server, not very important.
@@ -89,4 +89,4 @@
 #define ORX_MSERVER_MAXCHANS 2
 
 
-#endif /* MASTER_SERVER_PROTO */
+#endif /* _MasterServerProtocol_H__ */

Modified: code/branches/presentation/src/libraries/network/WANDiscovery.h
===================================================================
--- code/branches/presentation/src/libraries/network/WANDiscovery.h	2010-12-15 18:12:32 UTC (rev 7769)
+++ code/branches/presentation/src/libraries/network/WANDiscovery.h	2010-12-15 20:57:17 UTC (rev 7770)
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef WANDISCOVERY_H 
-#define WANDISCOVERY_H
+#ifndef _WANDiscovery_H__
+#define _WANDiscovery_H__
 
 #include "NetworkPrereqs.h"
 #include "packet/ServerInformation.h"
@@ -109,4 +109,4 @@
 
 } // tolua_export
 
-#endif // WANDISCOVERY_H
+#endif // _WANDiscovery_H__

Modified: code/branches/presentation/src/modules/pickup/PickupManager.cc
===================================================================
--- code/branches/presentation/src/modules/pickup/PickupManager.cc	2010-12-15 18:12:32 UTC (rev 7769)
+++ code/branches/presentation/src/modules/pickup/PickupManager.cc	2010-12-15 20:57:17 UTC (rev 7770)
@@ -60,7 +60,7 @@
     // Initialization of the name of the PickupInventory GUI.
     /*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);
     registerStaticNetworkFunction(PickupManager::dropPickupNetworked);