flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Tiger Wang
2013-08-16 11:25:53 +01:00
parent 7f87d6c3d6 0cb00996de
commit cbde4f546a
110 changed files with 32148 additions and 36389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
source/BlockID.cpp
View File

@@ -7,6 +7,7 @@
#include "BlockID.h"
#include "../iniFile/iniFile.h"
#include "Item.h"
#include "Mobs/Monster.h"
@@ -287,10 +288,10 @@ EMCSBiome StringToBiome(const AString & a_BiomeString)
{biTaiga, "Taiga"},
{biSwampland, "Swampland"},
{biRiver, "River"},
{biHell, "Hell"},
{biHell, "Nether"},
{biSky, "Sky"},
{biSky, "End"},
{biNether, "Hell"},
{biNether, "Nether"},
{biEnd, "Sky"},
{biEnd, "End"},
{biFrozenOcean, "FrozenOcean"},
{biFrozenRiver, "FrozenRiver"},
{biIcePlains, "IcePlains"},
@@ -328,34 +329,34 @@ int StringToMobType(const AString & a_MobString)
const char * m_String;
} MobMap [] =
{
{E_ENTITY_TYPE_CREEPER, "Creeper"},
{E_ENTITY_TYPE_SKELETON, "Skeleton"},
{E_ENTITY_TYPE_SPIDER, "Spider"},
{E_ENTITY_TYPE_GIANT, "Giant"},
{E_ENTITY_TYPE_ZOMBIE, "Zombie"},
{E_ENTITY_TYPE_SLIME, "Slime"},
{E_ENTITY_TYPE_GHAST, "Ghast"},
{E_ENTITY_TYPE_ZOMBIE_PIGMAN, "ZombiePigman"},
{E_ENTITY_TYPE_ENDERMAN, "Enderman"},
{E_ENTITY_TYPE_CAVE_SPIDER, "CaveSpider"},
{E_ENTITY_TYPE_SILVERFISH, "SilverFish"},
{E_ENTITY_TYPE_BLAZE, "Blaze"},
{E_ENTITY_TYPE_MAGMA_CUBE, "MagmaCube"},
{E_ENTITY_TYPE_ENDER_DRAGON, "EnderDragon"},
{E_ENTITY_TYPE_WITHER, "Wither"},
{E_ENTITY_TYPE_BAT, "Bat"},
{E_ENTITY_TYPE_WITCH, "Witch"},
{E_ENTITY_TYPE_PIG, "Pig"},
{E_ENTITY_TYPE_SHEEP, "Sheep"},
{E_ENTITY_TYPE_COW, "Cow"},
{E_ENTITY_TYPE_CHICKEN, "Chicken"},
{E_ENTITY_TYPE_SQUID, "Squid"},
{E_ENTITY_TYPE_WOLF, "Wolf"},
{E_ENTITY_TYPE_MOOSHROOM, "Mushroom"},
{E_ENTITY_TYPE_SNOW_GOLEM, "SnowGolem"},
{E_ENTITY_TYPE_OCELOT, "Ocelot"},
{E_ENTITY_TYPE_IRON_GOLEM, "IronGolem"},
{E_ENTITY_TYPE_VILLAGER, "Villager"},
{cMonster::mtCreeper, "Creeper"},
{cMonster::mtSkeleton, "Skeleton"},
{cMonster::mtSpider, "Spider"},
{cMonster::mtGiant, "Giant"},
{cMonster::mtZombie, "Zombie"},
{cMonster::mtSlime, "Slime"},
{cMonster::mtGhast, "Ghast"},
{cMonster::mtZombiePigman, "ZombiePigman"},
{cMonster::mtEnderman, "Enderman"},
{cMonster::mtCaveSpider, "CaveSpider"},
{cMonster::mtSilverfish, "SilverFish"},
{cMonster::mtBlaze, "Blaze"},
{cMonster::mtMagmaCube, "MagmaCube"},
{cMonster::mtEnderDragon, "EnderDragon"},
{cMonster::mtWither, "Wither"},
{cMonster::mtBat, "Bat"},
{cMonster::mtWitch, "Witch"},
{cMonster::mtPig, "Pig"},
{cMonster::mtSheep, "Sheep"},
{cMonster::mtCow, "Cow"},
{cMonster::mtChicken, "Chicken"},
{cMonster::mtSquid, "Squid"},
{cMonster::mtWolf, "Wolf"},
{cMonster::mtMooshroom, "Mooshroom"},
{cMonster::mtSnowGolem, "SnowGolem"},
{cMonster::mtOcelot, "Ocelot"},
{cMonster::mtIronGolem, "IronGolem"},
{cMonster::mtVillager, "Villager"},
};
for (int i = 0; i < ARRAYCOUNT(MobMap); i++)
{
@@ -364,7 +365,7 @@ int StringToMobType(const AString & a_MobString)
return MobMap[i].m_MobType;
}
} // for i - MobMap[]
return (int)-1;
return -1;
}