commit d872d1815aef4c2369bc2ed59ac1ab52ed932b07
author Zesstra <zesstra@zesstra.de> Thu Nov 28 20:13:02 2019 +0100
committer MG Mud User <mud@mg.mud.de> Thu Nov 28 20:13:02 2019 +0100
tree f8d1161555a410852db1937645ed78485e0a07e1
parent 953b7eadbc4dcaaebb7c8caff43e3171e58694d2

Unwirksame Typecasts entfernt.

Entweder ganz oder wenn noetig durch deklarative Casts ersetzt.

Change-Id: I3769c849215df487bc8dde2b8c11f8c59d8a1c13

secure/master/misc.c

diff --git a/secure/master/misc.c b/secure/master/misc.c
index 9bb274f..d7d8eb5 100644
--- a/secure/master/misc.c
+++ b/secure/master/misc.c
@@ -417,9 +417,8 @@
     mixed *ginfo;
 
     // Lese- und Schreibberechtigungen fuer die Rubrik 'polizei' setzen
-    call_other( "/secure/news", "???" );
-    ob = find_object("secure/news");
-    ginfo = ((mixed)ob->GetGroup("polizei"))[5..6];
+    ob = load_object("secure/news");
+    ginfo = (({mixed*})ob->GetGroup("polizei"))[5..6];
     ob->RemoveAllowed( "polizei", 0, ginfo[0], ginfo[1] );
     ob->AddAllowed( "polizei", 0, deputies, deputies );
     LoadDeputyFileList();
@@ -565,7 +564,7 @@
   if (heart_beat) heart_beat->_restart_beat();
 }
 
-int renew_player_object(mixed who)
+int renew_player_object(string|object who)
 {
   object newob;
   object *obs, *obs2;
@@ -615,8 +614,8 @@
   }
   efun::configure_object(who, OC_COMMANDS_ENABLED, 0);
   efun::set_this_player(0);
-  armours=(object *)who->QueryProp(P_ARMOURS);
-  weapon=(object)who->QueryProp(P_WEAPON);
+  armours=({object*})who->QueryProp(P_ARMOURS);
+  weapon=({object})who->QueryProp(P_WEAPON);
 
   if ( previous_object() && object_name(previous_object()) == "/secure/merlin" )
       send_channel_msg("Debug",
@@ -630,7 +629,7 @@
   ob_name=explode(object_name(newob),"#")[0];
   if (sizeof(ob_name)>11 && ob_name[0..11]=="/std/shells/")
     ob_name=ob_name[11..];
-  ob_name=ob_name+":"+getuid((object)who);
+  ob_name=ob_name+":"+getuid(who);
   if (active)
     exec(newob,who);
   if (active && (interactive(who)||!interactive(newob)))