commit 9c2e8e03b4139057a06bbbf97066ab538f338d08
author Zesstra <zesstra@zesstra.de> Mon Nov 05 19:58:48 2018 +0100
committer MG Mud User <mud@mg.mud.de> Mon Nov 05 19:58:48 2018 +0100
tree 85679754a485d9726fa05966f65406e28bb29c23
parent 902bcfd99f7b5d83e295c0ff47fe86f8ca660b05

Variable objectname in shellpath umbenannt

Sagt besser aus, was es ist und vermeidet Verwechslung mit
der efun object_name.

Change-Id: I721243a012b238cfb896bfa54b8d8f0274e2751c

secure/master/userinfo.c

diff --git a/secure/master/userinfo.c b/secure/master/userinfo.c
index 53ba4b0..83fdbf1 100644
--- a/secure/master/userinfo.c
+++ b/secure/master/userinfo.c
@@ -718,7 +718,7 @@
 }
 
 // Aendert die Shells eines Users.
-int set_player_object( string user, string objectname )
+int set_player_object( string user, string shellpath )
 {
     string prev;
 
@@ -728,13 +728,13 @@
         return -1;
     }
 
-    if ( objectname == "" )
-        objectname = 0;
+    if ( shellpath == "" )
+        shellpath = 0;
 
     if ( !stringp(user) || user == "" )
         return -6;
 
-    if ( !stringp(objectname) ){
+    if ( !stringp(shellpath) ){
         if ( !find_userinfo(user) )
             return -4;
 
@@ -743,19 +743,19 @@
         return 1;
     }
 
-    if ( catch(load_object(objectname);publish) ) {
-        write( "Fehler in " + objectname + "!\n" );
+    if ( catch(load_object(shellpath);publish) ) {
+        write( "Fehler in " + shellpath + "!\n" );
         return -2;
     }
 
-    if (strstr(object_name, "/std/shells/") != 0)
+    if (strstr(shellpath, "/std/shells/") != 0)
         return -3;
 
     if ( !find_userinfo(user) )
         return -4;
 
     prev = userlist[user, USER_OBJECT];
-    userlist[user, USER_OBJECT] = objectname;
+    userlist[user, USER_OBJECT] = shellpath;
     save_userinfo(user);
 
     // Loggen, falls die Aenderung nicht von Login beim Anlegen des Chars
@@ -766,7 +766,7 @@
       call_sefun("log_file", "ARCH/SHELL_AENDERUNGEN",
         sprintf( "%s: %O aendert die Shell von %s von %s auf %s (PO: %O)\n",
           strftime("%Y%m%d-%H%M%S"), 
-          this_interactive(), capitalize(user), prev, objectname,
+          this_interactive(), capitalize(user), prev, shellpath,
           previous_object()) );
     }