Couple of Fixes and Feature Updates

Second fix for Faction issue #1059 and #1083
Sphereserver · Oct 6, 2023 · 2e7a3b4 · 2e7a3b4
1 parent a9becbb
commit 2e7a3b4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/src/game/CBase.cpp b/src/game/CBase.cpp
@@ -56,7 +56,7 @@ void CBaseBaseDef::DelInstance()
 	--_dwInstances;
 }
 
-CFactionDef CBaseBaseDef::GetFaction()
+CCFaction CBaseBaseDef::GetFaction()
 {
 	return _pFaction;
 }
@@ -147,7 +147,7 @@ bool CBaseBaseDef::r_WriteVal( lpctstr ptcKey, CSString & sVal, CTextConsole * p
 
         case OBC_FACTION:
         case OBC_SLAYER:
-            sVal.FormatULLVal(_pFaction.GetFactionID());
+            sVal.FormatULLHex(_pFaction.GetFactionID());
             break;
 
 		case OBC_ARMOR:

diff --git a/src/game/CBase.h b/src/game/CBase.h
@@ -55,11 +55,11 @@ struct CBaseBaseDef : public CResourceLink, public CEntityProps
 	dword   m_Can;          // Base attribute flags. CAN_C_GHOST, etc
     RESDISPLAY_VERSION _iEraLimitProps;	// Don't allow to have properties newer than the given era.
 
-    CFactionDef _pFaction;
+    CCFaction _pFaction;
 
 
 public:
-    CFactionDef GetFaction();
+    CCFaction GetFaction();
 
     /**
      * @brief   Gets definition string.

diff --git a/src/game/chars/CChar.cpp b/src/game/chars/CChar.cpp
@@ -322,6 +322,7 @@ CChar::CChar( CREID_TYPE baseID ) :
     // SubscribeComponent Prop Components
 	TrySubscribeComponentProps<CCPropsChar>();
 	TrySubscribeComponentProps<CCPropsItemChar>();
+	SubscribeComponent(new CCFaction(pCharDef->GetFaction()));
 
 	ASSERT(IsDisconnected());
 }

diff --git a/src/game/items/CItem.cpp b/src/game/items/CItem.cpp
@@ -166,7 +166,7 @@ CItem::CItem( ITEMID_TYPE id, CItemBase * pItemDef ) :
     }
     if (CCFaction::CanSubscribe(this))
     {
-        SubscribeComponent(new CCFaction());  // Adding it only to equippable items
+        SubscribeComponent(new CCFaction(pItemDef->GetFaction()));  // Adding it only to equippable items
     }
 
 	TrySubscribeComponentProps<CCPropsItem>();