format codebase

dWorldServer/ObjectIDManager.cpp

@@ -10,54 +10,53 @@
 #include "Game.h"
 
 // Static Variables
-ObjectIDManager * ObjectIDManager::m_Address = nullptr;
+ObjectIDManager* ObjectIDManager::m_Address = nullptr;
 static std::uniform_int_distribution<int> uni(10000000, INT32_MAX);
 
 //! Initializes the manager
 void ObjectIDManager::Initialize(void) {
-    //this->currentRequestID = 0;
-    this->currentObjectID = uint32_t(1152921508165007067); //Initial value for this server's objectIDs
+	//this->currentRequestID = 0;
+	this->currentObjectID = uint32_t(1152921508165007067); //Initial value for this server's objectIDs
 }
 
 //! Requests a persistent ID
 void ObjectIDManager::RequestPersistentID(std::function<void(uint32_t)> callback) {
-    PersistentIDRequest * request = new PersistentIDRequest();
-    request->requestID = ++this->currentRequestID;
-    request->callback = callback;
+	PersistentIDRequest* request = new PersistentIDRequest();
+	request->requestID = ++this->currentRequestID;
+	request->callback = callback;
 
-    this->requests.push_back(request);
+	this->requests.push_back(request);
 
-    MasterPackets::SendPersistentIDRequest(Game::server, request->requestID);
+	MasterPackets::SendPersistentIDRequest(Game::server, request->requestID);
 }
 
 //! Handles a persistent ID response
 void ObjectIDManager::HandleRequestPersistentIDResponse(uint64_t requestID, uint32_t persistentID) {
-    for (uint32_t i = 0; i < this->requests.size(); ++i) {
-        if (this->requests[i]->requestID == requestID) {
+	for (uint32_t i = 0; i < this->requests.size(); ++i) {
+		if (this->requests[i]->requestID == requestID) {
 
-            // Call the callback function
-            this->requests[i]->callback(persistentID);
+			// Call the callback function
+			this->requests[i]->callback(persistentID);
 
-            // Then delete the request
-            delete this->requests[i];
-            this->requests.erase(this->requests.begin() + i);
-            return;
-        }
-    }
+			// Then delete the request
+			delete this->requests[i];
+			this->requests.erase(this->requests.begin() + i);
+			return;
+		}
+	}
 }
 
 //! Handles cases where we have to get a unique object ID synchronously
-uint32_t ObjectIDManager::GenerateRandomObjectID()
-{
-    std::random_device rd;
-	
-    std::mt19937 rng(rd());
+uint32_t ObjectIDManager::GenerateRandomObjectID() {
+	std::random_device rd;
 
-    return  uni(rng);
+	std::mt19937 rng(rd());
+
+	return  uni(rng);
 }
 
 
 //! Generates an object ID server-sided (used for regular entities like smashables)
 uint32_t ObjectIDManager::GenerateObjectID(void) {
-    return ++this->currentObjectID;
+	return ++this->currentObjectID;
 }

dWorldServer/ObjectIDManager.h

@@ -10,66 +10,66 @@
   \brief A manager for handling object ID generation
  */
 
-//! The persistent ID request
+ //! The persistent ID request
 struct PersistentIDRequest {
-    uint64_t requestID;
+	uint64_t requestID;
 
-    std::function<void(uint32_t)> callback;
+	std::function<void(uint32_t)> callback;
 };
 
 //! The Object ID Manager
 class ObjectIDManager {
 private:
-    static ObjectIDManager * m_Address;         //!< The singleton instance
+	static ObjectIDManager* m_Address;         //!< The singleton instance
 
-    std::vector<PersistentIDRequest*> requests; //!< All outstanding persistent ID requests
-    uint64_t currentRequestID;                  //!< The current request ID
+	std::vector<PersistentIDRequest*> requests; //!< All outstanding persistent ID requests
+	uint64_t currentRequestID;                  //!< The current request ID
 
-    uint32_t currentObjectID;                   //!< The current object ID
+	uint32_t currentObjectID;                   //!< The current object ID
 
 public:
 
-    //! The singleton instance
-    static ObjectIDManager * Instance() {
-        if (m_Address == 0) {
-            m_Address = new ObjectIDManager;
-        }
+	//! The singleton instance
+	static ObjectIDManager* Instance() {
+		if (m_Address == 0) {
+			m_Address = new ObjectIDManager;
+		}
 
-        return m_Address;
-    }
+		return m_Address;
+	}
 
-    //! Initializes the manager
-    void Initialize(void);
+	//! Initializes the manager
+	void Initialize(void);
 
-    //! Requests a persistent ID
-    /*!
-      \param callback The callback function
-     */
-    void RequestPersistentID(std::function<void(uint32_t)> callback);
+	//! Requests a persistent ID
+	/*!
+	  \param callback The callback function
+	 */
+	void RequestPersistentID(std::function<void(uint32_t)> callback);
 
 
-    //! Handles a persistent ID response
-    /*!
-      \param requestID The request ID
-      \param persistentID The persistent ID
-     */
-    void HandleRequestPersistentIDResponse(uint64_t requestID, uint32_t persistentID);
+	//! Handles a persistent ID response
+	/*!
+	  \param requestID The request ID
+	  \param persistentID The persistent ID
+	 */
+	void HandleRequestPersistentIDResponse(uint64_t requestID, uint32_t persistentID);
 
-    //! Generates an object ID server-sided
-    /*!
-      \return A generated object ID
-     */
-    uint32_t GenerateObjectID(void);
+	//! Generates an object ID server-sided
+	/*!
+	  \return A generated object ID
+	 */
+	uint32_t GenerateObjectID(void);
 
 	//! Generates a random object ID server-sided
 	/*!
 	 \return A generated object ID
 	 */
-    static uint32_t GenerateRandomObjectID();
+	static uint32_t GenerateRandomObjectID();
 
-    //! Generates a persistent object ID server-sided
-    /*!
-      \return A generated object ID
-     */
-    uint32_t GeneratePersistentObjectID(void);
+	//! Generates a persistent object ID server-sided
+	/*!
+	  \return A generated object ID
+	 */
+	uint32_t GeneratePersistentObjectID(void);
 };

dWorldServer/PerformanceManager.cpp

@@ -97,4 +97,4 @@ uint32_t PerformanceManager::GetServerFramerate() {
 	}
 
 	return m_CurrentProfile.serverFramerate;
-}
+}