feat: TU19 (Dec 2014) Features & Content (#155)
* try to resolve merge conflict
* feat: TU19 (Dec 2014) Features & Content (#32)
* December 2014 files
* Working release build
* Fix compilation issues
* Add sound to Windows64Media
* Add DLC content and force Tutorial DLC
* Revert "Add DLC content and force Tutorial DLC"
This reverts commit 97a4399472.
* Disable broken light packing
* Disable breakpoint during DLC texture map load
Allows DLC loading but the DLC textures are still broken
* Fix post build not working
* ...
* fix vs2022 build
* fix cmake build
---------
Co-authored-by: Loki <lokirautio@gmail.com>
This commit is contained in:
@@ -7,6 +7,76 @@
|
||||
using namespace sce::Toolkit::NP;
|
||||
using namespace sce::Toolkit::NP::Utilities;
|
||||
|
||||
class CXuiStringTable;
|
||||
|
||||
// Note - there are now 3 types of PlayerUID
|
||||
// (1) A full online ID - either the primary login, or a sub-signin through to PSN. This has m_onlineID set up as a normal SceNpOnlineId, with dummy[0] set to 0
|
||||
// (2) An offline ID, where there is also a primary login on the system. This has m_onlineID set up to copy the primary SceNpOnlineId, except with dummy[0] set to the controller ID of this other player
|
||||
// (3) An offline ID, where there isn't a primary PSN login on the system. This has SceNpOnlineId fully zeroed.
|
||||
|
||||
class PlayerUID
|
||||
{
|
||||
char m_onlineID[SCE_NP_ONLINEID_MAX_LENGTH];
|
||||
char term;
|
||||
bool m_bSignedIntoPSN : 1;
|
||||
unsigned char m_quadrant : 2;
|
||||
uint8_t m_macAddress[SCE_NET_ETHER_ADDR_LEN];
|
||||
int m_userID; // user logged on to the XMB
|
||||
|
||||
public:
|
||||
|
||||
class Hash
|
||||
{
|
||||
public:
|
||||
std::size_t operator()(const PlayerUID& k) const;
|
||||
};
|
||||
|
||||
PlayerUID();
|
||||
PlayerUID(int userID, SceNpOnlineId& onlineID, bool bSignedInPSN, int quadrant);
|
||||
PlayerUID(std::wstring fromString);
|
||||
|
||||
bool operator==(const PlayerUID& rhs) const;
|
||||
bool operator!=(const PlayerUID& rhs);
|
||||
void setCurrentMacAddress();
|
||||
std::wstring macAddressStr() const;
|
||||
std::wstring userIDStr() const;
|
||||
std::wstring toString() const;
|
||||
void setOnlineID(SceNpOnlineId& id, bool bSignedIntoPSN);
|
||||
void setUserID(unsigned int id);
|
||||
|
||||
|
||||
const char* getOnlineID() const { return m_onlineID; }
|
||||
int getUserID() const { return m_userID; }
|
||||
int getQuadrant() const { return m_quadrant; }
|
||||
bool isPrimaryUser() const; // only true if we're on the local machine and signed into the first quadrant;
|
||||
bool isSignedIntoPSN() const { return m_bSignedIntoPSN; }
|
||||
void setForAdhoc();
|
||||
private:
|
||||
};
|
||||
|
||||
typedef PlayerUID *PPlayerUID;
|
||||
|
||||
class GameSessionUID
|
||||
{
|
||||
char m_onlineID[SCE_NP_ONLINEID_MAX_LENGTH];
|
||||
char term;
|
||||
bool m_bSignedIntoPSN : 1;
|
||||
unsigned char m_quadrant : 2;
|
||||
public:
|
||||
GameSessionUID();
|
||||
GameSessionUID(int nullVal);
|
||||
|
||||
bool operator==(const GameSessionUID& rhs) const;
|
||||
bool operator!=(const GameSessionUID& rhs);
|
||||
GameSessionUID& operator=(const PlayerUID& rhs);
|
||||
|
||||
const char* getOnlineID() const { return m_onlineID; }
|
||||
int getQuadrant() const { return m_quadrant; }
|
||||
bool isSignedIntoPSN() const { return m_bSignedIntoPSN; }
|
||||
void setForAdhoc();
|
||||
|
||||
};
|
||||
|
||||
enum eAwardType
|
||||
{
|
||||
eAwardType_Achievement = 0,
|
||||
@@ -101,7 +171,7 @@ public:
|
||||
int GetPrimaryPad();
|
||||
void SetPrimaryPad(int iPad);
|
||||
char* GetGamertag(int iPad);
|
||||
wstring GetDisplayName(int iPad);
|
||||
std::wstring GetDisplayName(int iPad);
|
||||
|
||||
bool IsFullVersion();
|
||||
void SetFullVersion(bool bFull);
|
||||
|
||||
Reference in New Issue
Block a user