Просмотр исходного кода

friend: Fixes PermissionLevel names (#2185)

This PR fixes the permission level names, nothing more.
Ac_K 5 лет назад
Родитель
Сommit
58660c8536

+ 2 - 2
Ryujinx.HLE/HOS/Services/Friend/IServiceCreator.cs

@@ -4,11 +4,11 @@ using Ryujinx.HLE.HOS.Services.Friend.ServiceCreator;
 
 namespace Ryujinx.HLE.HOS.Services.Friend
 {
-    [Service("friend:a", FriendServicePermissionLevel.Admin)]
+    [Service("friend:a", FriendServicePermissionLevel.Administrator)]
     [Service("friend:m", FriendServicePermissionLevel.Manager)]
     [Service("friend:s", FriendServicePermissionLevel.System)]
     [Service("friend:u", FriendServicePermissionLevel.User)]
-    [Service("friend:v", FriendServicePermissionLevel.Overlay)]
+    [Service("friend:v", FriendServicePermissionLevel.Viewer)]
     class IServiceCreator : IpcService
     {
         private FriendServicePermissionLevel _permissionLevel;

+ 1 - 1
Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/INotificationService.cs

@@ -144,7 +144,7 @@ namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator
         {
             lock (_lock)
             {
-                if ((_permissionLevel & FriendServicePermissionLevel.OverlayMask) != 0 && _userId == targetId)
+                if ((_permissionLevel & FriendServicePermissionLevel.ViewerMask) != 0 && _userId == targetId)
                 {
                     if (!_hasNewFriendRequest)
                     {

+ 1 - 2
Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/NotificationService/NotificationEventHandler.cs

@@ -1,5 +1,4 @@
 using Ryujinx.HLE.HOS.Services.Account.Acc;
-using Ryujinx.HLE.Utilities;
 
 namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator.NotificationService
 {
@@ -81,4 +80,4 @@ namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator.NotificationService
             }
         }
     }
-}
+}

+ 6 - 6
Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/Types/FriendServicePermissionLevel.cs

@@ -6,14 +6,14 @@ namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator
     enum FriendServicePermissionLevel
     {
         UserMask    = 1,
-        OverlayMask = 2,
+        ViewerMask  = 2,
         ManagerMask = 4,
         SystemMask  = 8,
 
-        Admin   = -1,
-        User    = UserMask,
-        Overlay = UserMask | OverlayMask,
-        Manager = UserMask | OverlayMask | ManagerMask,
-        System  = UserMask | SystemMask
+        Administrator = -1,
+        User          = UserMask,
+        Viewer        = UserMask | ViewerMask,
+        Manager       = UserMask | ViewerMask | ManagerMask,
+        System        = UserMask | SystemMask
     }
 }