the player should get the player list which in the same group

ketoo · ketoo · commit 6607ae6d94ff · 2017-04-14T00:58:00.000-07:00
diff --git a/NFComm/NFKernelPlugin/NFCKernelModule.cpp b/NFComm/NFKernelPlugin/NFCKernelModule.cpp
@@ -1057,21 +1057,25 @@ bool NFCKernelModule::GetGroupObjectList(const int nSceneID, const int nGroupID,
 		{
 			NFGUID ident = NFGUID();
 			NF_SHARE_PTR<int> pRet = pGroupInfo->mxPlayerList.First(ident);
-			while (!ident.IsNull() && noSelf != ident)
+			for (; pRet; pRet = pGroupInfo->mxPlayerList.Next(ident))
 			{
-				list.Add(ident);
+				if (!ident.IsNull() && ident != noSelf)
+				{
+					list.Add(ident);
+				}
 
 				ident = NFGUID();
-				pRet = pGroupInfo->mxPlayerList.Next(ident);
 			}
 
 			pRet = pGroupInfo->mxOtherList.First(ident);
-			while (!ident.IsNull() && noSelf != ident)
+			for (; pRet; pRet = pGroupInfo->mxOtherList.Next(ident))
 			{
-				list.Add(ident);
+				if (!ident.IsNull() && ident != noSelf)
+				{
+					list.Add(ident);
+				}
 
 				ident = NFGUID();
-				pRet = pGroupInfo->mxOtherList.Next(ident);
 			}
 
 			return true;
@@ -1169,24 +1173,28 @@ bool NFCKernelModule::GetGroupObjectList(const int nSceneID, const int nGroupID,
 			{
 				NFGUID ident = NFGUID();
 				NF_SHARE_PTR<int> pRet = pGroupInfo->mxPlayerList.First(ident);
-				while (!ident.IsNull() && ident != noSelf)
+				for (; pRet; pRet = pGroupInfo->mxPlayerList.Next(ident))
 				{
-					list.Add(ident);
+					if (!ident.IsNull() && ident != noSelf)
+					{
+						list.Add(ident);
+					}
 
 					ident = NFGUID();
-					pRet = pGroupInfo->mxPlayerList.Next(ident);
 				}
 			}
 			else
 			{
 				NFGUID ident = NFGUID();
 				NF_SHARE_PTR<int> pRet = pGroupInfo->mxOtherList.First(ident);
-				while (!ident.IsNull() && ident != noSelf)
+				for (; pRet; pRet = pGroupInfo->mxOtherList.Next(ident))
 				{
-					list.Add(ident);
+					if (!ident.IsNull() && ident != noSelf)
+					{
+						list.Add(ident);
+					}
 
 					ident = NFGUID();
-					pRet = pGroupInfo->mxOtherList.Next(ident);
 				}
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -1057,21 +1057,25 @@ bool NFCKernelModule::GetGroupObjectList(const int nSceneID, const int nGroupID,`
`1057`	`1057`	`{`
`1058`	`1058`	`NFGUID ident = NFGUID();`
`1059`	`1059`	`NF_SHARE_PTR<int> pRet = pGroupInfo->mxPlayerList.First(ident);`
`1060`		`- while (!ident.IsNull() && noSelf != ident)`
	`1060`	`+ for (; pRet; pRet = pGroupInfo->mxPlayerList.Next(ident))`
`1061`	`1061`	`{`
`1062`		`- list.Add(ident);`
	`1062`	`+ if (!ident.IsNull() && ident != noSelf)`
	`1063`	`+ {`
	`1064`	`+ list.Add(ident);`
	`1065`	`+ }`
`1063`	`1066`
`1064`	`1067`	`ident = NFGUID();`
`1065`		`- pRet = pGroupInfo->mxPlayerList.Next(ident);`
`1066`	`1068`	`}`
`1067`	`1069`
`1068`	`1070`	`pRet = pGroupInfo->mxOtherList.First(ident);`
`1069`		`- while (!ident.IsNull() && noSelf != ident)`
	`1071`	`+ for (; pRet; pRet = pGroupInfo->mxOtherList.Next(ident))`
`1070`	`1072`	`{`
`1071`		`- list.Add(ident);`
	`1073`	`+ if (!ident.IsNull() && ident != noSelf)`
	`1074`	`+ {`
	`1075`	`+ list.Add(ident);`
	`1076`	`+ }`
`1072`	`1077`
`1073`	`1078`	`ident = NFGUID();`
`1074`		`- pRet = pGroupInfo->mxOtherList.Next(ident);`
`1075`	`1079`	`}`
`1076`	`1080`
`1077`	`1081`	`return true;`
`@@ -1169,24 +1173,28 @@ bool NFCKernelModule::GetGroupObjectList(const int nSceneID, const int nGroupID,`
`1169`	`1173`	`{`
`1170`	`1174`	`NFGUID ident = NFGUID();`
`1171`	`1175`	`NF_SHARE_PTR<int> pRet = pGroupInfo->mxPlayerList.First(ident);`
`1172`		`- while (!ident.IsNull() && ident != noSelf)`
	`1176`	`+ for (; pRet; pRet = pGroupInfo->mxPlayerList.Next(ident))`
`1173`	`1177`	`{`
`1174`		`- list.Add(ident);`
	`1178`	`+ if (!ident.IsNull() && ident != noSelf)`
	`1179`	`+ {`
	`1180`	`+ list.Add(ident);`
	`1181`	`+ }`
`1175`	`1182`
`1176`	`1183`	`ident = NFGUID();`
`1177`		`- pRet = pGroupInfo->mxPlayerList.Next(ident);`
`1178`	`1184`	`}`
`1179`	`1185`	`}`
`1180`	`1186`	`else`
`1181`	`1187`	`{`
`1182`	`1188`	`NFGUID ident = NFGUID();`
`1183`	`1189`	`NF_SHARE_PTR<int> pRet = pGroupInfo->mxOtherList.First(ident);`
`1184`		`- while (!ident.IsNull() && ident != noSelf)`
	`1190`	`+ for (; pRet; pRet = pGroupInfo->mxOtherList.Next(ident))`
`1185`	`1191`	`{`
`1186`		`- list.Add(ident);`
	`1192`	`+ if (!ident.IsNull() && ident != noSelf)`
	`1193`	`+ {`
	`1194`	`+ list.Add(ident);`
	`1195`	`+ }`
`1187`	`1196`
`1188`	`1197`	`ident = NFGUID();`
`1189`		`- pRet = pGroupInfo->mxOtherList.Next(ident);`
`1190`	`1198`	`}`
`1191`	`1199`	`}`
`1192`	`1200`