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

Fixed mobs that don't naturally spawn.

Browse Source
This commit is contained in:
archshift 2014-04-25 20:49:55 -07:00
parent acff6148b6
commit 80b97fd9dd
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Mobs/Monster.cpp
View File

@ -761,9 +761,10 @@ cMonster::eFamily cMonster::FamilyFromType(eType a_Type)
case mtChicken: return mfPassive; case mtChicken: return mfPassive;
case mtCow: return mfPassive; case mtCow: return mfPassive;
case mtCreeper: return mfHostile; case mtCreeper: return mfHostile;
case mtEnderDragon: return mfNoSpawn;
case mtEnderman: return mfHostile; case mtEnderman: return mfHostile;
case mtGhast: return mfHostile; case mtGhast: return mfHostile;
case mtGiant: return mfHostile; case mtGiant: return mfNoSpawn;
case mtHorse: return mfPassive; case mtHorse: return mfPassive;
case mtIronGolem: return mfPassive; case mtIronGolem: return mfPassive;
case mtMagmaCube: return mfHostile; case mtMagmaCube: return mfHostile;
@ -774,11 +775,12 @@ cMonster::eFamily cMonster::FamilyFromType(eType a_Type)
case mtSilverfish: return mfHostile; case mtSilverfish: return mfHostile;
case mtSkeleton: return mfHostile; case mtSkeleton: return mfHostile;
case mtSlime: return mfHostile; case mtSlime: return mfHostile;
case mtSnowGolem: return mfNoSpawn;
case mtSpider: return mfHostile; case mtSpider: return mfHostile;
case mtSquid: return mfWater; case mtSquid: return mfWater;
case mtVillager: return mfPassive; case mtVillager: return mfPassive;
case mtWitch: return mfHostile; case mtWitch: return mfHostile;
case mtWither: return mfHostile; case mtWither: return mfNoSpawn;
case mtWolf: return mfHostile; case mtWolf: return mfHostile;
case mtZombie: return mfHostile; case mtZombie: return mfHostile;
case mtZombiePigman: return mfHostile; case mtZombiePigman: return mfHostile;
@ -801,6 +803,7 @@ int cMonster::GetSpawnDelay(cMonster::eFamily a_MobFamily)
case mfPassive: return 40; case mfPassive: return 40;
case mfAmbient: return 40; case mfAmbient: return 40;
case mfWater: return 400; case mfWater: return 400;
case mfNoSpawn: return -1;
case mfUnhandled: break; case mfUnhandled: break;
} }
ASSERT(!"Unhandled mob family"); ASSERT(!"Unhandled mob family");

1
src/Mobs/Monster.h
View File

@ -66,6 +66,7 @@ public:
mfAmbient = 2, // Bats mfAmbient = 2, // Bats
mfWater = 3, // Squid mfWater = 3, // Squid
mfNoSpawn,
mfUnhandled, // Nothing. Be sure this is the last and the others are in order mfUnhandled, // Nothing. Be sure this is the last and the others are in order
} ; } ;

10
src/OSSupport/File.cpp
View File

@ -67,11 +67,11 @@ bool cFile::Open(const AString & iFileName, eMode iMode)
case fmRead: Mode = "rb"; break; case fmRead: Mode = "rb"; break;
case fmWrite: Mode = "wb"; break; case fmWrite: Mode = "wb"; break;
case fmReadWrite: Mode = "rb+"; break; case fmReadWrite: Mode = "rb+"; break;
default: }
{ if (Mode == NULL)
ASSERT(!"Unhandled file mode"); {
return false; ASSERT(!"Unhandled file mode");
} return false;
} }
#ifdef _WIN32 #ifdef _WIN32