mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git
synced 2026-05-31 19:54:58 +00:00
fix: unglob everything else and make it build
This commit is contained in:
@@ -43,7 +43,7 @@ void StatsCounter::award(Stat* stat, unsigned int difficulty, unsigned int count
|
||||
{
|
||||
StatContainer newVal;
|
||||
newVal.stats[difficulty] = count;
|
||||
stats.insert( make_pair(stat, newVal) );
|
||||
stats.insert( std::make_pair(stat, newVal) );
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -163,7 +163,7 @@ void StatsCounter::parse(void* data)
|
||||
newVal.stats[1] = statData[1];
|
||||
newVal.stats[2] = statData[2];
|
||||
newVal.stats[3] = statData[3];
|
||||
stats.insert( make_pair(*iter, newVal) );
|
||||
stats.insert( std::make_pair(*iter, newVal) );
|
||||
}
|
||||
statData += 4;
|
||||
}
|
||||
@@ -176,7 +176,7 @@ void StatsCounter::parse(void* data)
|
||||
newVal.stats[1] = largeStatData[1];
|
||||
newVal.stats[2] = largeStatData[2];
|
||||
newVal.stats[3] = largeStatData[3];
|
||||
stats.insert( make_pair(*iter, newVal) );
|
||||
stats.insert( std::make_pair(*iter, newVal) );
|
||||
}
|
||||
largeStatData += 4;
|
||||
statData = (unsigned short*)largeStatData;
|
||||
@@ -190,7 +190,7 @@ void StatsCounter::parse(void* data)
|
||||
newVal.stats[1] = 0;
|
||||
newVal.stats[2] = 0;
|
||||
newVal.stats[3] = 0;
|
||||
stats.insert( make_pair(*iter, newVal) );
|
||||
stats.insert( std::make_pair(*iter, newVal) );
|
||||
}
|
||||
++statData;
|
||||
}
|
||||
@@ -1239,34 +1239,34 @@ void StatsCounter::writeStats()
|
||||
void StatsCounter::setupStatBoards()
|
||||
{
|
||||
#ifndef _DURANGO
|
||||
statBoards.insert( make_pair(Stats::killsZombie, LEADERBOARD_KILLS_PEACEFUL) );
|
||||
statBoards.insert( make_pair(Stats::killsSkeleton, LEADERBOARD_KILLS_PEACEFUL) );
|
||||
statBoards.insert( make_pair(Stats::killsCreeper, LEADERBOARD_KILLS_PEACEFUL) );
|
||||
statBoards.insert( make_pair(Stats::killsSpider, LEADERBOARD_KILLS_PEACEFUL) );
|
||||
statBoards.insert( make_pair(Stats::killsSpiderJockey, LEADERBOARD_KILLS_PEACEFUL) );
|
||||
statBoards.insert( make_pair(Stats::killsZombiePigman, LEADERBOARD_KILLS_PEACEFUL) );
|
||||
statBoards.insert( make_pair(Stats::killsNetherZombiePigman, LEADERBOARD_KILLS_PEACEFUL) );
|
||||
statBoards.insert( make_pair(Stats::killsSlime, LEADERBOARD_KILLS_PEACEFUL) );
|
||||
statBoards.insert( std::make_pair(Stats::killsZombie, LEADERBOARD_KILLS_PEACEFUL) );
|
||||
statBoards.insert( std::make_pair(Stats::killsSkeleton, LEADERBOARD_KILLS_PEACEFUL) );
|
||||
statBoards.insert( std::make_pair(Stats::killsCreeper, LEADERBOARD_KILLS_PEACEFUL) );
|
||||
statBoards.insert( std::make_pair(Stats::killsSpider, LEADERBOARD_KILLS_PEACEFUL) );
|
||||
statBoards.insert( std::make_pair(Stats::killsSpiderJockey, LEADERBOARD_KILLS_PEACEFUL) );
|
||||
statBoards.insert( std::make_pair(Stats::killsZombiePigman, LEADERBOARD_KILLS_PEACEFUL) );
|
||||
statBoards.insert( std::make_pair(Stats::killsNetherZombiePigman, LEADERBOARD_KILLS_PEACEFUL) );
|
||||
statBoards.insert( std::make_pair(Stats::killsSlime, LEADERBOARD_KILLS_PEACEFUL) );
|
||||
|
||||
statBoards.insert( make_pair(Stats::blocksMined[Tile::dirt->id], LEADERBOARD_MININGBLOCKS_PEACEFUL) );
|
||||
statBoards.insert( make_pair(Stats::blocksMined[Tile::stoneBrick->id], LEADERBOARD_MININGBLOCKS_PEACEFUL) );
|
||||
statBoards.insert( make_pair(Stats::blocksMined[Tile::sand->id], LEADERBOARD_MININGBLOCKS_PEACEFUL) );
|
||||
statBoards.insert( make_pair(Stats::blocksMined[Tile::rock->id], LEADERBOARD_MININGBLOCKS_PEACEFUL) );
|
||||
statBoards.insert( make_pair(Stats::blocksMined[Tile::gravel->id], LEADERBOARD_MININGBLOCKS_PEACEFUL) );
|
||||
statBoards.insert( make_pair(Stats::blocksMined[Tile::clay->id], LEADERBOARD_MININGBLOCKS_PEACEFUL) );
|
||||
statBoards.insert( make_pair(Stats::blocksMined[Tile::obsidian->id], LEADERBOARD_MININGBLOCKS_PEACEFUL) );
|
||||
statBoards.insert( std::make_pair(Stats::blocksMined[Tile::dirt->id], LEADERBOARD_MININGBLOCKS_PEACEFUL) );
|
||||
statBoards.insert( std::make_pair(Stats::blocksMined[Tile::stoneBrick->id], LEADERBOARD_MININGBLOCKS_PEACEFUL) );
|
||||
statBoards.insert( std::make_pair(Stats::blocksMined[Tile::sand->id], LEADERBOARD_MININGBLOCKS_PEACEFUL) );
|
||||
statBoards.insert( std::make_pair(Stats::blocksMined[Tile::rock->id], LEADERBOARD_MININGBLOCKS_PEACEFUL) );
|
||||
statBoards.insert( std::make_pair(Stats::blocksMined[Tile::gravel->id], LEADERBOARD_MININGBLOCKS_PEACEFUL) );
|
||||
statBoards.insert( std::make_pair(Stats::blocksMined[Tile::clay->id], LEADERBOARD_MININGBLOCKS_PEACEFUL) );
|
||||
statBoards.insert( std::make_pair(Stats::blocksMined[Tile::obsidian->id], LEADERBOARD_MININGBLOCKS_PEACEFUL) );
|
||||
|
||||
statBoards.insert( make_pair(Stats::itemsCollected[Item::egg->id], LEADERBOARD_FARMING_PEACEFUL) );
|
||||
statBoards.insert( make_pair(Stats::blocksMined[Tile::crops_Id], LEADERBOARD_FARMING_PEACEFUL) );
|
||||
statBoards.insert( make_pair(Stats::blocksMined[Tile::mushroom1_Id], LEADERBOARD_FARMING_PEACEFUL) );
|
||||
statBoards.insert( make_pair(Stats::blocksMined[Tile::reeds_Id], LEADERBOARD_FARMING_PEACEFUL) );
|
||||
statBoards.insert( make_pair(Stats::cowsMilked, LEADERBOARD_FARMING_PEACEFUL) );
|
||||
statBoards.insert( make_pair(Stats::itemsCollected[Tile::pumpkin->id], LEADERBOARD_FARMING_PEACEFUL) );
|
||||
statBoards.insert( std::make_pair(Stats::itemsCollected[Item::egg->id], LEADERBOARD_FARMING_PEACEFUL) );
|
||||
statBoards.insert( std::make_pair(Stats::blocksMined[Tile::crops_Id], LEADERBOARD_FARMING_PEACEFUL) );
|
||||
statBoards.insert( std::make_pair(Stats::blocksMined[Tile::mushroom1_Id], LEADERBOARD_FARMING_PEACEFUL) );
|
||||
statBoards.insert( std::make_pair(Stats::blocksMined[Tile::reeds_Id], LEADERBOARD_FARMING_PEACEFUL) );
|
||||
statBoards.insert( std::make_pair(Stats::cowsMilked, LEADERBOARD_FARMING_PEACEFUL) );
|
||||
statBoards.insert( std::make_pair(Stats::itemsCollected[Tile::pumpkin->id], LEADERBOARD_FARMING_PEACEFUL) );
|
||||
|
||||
statBoards.insert( make_pair(Stats::walkOneM, LEADERBOARD_TRAVELLING_PEACEFUL) );
|
||||
statBoards.insert( make_pair(Stats::fallOneM, LEADERBOARD_TRAVELLING_PEACEFUL) );
|
||||
statBoards.insert( make_pair(Stats::minecartOneM, LEADERBOARD_TRAVELLING_PEACEFUL) );
|
||||
statBoards.insert( make_pair(Stats::boatOneM, LEADERBOARD_TRAVELLING_PEACEFUL) );
|
||||
statBoards.insert( std::make_pair(Stats::walkOneM, LEADERBOARD_TRAVELLING_PEACEFUL) );
|
||||
statBoards.insert( std::make_pair(Stats::fallOneM, LEADERBOARD_TRAVELLING_PEACEFUL) );
|
||||
statBoards.insert( std::make_pair(Stats::minecartOneM, LEADERBOARD_TRAVELLING_PEACEFUL) );
|
||||
statBoards.insert( std::make_pair(Stats::boatOneM, LEADERBOARD_TRAVELLING_PEACEFUL) );
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user