OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 11:19:10 +00:00
Code Releases Activity

Begin killing off sprintf

Browse Source
This commit is contained in:
Adam Johnson
2013-02-01 17:39:46 -05:00
parent 470ed86187
commit dd35878465
13 changed files with 57 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Sources/Tools/MaxConvert/hsConverterUtils.cpp
View File

@ -238,10 +238,9 @@ char *hsConverterUtils::MangleReference(char *mangName, const char *nodeName, co
// no room so make global
// Default is to make it global, but you can set another default (like same
// room as referencer) with defRoom.
char tempName[256];
sprintf(tempName, "%s..%s", defRoom, nodeName);
return hsStrcpy(mangName, tempName);
plString tempName = plString::Format("%s..%s", defRoom, nodeName);
return hsStrcpy(mangName, tempName.c_str());
}
return MangleReference(mangName, node);
@ -255,8 +254,7 @@ char *hsConverterUtils::MangleReference(char *mangName, INode *node, const char*
if (!node)
return nil;
char tempName[256];
plString tempName;
char *nodeName = node->GetName();
char *roomName = nil;
TSTR sdata;
@ -273,18 +271,18 @@ char *hsConverterUtils::MangleReference(char *mangName, INode *node, const char*
}
if (('.' == nodeName[0])&&('.' == nodeName[1]))
hsStrcpy(tempName, nodeName + 2);
tempName = (nodeName + 2);
else if (!*nodeName
|| strstr(nodeName, "..")
|| IsReservedKeyword(nodeName)
)
hsStrcpy(tempName, nodeName);
tempName = nodeName;
else if (roomName && *roomName)
sprintf(tempName, "%s..%s", roomName, nodeName);
tempName = plString::Format("%s..%s", roomName, nodeName);
else
sprintf(tempName, "%s..%s", defRoom, nodeName);
tempName = plString::Format("%s..%s", defRoom, nodeName);
return hsStrcpy(mangName, tempName);
return hsStrcpy(mangName, tempName.c_str());
hsGuardEnd;
}

2
Sources/Tools/MaxConvert/hsMaterialConverter.cpp
View File

@ -305,7 +305,7 @@ void AttachLinkMtlAnims(plMaxNode *node, hsGMaterial *mat)
plLayerLinkAnimation* animLayer;
char suff[10];
sprintf(suff, "%d", k);
snprintf(suff, arrsize(suff), "%d", k);
opaCtl = new plLeafController;
opaCtl->QuickScalarController(numKeys, times, values, sizeof(float));