Compare commits

..

No commits in common. "0.7.0" and "0.7.0-alpha" have entirely different histories.

2 changed files with 4 additions and 14 deletions

View file

@ -458,15 +458,6 @@ namespace MWGui
updateMagicMarkers();
updateCustomMarkers();
/*
Start of tes3mp addition
Update player markers when cell changes to fix their locations
*/
updatePlayerMarkers();
/*
End of tes3mp addition
*/
}
void LocalMapBase::requestMapRender(const MWWorld::CellStore *cell)

View file

@ -192,16 +192,15 @@ std::string Utils::getArchitectureType()
{
#if defined(__x86_64__) || defined(_M_X64)
return "64-bit";
#elif defined(__i386__) || defined(_M_I86) || defined(_M_IX86)
#elif defined(__i386__) || defined(_M_I86)
return "32-bit";
#elif defined(__ARM_ARCH)
std::string architectureType = "ARMv" + __ARM_ARCH;
return "ARMv" + __ARM_ARCH;
#ifdef __aarch64__
architectureType = architectureType + " 64-bit";
return "64-bit";
#else
architectureType = architectureType + " 32-bit";
return "32-bit";
#endif
return architectureType;
#else
return "Unknown architecture";
#endif