Merge branch 'Shiki' of https://github.com/Dice-Developer-Team/Dice i…

…nto Shiki
Dice-Developer-Team · Aug 9, 2020 · fb2f401 · fb2f401
2 parents 9b469d2 + 156ad80
commit fb2f401
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Dice/DiceConsole.cpp b/Dice/DiceConsole.cpp
@@ -182,7 +182,7 @@ void Console::loadNotice()
 	if (loadFile(DiceDir + "\\conf\\NoticeList.txt", NoticeList) < 1)
 	{
 		std::set<chatType> sChat;
-		if (loadFile(static_cast<string>(getAppDirectory()) + "MonitorList.RDconf", sChat) > 0)
+		if (loadFile(std::string(getAppDirectory()) + "MonitorList.RDconf", sChat) > 0)
 			for (const auto& it : sChat)
 			{
 				console.setNotice(it, 0b100000);

diff --git a/Dice/DiceSession.cpp b/Dice/DiceSession.cpp
@@ -352,7 +352,7 @@ int DiceTableMaster::load()
                 for (nlohmann::json::iterator itTable = j["tables"].begin(); itTable != j["tables"].end(); ++itTable)
 				{
                     string strTable = UTF8toGBK(itTable.key());
-                    for (nlohmann::json::iterator itItem = itTable.value().begin(); itItem != j.end(); ++itItem)
+                    for (nlohmann::json::iterator itItem = itTable.value().begin(); itItem != itTable.value().end(); ++itItem)
 					{
                         pSession->mTable[strTable].emplace(UTF8toGBK(itItem.key()), itItem.value());
                     }