start cleaning up some things - switches make me happy

This commit is contained in:
DarthArgus
2016-01-31 19:08:47 -06:00
parent 7c90f74f43
commit 5b9b1e6a97
2 changed files with 21 additions and 20 deletions
+1
View File
@@ -1,3 +1,4 @@
.project
*.kdev4
latex
html
@@ -327,25 +327,22 @@ namespace Archive
char giver[100];
temp[tempPos]='\0';
int const numScanned = sscanf(temp,"%lu %hi %hi %s", &c.key, &activeTasks, &completedTasks, giver);
//active quests
if (numScanned == 4)
{
// in-progress quest
Archive::put(target, static_cast<unsigned char>(Command::ADD));
Archive::put(target, c.key);
Archive::put(target, PlayerQuestData(NetworkId(giver), activeTasks, completedTasks, false));
}
//"old-style" completed quests, which don't store extra flags
else if (numScanned==1)
{
// completed quest
Archive::put(target, static_cast<unsigned char>(Command::ADD));
Archive::put(target, c.key);
Archive::put(target, PlayerQuestData(true, true));
}
//completed quests with store flags
else if (numScanned==2)
{
switch (numScanned) {
case 4:
// in-progress quest
Archive::put(target, static_cast<unsigned char>(Command::ADD));
Archive::put(target, c.key);
Archive::put(target, PlayerQuestData(NetworkId(giver), activeTasks, completedTasks, false));
break;
case 1:
// completed quest
Archive::put(target, static_cast<unsigned char>(Command::ADD));
Archive::put(target, c.key);
Archive::put(target, PlayerQuestData(true, true));
break;
case 2:
// completed quest
Archive::put(target, static_cast<unsigned char>(Command::ADD));
Archive::put(target, c.key);
@@ -353,9 +350,12 @@ namespace Archive
uint16 const flags = activeTasks;
bool const hasReceivedReward = (flags != 0);
Archive::put(target, PlayerQuestData(true, hasReceivedReward));
}
else
break;
default:
FATAL(true,("Could not parse packed quest data %s,",temp));
break;
}
tempPos=0;
}
else