Misc changes (#41)

* fixes

* changes

* progress

* Vertices -> Vtx

* done i think

1 files changed, 13 insertions, 10 deletions

diff --git a/ZAPD/ZSkeleton.cpp b/ZAPD/ZSkeleton.cpp
index f092d4d..7d41b51 100644
--- a/ZAPD/ZSkeleton.cpp
+++ b/ZAPD/ZSkeleton.cpp
@@ -158,19 +158,22 @@ std::string ZSkeleton::GetSourceOutputCode(std::string prefix)
 {
 	if (parent != nullptr)
 	{
+		string defaultPrefix = name.c_str();
+		defaultPrefix.replace(0, 1, "s"); // replace g prefix with s for local variables
+
 		for (int i = 0; i < limbs.size(); i++)
 		{
 			ZLimbStandard* limb = limbs[i];
 			
-			string defaultDLName = StringHelper::Sprintf("%sLimbDL0x%06X", name.c_str(), limb->dListPtr);
+			string defaultDLName = StringHelper::Sprintf("%sLimbDL_%06X", defaultPrefix.c_str(), limb->dListPtr);
 			string dListStr = limb->dListPtr == 0 ? "NULL" : StringHelper::Sprintf("%s", parent->GetDeclarationName(limb->dListPtr, defaultDLName).c_str());
 
 			if (limb->dListPtr != 0 && parent->GetDeclaration(limb->dListPtr) == nullptr)
 			{
 				ZDisplayList* dList = new ZDisplayList(rawData, limb->dListPtr, ZDisplayList::GetDListLength(rawData, limb->dListPtr));
 				dList->parent = parent;
-				dList->SetName(StringHelper::Sprintf("%sLimbDL0x%06X", name.c_str(), limb->dListPtr));
-				dList->GetSourceOutputCode("");
+				dList->SetName(StringHelper::Sprintf("%sLimbDL_%06X", defaultPrefix.c_str(), limb->dListPtr));
+				dList->GetSourceOutputCode(defaultPrefix);
 			}
 
 			string entryStr = "";
@@ -179,15 +182,15 @@ std::string ZSkeleton::GetSourceOutputCode(std::string prefix)
 			if (typeid(*limb) == typeid(ZLimbLOD))
 			{
 				ZLimbLOD* limbLOD = (ZLimbLOD*)limbs[i];
-				string defaultFarDLName = StringHelper::Sprintf("%sFarLimbDlist0x%06X", name.c_str(), limbLOD->farDListPtr);
+				string defaultFarDLName = StringHelper::Sprintf("%sFarLimbDlist0x%06X", defaultPrefix.c_str(), limbLOD->farDListPtr);
 				string dListStr2 = limbLOD->farDListPtr == 0 ? "NULL" : StringHelper::Sprintf("%s", parent->GetDeclarationName(limbLOD->farDListPtr, defaultFarDLName).c_str());
 
 				if (limbLOD->farDListPtr != 0 && parent->GetDeclaration(limbLOD->farDListPtr) == nullptr)
 				{
 					ZDisplayList* dList = new ZDisplayList(rawData, limbLOD->farDListPtr, ZDisplayList::GetDListLength(rawData, limbLOD->farDListPtr));
 					dList->parent = parent;
-					dList->SetName(StringHelper::Sprintf("%sFarLimbDlist0x%06X", name.c_str(), limbLOD->farDListPtr));
-					dList->GetSourceOutputCode("");
+					dList->SetName(StringHelper::Sprintf("%s_farLimbDlist_%06X", defaultPrefix.c_str(), limbLOD->farDListPtr));
+					dList->GetSourceOutputCode(defaultPrefix);
 				}
 
 				entryType = "LodLimb";
@@ -203,7 +206,7 @@ std::string ZSkeleton::GetSourceOutputCode(std::string prefix)
 					limb->transX, limb->transY, limb->transZ, limb->childIndex, limb->siblingIndex, dListStr.c_str());
 			}
 
-			string limbName = StringHelper::Sprintf("%sLimb%04X", name.c_str(), limb->address);
+			string limbName = StringHelper::Sprintf("%sLimb_%06X", defaultPrefix.c_str(), limb->address);
 
 			if (parent->HasDeclaration(limb->address))
 				limbName = parent->GetDeclarationName(limb->address);
@@ -234,18 +237,18 @@ std::string ZSkeleton::GetSourceOutputCode(std::string prefix)
 		if (!parent->HasDeclaration(ptr))
 		{
 			parent->AddDeclarationArray(ptr, DeclarationAlignment::None, 4 * limbs.size(),
-				"void*", StringHelper::Sprintf("%sLimbs", name.c_str()), limbs.size(), tblStr);
+				"static void*", StringHelper::Sprintf("%sLimbs", defaultPrefix.c_str()), limbs.size(), tblStr);
 		}
 
 		if (type == ZSkeletonType::Normal)
 		{
-			string headerStr = StringHelper::Sprintf("%sLimbs, %i", name.c_str(), limbs.size());
+			string headerStr = StringHelper::Sprintf("%sLimbs, %i", defaultPrefix.c_str(), limbs.size());
 			parent->AddDeclaration(rawDataIndex, DeclarationAlignment::Align16, 8,
 				"SkeletonHeader", StringHelper::Sprintf("%s", name.c_str()), headerStr);
 		}
 		else
 		{
-			string headerStr = StringHelper::Sprintf("%sLimbs, %i, %i", name.c_str(), limbs.size(), dListCount);
+			string headerStr = StringHelper::Sprintf("%sLimbs, %i, %i", defaultPrefix.c_str(), limbs.size(), dListCount);
 			parent->AddDeclaration(rawDataIndex, DeclarationAlignment::Align16, 12,
 				"FlexSkeletonHeader", StringHelper::Sprintf("%s", name.c_str()), headerStr);
 		}