LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-05-30 10:17:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: begin unglobbing std::vector

Browse Source
This commit is contained in:
Tropical
2026-03-06 11:58:11 -06:00
committed by JuiceyDev
parent d2e8a0f9f5
commit 5fad08b9fd
286 changed files with 738 additions and 738 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Minecraft.World/Entities/SyncedEntityData.cpp
View File

@@ -196,7 +196,7 @@ bool SynchedEntityData::isDirty()
return m_isDirty;
}
void SynchedEntityData::pack(vector<std::shared_ptr<DataItem> > *items, DataOutputStream *output) // TODO throws IOException
void SynchedEntityData::pack(std::vector<std::shared_ptr<DataItem> > *items, DataOutputStream *output) // TODO throws IOException
{
if (items != NULL)
@@ -213,10 +213,10 @@ void SynchedEntityData::pack(vector<std::shared_ptr<DataItem> > *items, DataOutp
output->writeByte(EOF_MARKER);
}
vector<std::shared_ptr<SynchedEntityData::DataItem> > *SynchedEntityData::packDirty()
std::vector<std::shared_ptr<SynchedEntityData::DataItem> > *SynchedEntityData::packDirty()
{
vector<std::shared_ptr<DataItem> > *result = NULL;
std::vector<std::shared_ptr<DataItem> > *result = NULL;
if (m_isDirty)
{
@@ -230,7 +230,7 @@ vector<std::shared_ptr<SynchedEntityData::DataItem> > *SynchedEntityData::packDi
if (result == NULL)
{
result = new vector<std::shared_ptr<DataItem> >();
result = new std::vector<std::shared_ptr<DataItem> >();
}
result->push_back(dataItem);
}
@@ -254,16 +254,16 @@ void SynchedEntityData::packAll(DataOutputStream *output) // throws IOException
output->writeByte(EOF_MARKER);
}
vector<std::shared_ptr<SynchedEntityData::DataItem> > *SynchedEntityData::getAll()
std::vector<std::shared_ptr<SynchedEntityData::DataItem> > *SynchedEntityData::getAll()
{
vector<std::shared_ptr<DataItem> > *result = NULL;
std::vector<std::shared_ptr<DataItem> > *result = NULL;
AUTO_VAR(itEnd, itemsById.end());
for (AUTO_VAR(it, itemsById.begin()); it != itEnd; it++ )
{
if (result == NULL)
{
result = new vector<std::shared_ptr<DataItem> >();
result = new std::vector<std::shared_ptr<DataItem> >();
}
std::shared_ptr<DataItem> dataItem = (*it).second;
result->push_back(dataItem);
@@ -307,10 +307,10 @@ void SynchedEntityData::writeDataItem(DataOutputStream *output, std::shared_ptr<
}
}
vector<std::shared_ptr<SynchedEntityData::DataItem> > *SynchedEntityData::unpack(DataInputStream *input) //throws IOException
std::vector<std::shared_ptr<SynchedEntityData::DataItem> > *SynchedEntityData::unpack(DataInputStream *input) //throws IOException
{
vector<std::shared_ptr<DataItem> > *result = NULL;
std::vector<std::shared_ptr<DataItem> > *result = NULL;
int currentHeader = input->readByte();
@@ -319,7 +319,7 @@ vector<std::shared_ptr<SynchedEntityData::DataItem> > *SynchedEntityData::unpack
if (result == NULL)
{
result = new vector<std::shared_ptr<DataItem> >();
result = new std::vector<std::shared_ptr<DataItem> >();
}
// split type and id
@@ -375,7 +375,7 @@ vector<std::shared_ptr<SynchedEntityData::DataItem> > *SynchedEntityData::unpack
* @param items
*/
void SynchedEntityData::assignValues(vector<std::shared_ptr<DataItem> > *items)
void SynchedEntityData::assignValues(std::vector<std::shared_ptr<DataItem> > *items)
{
AUTO_VAR(itEnd, items->end());
for (AUTO_VAR(it, items->begin()); it != itEnd; it++)