Visual Studio 2013 Compatibility

This commit is contained in:
dalkon
2013-11-12 13:47:53 +01:00
committed by Eduardo Bart
parent d3e97d33c7
commit c9597d6682
11 changed files with 67 additions and 18 deletions

View File

@@ -351,8 +351,13 @@ void Map::setShowZone(tileflags_t zone, bool show)
void Map::setShowZones(bool show)
{
#ifdef _MSC_VER
static const uint32 defaultZoneFlags
= TILESTATE_HOUSE | TILESTATE_PROTECTIONZONE;
#else
static constexpr uint32 defaultZoneFlags
= TILESTATE_HOUSE | TILESTATE_PROTECTIONZONE;
#endif
if(!show)
m_zoneFlags = 0;
else if(m_zoneFlags == 0)

View File

@@ -1934,7 +1934,7 @@ CreaturePtr ProtocolGame::getCreature(const InputMessagePtr& msg, int type)
if(g_game.getFeature(Otc::GameThingMarks)) {
msg->getU8(); // creature type for summons
uint8 mark = msg->getU8(); // mark
mark = msg->getU8(); // mark
msg->getU16(); // helpers
if(creature) {