commit d36ce391f4df8c7b51db9c5250848d49dcb55c0e
author Zesstra <zesstra@zesstra.de> Sun Aug 30 23:42:04 2020 +0200
committer Zesstra <zesstra@zesstra.de> Sun Aug 30 23:45:42 2020 +0200
tree defc7d760f180abc078d1d7e6e2b1fa056b9e5af
parent 5a4ba11287aab2b69f371a3cc5ac9545e4503e89

Argumente query_wiz_level eingeschraenkt

... auf object|string. Gleiches gilt fuer query_wiz_grp.

Change-Id: I39b8f73bc8a10b4754e1bea512a0c477d0f00067

secure/master/userinfo.c

diff --git a/secure/master/userinfo.c b/secure/master/userinfo.c
index e62a1db..cd4202b 100644
--- a/secure/master/userinfo.c
+++ b/secure/master/userinfo.c
@@ -579,7 +579,7 @@
 }
 
 // Wizlevel fuer eine UID ermitteln.
-public int query_wiz_level( mixed player )
+public int query_wiz_level( object|string player )
 {
     if ( objectp(player) && efun::object_info(player, OI_ONCE_INTERACTIVE) )
         return get_wiz_level( getuid(player) );
@@ -588,7 +588,7 @@
         //if (objectp(player))
         //    player=getuid(player);
         if ( stringp(player) ) {
-            if( player[0..1]==DOMAINDIR"." ) return 25;
+            if( player[0..1]==DOMAINDIR"." ) return DOMAINMEMBER_LVL;
             if( player[0..5]==GUILDID"." ) 
                 return WIZLVLS[GUILDID];
             if( player[0..1]==PROJECTDIR"." ) return 21;

secure/simul_efun/simul_efun.c

diff --git a/secure/simul_efun/simul_efun.c b/secure/simul_efun/simul_efun.c
index 5728ae7..55c0480 100644
--- a/secure/simul_efun/simul_efun.c
+++ b/secure/simul_efun/simul_efun.c
@@ -433,7 +433,7 @@
 }
 
 // * Magier-Level abfragen
-int query_wiz_level(mixed player) {
+int query_wiz_level(object|string player) {
   return "/secure/master"->query_wiz_level(player);
 }
 
@@ -1036,7 +1036,7 @@
 }
 
 // * Magierlevelgruppen ermitteln
-int query_wiz_grp(mixed wiz)
+int query_wiz_grp(object|string wiz)
 {
   int lev;