this is a more "clean" conversion to 64 bit than the type-fixups branch, which does borrow some elements from it but has far less find and replace...it is about 98-99% done, notes to follow later

engine/shared/library/sharedObject/src/shared/container/SlottedContainer.h

@@ -69,7 +69,7 @@ private:
 
 private:
 
-	/** shortened find on the map.  Returns -1 if not found.
+	/** int16_tened find on the map.  Returns -1 if not found.
 	*/
 	int  find(const SlotId &slot) const;
 

engine/shared/library/sharedObject/src/shared/customization/RangedIntCustomizationVariable.cpp

@@ -117,7 +117,7 @@ bool RangedIntCustomizationVariable::restoreFromByteVector(ByteVector const &dat
 			// Check range.
 			if (startIndex + 1 >= static_cast<int>(data.size()))
 			{
-				WARNING(true, ("restoreFromByteVector(): attempting to restore short signed int but not enough data."));
+				WARNING(true, ("restoreFromByteVector(): attempting to restore int16_t signed int but not enough data."));
 				return false;
 			}
 			

engine/shared/library/sharedObject/src/shared/object/AlterScheduler.cpp

@@ -313,7 +313,7 @@ void AlterSchedulerNamespace::validateObject(Object const *object)
 		}
 		catch (...)
 		{ //lint !e1775 // catch block does not declare any exception // that's right: I want to catch it all.
-			WARNING(true, ("validateObject(): Object-derived class with address [%x] failed to return valid C++ type info; likely a deleted Object.", reinterpret_cast<unsigned int const>(object)));
+			WARNING(true, ("validateObject(): Object-derived class with address [%x] failed to return valid C++ type info; likely a deleted Object.", reinterpret_cast<uintptr_t>(object)));
 			isInvalid = true;
 		}
 	}

engine/shared/library/sharedObject/src/shared/portal/PortalPropertyTemplate.cpp

@@ -1033,7 +1033,7 @@ PortalPropertyTemplate::PortalPropertyTemplate(const CrcString &name)
 :
 	m_referenceCount(0),
 	m_name(name),
-	m_shortName(),
+	m_int16_tName(),
 	m_portalGeometryList(new PortalGeometryList),
 	m_portalOwnersList(new PortalOwnersList),
 	m_cellList(new CellList),
@@ -1042,9 +1042,9 @@ PortalPropertyTemplate::PortalPropertyTemplate(const CrcString &name)
 	m_pathGraph(nullptr),
 	m_radarPortalGeometry(0)
 {
-	FileName shortName(name.getString());
-	shortName.stripPathAndExt();
-	m_shortName.set(shortName, true);
+	FileName int16_tName(name.getString());
+	int16_tName.stripPathAndExt();
+	m_int16_tName.set(int16_tName, true);
 
 	Iff iff(m_name.getString());
 	load(iff);
@@ -1761,7 +1761,7 @@ void PortalPropertyTemplate::buildRadarPortalGeometry()
 
 const CrcString &PortalPropertyTemplate::getShortName() const
 {
-	return m_shortName;
+	return m_int16_tName;
 }
 
 // ----------------------------------------------------------------------

engine/shared/library/sharedObject/src/shared/portal/PortalPropertyTemplate.h

@@ -258,7 +258,7 @@ private:
 
 	mutable int             m_referenceCount;
 	PersistentCrcString     m_name;
-	PersistentCrcString     m_shortName;
+	PersistentCrcString     m_int16_tName;
 	PortalGeometryList     *m_portalGeometryList;
 	PortalOwnersList       *m_portalOwnersList;
 	CellList               *m_cellList;

engine/shared/library/sharedObject/src/shared/world/World.cpp

@@ -467,7 +467,7 @@ Object* World::findClosestObjectTo (const Object* object, int listIndex)
 	NOT_NULL (object);
 
 	Object* closestObject    = 0;
-	float   shortestDistance = REAL_MAX;
+	float   int16_testDistance = REAL_MAX;
 
 	int i;
 	for (i = 0; i < ms_objectList [listIndex]->getNumberOfObjects (); i++)
@@ -479,9 +479,9 @@ Object* World::findClosestObjectTo (const Object* object, int listIndex)
 			const Vector  position2 = objectToCheck->getAppearance () ? objectToCheck->getAppearanceSphereCenter_w () : objectToCheck->getPosition_w ();
 			const float   magnitudeBetweenSquared = position1.magnitudeBetweenSquared (position2);
 
-			if (magnitudeBetweenSquared < shortestDistance)
+			if (magnitudeBetweenSquared < int16_testDistance)
 			{
-				shortestDistance = magnitudeBetweenSquared;
+				int16_testDistance = magnitudeBetweenSquared;
 				closestObject    = objectToCheck;
 			}
 		}