mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git
synced 2026-09-25 01:51:20 +00:00
refactor: begin unglobbing std::vector
This commit is contained in:
@@ -25,7 +25,7 @@ IXACT3SoundBank *SoundEngine::m_pSoundBank2 = NULL;
|
||||
CRITICAL_SECTION SoundEngine::m_CS;
|
||||
|
||||
X3DAUDIO_HANDLE SoundEngine::m_xact3dInstance;
|
||||
vector<SoundEngine::soundInfo *> SoundEngine::currentSounds;
|
||||
std::vector<SoundEngine::soundInfo *> SoundEngine::currentSounds;
|
||||
X3DAUDIO_DSP_SETTINGS SoundEngine::m_DSPSettings;
|
||||
X3DAUDIO_EMITTER SoundEngine::m_emitter;
|
||||
X3DAUDIO_LISTENER SoundEngine::m_listeners[4];
|
||||
|
||||
@@ -54,7 +54,7 @@ class SoundEngine : public ConsoleSoundEngine
|
||||
};
|
||||
|
||||
void update3DPosition( soundInfo *pInfo, bool bPlaceEmitterAtListener = false, bool bIsCDMusic = false);
|
||||
static vector<soundInfo *>currentSounds;
|
||||
static std::vector<soundInfo *>currentSounds;
|
||||
|
||||
int noMusicDelay;
|
||||
Random *random;
|
||||
|
||||
@@ -1474,9 +1474,9 @@ void CPlatformNetworkManagerXbox::SetSearchResultsReady(int resultCount )
|
||||
m_searchResultsCount[m_lastSearchPad] = resultCount;
|
||||
}
|
||||
|
||||
vector<FriendSessionInfo *> *CPlatformNetworkManagerXbox::GetSessionList(int iPad, int localPlayers, bool partyOnly)
|
||||
std::vector<FriendSessionInfo *> *CPlatformNetworkManagerXbox::GetSessionList(int iPad, int localPlayers, bool partyOnly)
|
||||
{
|
||||
vector<FriendSessionInfo *> *filteredList = new vector<FriendSessionInfo *>();;
|
||||
std::vector<FriendSessionInfo *> *filteredList = new std::vector<FriendSessionInfo *>();;
|
||||
|
||||
const XSESSION_SEARCHRESULT *pSearchResult;
|
||||
const XNQOSINFO * pxnqi;
|
||||
|
||||
@@ -73,7 +73,7 @@ private:
|
||||
|
||||
HANDLE m_notificationListener;
|
||||
|
||||
vector<IQNetPlayer *> m_machineQNetPrimaryPlayers; // collection of players that we deem to be the main one for that system
|
||||
std::vector<IQNetPlayer *> m_machineQNetPrimaryPlayers; // collection of players that we deem to be the main one for that system
|
||||
|
||||
bool m_bLeavingGame;
|
||||
bool m_bLeaveGameOnTick;
|
||||
@@ -108,7 +108,7 @@ private:
|
||||
PlayerFlags(INetworkPlayer *pNetworkPlayer, unsigned int count);
|
||||
~PlayerFlags();
|
||||
};
|
||||
vector<PlayerFlags *> m_playerFlags;
|
||||
std::vector<PlayerFlags *> m_playerFlags;
|
||||
void SystemFlagAddPlayer(INetworkPlayer *pNetworkPlayer);
|
||||
void SystemFlagRemovePlayer(INetworkPlayer *pNetworkPlayer);
|
||||
void SystemFlagReset();
|
||||
@@ -125,7 +125,7 @@ public:
|
||||
std::wstring GatherRTTStats();
|
||||
|
||||
private:
|
||||
vector<FriendSessionInfo *> friendsSessions[XUSER_MAX_COUNT];
|
||||
std::vector<FriendSessionInfo *> friendsSessions[XUSER_MAX_COUNT];
|
||||
int m_searchResultsCount[XUSER_MAX_COUNT];
|
||||
int m_lastSearchStartTime[XUSER_MAX_COUNT];
|
||||
|
||||
@@ -152,7 +152,7 @@ private:
|
||||
|
||||
void SetSearchResultsReady(int resultCount = 0);
|
||||
|
||||
vector<INetworkPlayer *>currentNetworkPlayers;
|
||||
std::vector<INetworkPlayer *>currentNetworkPlayers;
|
||||
INetworkPlayer *addNetworkPlayer(IQNetPlayer *pQNetPlayer);
|
||||
void removeNetworkPlayer(IQNetPlayer *pQNetPlayer);
|
||||
static INetworkPlayer *getNetworkPlayer(IQNetPlayer *pQNetPlayer);
|
||||
@@ -162,7 +162,7 @@ private:
|
||||
virtual void Notify(int ID, ULONG_PTR Param);
|
||||
|
||||
public:
|
||||
virtual vector<FriendSessionInfo *> *GetSessionList(int iPad, int localPlayers, bool partyOnly);
|
||||
virtual std::vector<FriendSessionInfo *> *GetSessionList(int iPad, int localPlayers, bool partyOnly);
|
||||
virtual bool GetGameSessionInfo(int iPad, SessionID sessionId,FriendSessionInfo *foundSession);
|
||||
virtual void SetSessionsUpdatedCallback( void (*SessionsUpdatedCallback)(LPVOID pParam), LPVOID pSearchParam );
|
||||
virtual void GetFullFriendSessionInfo( FriendSessionInfo *foundSession, void (* FriendSessionUpdatedFn)(bool success, void *pParam), void *pParam );
|
||||
|
||||
Reference in New Issue
Block a user