1
0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-17 18:59:09 +00:00

Toss lots of custom CString code

We already have a C standard library, so let's not reimplement it.
This commit is contained in:
2012-06-17 20:15:04 -04:00
parent 1556d147d9
commit f0af98b0a7
29 changed files with 91 additions and 251 deletions

View File

@ -1015,7 +1015,7 @@ void plClient::IQueueRoomLoad(const std::vector<plLocation>& locs, bool hold)
fLoadRooms.push_back(new LoadRequest(loc, hold));
if (!lastAgeName || hsStrEQ(info->GetAge(), lastAgeName))
if (!lastAgeName || strcmp(info->GetAge(), lastAgeName) == 0)
lastAgeName = info->GetAge();
else
allSameAge = false;
@ -1208,7 +1208,7 @@ void plClient::IRoomLoaded(plSceneNode* node, bool hold)
int numMsgs = 0;
for (int i = 0; i < sizeof(ageMsgCount)/sizeof(AgeMsgCount); i++)
{
if (hsStrEQ(ageMsgCount[i].AgeName, name))
if (strcmp(ageMsgCount[i].AgeName, name) == 0)
{
numMsgs = ageMsgCount[i].NumMsgs;
break;

View File

@ -62,37 +62,38 @@ void print_help() {
printf("\t-v|--version\t - Prints build version information\n");
}
int main(int argc, char *argv[])
{
bool encrypt = true;
const char* dir = ".";
#define ARGCMP(y) (strcmp(argv[1], y) == 0)
if (argc > 1)
{
if (hsStrEQ(argv[1], "encrypt") || hsStrEQ(argv[1], "-e") )
if (ARGCMP("encrypt") || ARGCMP("-e") )
{
if (argc > 2)
dir = argv[2];
encrypt = true;
}
else if (hsStrEQ(argv[1], "decrypt") || hsStrEQ(argv[1], "-d"))
else if (ARGCMP("decrypt") || ARGCMP("-d"))
{
if (argc > 2)
dir = argv[2];
encrypt = false;
}
else if(hsStrEQ(argv[1], "--help") || hsStrEQ(argv[1], "-h") || hsStrEQ(argv[1], "-?") || hsStrEQ(argv[1], "/?"))
else if(ARGCMP("--help") || ARGCMP("-h") || ARGCMP("-?") || ARGCMP("/?"))
{
print_help();
return 0;
}
else if (hsStrEQ(argv[1], "-v") || hsStrEQ(argv[1], "--version"))
else if (ARGCMP("-v") || ARGCMP("--version"))
{
print_version();
return 0;
}
}
#undef ARGCMP
EncryptFiles(dir, ".age", encrypt);
EncryptFiles(dir, ".fni", encrypt);

View File

@ -95,7 +95,7 @@ int PrintHelp( void )
int main(int argc, char* argv[])
{
if (argc >= 1 && hsStrEQ(argv[1], "-v"))
if (argc >= 1 && strcmp(argv[1], "-v") == 0)
{
PrintVersion();
return 0;
@ -110,9 +110,9 @@ int main(int argc, char* argv[])
int arg = 1;
for (arg = 1; arg < argc; arg++)
{
if (hsStrEQ(argv[arg], "-s"))
if (strcmp(argv[arg], "-s") == 0)
sounds = true;
else if (hsStrEQ(argv[arg], "-i"))
else if (strcmp(argv[arg], "-i") == 0)
stats = true;
else
break;