Fixing code stuffs

JellyBitz · Jul 18, 2021 · ed9e77d · ed9e77d
1 parent ccd931d
commit ed9e77d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/vSRO-GameServer/AppManager.cpp b/vSRO-GameServer/AppManager.cpp
@@ -847,7 +847,7 @@ DWORD WINAPI AppManager::DatabaseFetchThread()
 					CGObjPC* player = CGObjManager::GetObjPCByCharName16(cCharName);
 					if (player)
 					{
-						std::cout << " - CGObjPC ptr: " << player << std::endl;
+						std::cout << " - CGObjPC ptr: " << player << "\r\n Unique Id: " << player->GetUniqueId() << "\r\n";
 					}
 					else
 						actionResult = FETCH_ACTION_STATE::CHARNAME_NOT_FOUND;

diff --git a/vSRO-GameServer/Silkroad/Object/CGObj.cpp b/vSRO-GameServer/Silkroad/Object/CGObj.cpp
@@ -6,6 +6,10 @@ void CGObj::GetGameWorldId(uint32_t* OutGameWorldId)
 {
 	CallVirtual<void(__thiscall*)(CGObj*, uint32_t*)>(this, 5)(this, OutGameWorldId);
 }
+uint32_t CGObj::GetUniqueId()
+{
+	return m_UniqueId;
+}
 /* Public Methods */
 void CGObj::SetLifeState(bool Alive)
 {

diff --git a/vSRO-GameServer/Silkroad/Object/CGObj.h b/vSRO-GameServer/Silkroad/Object/CGObj.h
@@ -6,11 +6,13 @@ class CGObj
 {
 protected: /// Protected Members
 	uint32_t m_ptrVTable;
-	// Unique Identifier from this object
-	uint32_t m_UniqueID;
+	// Unique Identifier
+	uint32_t m_UniqueId;
 public: /// Public Properties
 	// Gets the game world id as reference
 	void GetGameWorldId(uint32_t* OutGameWorldId);
+	// Get unique identifier from this object
+	uint32_t GetUniqueId();
 public: // Public Methods 
 	// Set life state
 	void SetLifeState(bool Alive);

diff --git a/vSRO-GameServer/Silkroad/Object/CGObjPC.cpp b/vSRO-GameServer/Silkroad/Object/CGObjPC.cpp
@@ -3,10 +3,6 @@
 #include "../../Silkroad/Text/GString.h"
 
 /* Public Properties */
-uint32_t CGObjPC::GetUniqueID()
-{
-	return m_UniqueID;
-}
 uint32_t CGObjPC::GetCharID()
 {
 	return m_CInstancePC->CharID;
@@ -36,11 +32,11 @@ void CGObjPC::UpdateHwan(uint8_t Level)
 }
 void CGObjPC::UpdateExperience(int64_t ExpOffset)
 {
-	CallVirtual<void(__thiscall*)(CGObjPC*, uint32_t, int64_t, uint32_t, std::uintptr_t*)>(this, 92)(this, m_UniqueID, ExpOffset, 0, nullptr);
+	CallVirtual<void(__thiscall*)(CGObjPC*, uint32_t, int64_t, uint32_t, std::uintptr_t*)>(this, 92)(this, m_UniqueId, ExpOffset, 0, nullptr);
 }
 void CGObjPC::AddSPExperience(uint32_t SPExpOffset)
 {
-	CallVirtual<void(__thiscall*)(CGObjPC*, uint32_t, int64_t, uint32_t, std::uintptr_t*)>(this, 92)(this, m_UniqueID, 0, SPExpOffset, nullptr);
+	CallVirtual<void(__thiscall*)(CGObjPC*, uint32_t, int64_t, uint32_t, std::uintptr_t*)>(this, 92)(this, m_UniqueId, 0, SPExpOffset, nullptr);
 }
 void CGObjPC::UpdateSP(int32_t Offset)
 {

diff --git a/vSRO-GameServer/Silkroad/Object/CGObjPC.h b/vSRO-GameServer/Silkroad/Object/CGObjPC.h
@@ -12,7 +12,6 @@ class CGObjPC : public CGObjChar
 	char pad_0x38[76];
 	CPosition m_Position;
 public: /// Public Properties
-	uint32_t GetUniqueID();
 	// Gets the CharId from database
 	uint32_t GetCharID();
 	// Gets the current position