Aenderungen fuer wieder funktionierendes strict_types
- Deklarative Casts hinzugefuegt
- Typen gefixt
Change-Id: I44c6082d907efb241a35da248774809054f8c5ab
diff --git a/secure/master/destruct.c b/secure/master/destruct.c
index 1b7c19a..bd36571 100644
--- a/secure/master/destruct.c
+++ b/secure/master/destruct.c
@@ -28,10 +28,10 @@
&& ob) {
// Spieler speichern, dann erst Inventar entleeren, dann remove() und
// und destruct() anwenden.
- catch(ob->save_me(1); publish);
+ catch(({void})ob->save_me(1); publish);
filter(all_inventory(ob), #'recursive_remove, immediate_destruct);
if (!immediate_destruct)
- catch(ob->remove(0);publish);
+ catch(({int})ob->remove(0);publish);
if (ob)
destruct(ob);
}
@@ -43,7 +43,7 @@
filter(all_inventory(ob), #'recursive_remove, immediate_destruct);
// ggf. zuerst remove versuchen
if (!immediate_destruct)
- catch(ob->remove(1);publish);
+ catch(({int})ob->remove(1);publish);
if (ob)
destruct(ob);
}
@@ -82,7 +82,7 @@
old_env=environment(item);
// M_MOVE_ALL, falls item nen Unitobjekt ist. Sonst clonen die u.U. noch
// wieder nen neues Objekt im alten Env.
- if(catch(item->move(env, M_NOCHECK|M_MOVE_ALL);publish))
+ if(catch(({int})item->move(env, M_NOCHECK|M_MOVE_ALL);publish))
recursive_remove(item, 1);
else if (item && environment(item) == old_env)
recursive_remove(item, 1);
diff --git a/secure/master/domain.c b/secure/master/domain.c
index ade06ba..b73378d 100644
--- a/secure/master/domain.c
+++ b/secure/master/domain.c
@@ -25,8 +25,8 @@
{
string *domains;
- if ((call_other(SIMUL_EFUN_FILE, "process_call") ||
- call_other(SIMUL_EFUN_FILE, "secure_level") < GOD_LVL) ||
+ if ((({int})call_other(SIMUL_EFUN_FILE, "process_call") ||
+ ({int})call_other(SIMUL_EFUN_FILE, "secure_level") < GOD_LVL) ||
!find_userinfo(user))
return 0;
domains=query_userlist(user, USER_DOMAIN);
diff --git a/secure/master/guild.c b/secure/master/guild.c
index d0c025c..e863409 100644
--- a/secure/master/guild.c
+++ b/secure/master/guild.c
@@ -26,8 +26,8 @@
{
string *guilds;
- if ((call_other(SIMUL_EFUN_FILE, "process_call") ||
- call_other(SIMUL_EFUN_FILE, "secure_level") < GOD_LVL) ||
+ if ((({int})call_other(SIMUL_EFUN_FILE, "process_call") ||
+ ({int})call_other(SIMUL_EFUN_FILE, "secure_level") < GOD_LVL) ||
!find_userinfo(user))
return 0;
diff --git a/secure/master/misc.c b/secure/master/misc.c
index 7d41566..d952d6e 100644
--- a/secure/master/misc.c
+++ b/secure/master/misc.c
@@ -35,12 +35,12 @@
{
// sonst faken wir eins. *seufz*
sender=clone_object("/p/daemon/namefake");
- sender->SetProp(P_NAME, sendername);
- sender->SetProp(P_ARTICLE,0);
+ ({string})sender->SetProp(P_NAME, sendername);
+ ({int})sender->SetProp(P_ARTICLE,0);
// Dieses Objekt zerstoert sich nach 3s automatisch.
}
}
- CHMASTER->send(channel, sender, msg);
+ ({int})CHMASTER->send(channel, sender, msg);
}
static string *explode_files(string file) {
@@ -180,7 +180,7 @@
return;
}
-/* if (!("/secure/login"->valid_name(name))) return;*/
+/* if (!(({int})"/secure/login"->valid_name(name))) return;*/
if ( lower_case(reason) != "loeschen" ){
names = ({ name + " " + reason });
@@ -416,8 +416,8 @@
// Lese- und Schreibberechtigungen fuer die Rubrik 'polizei' setzen
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 );
+ ({int})ob->RemoveAllowed( "polizei", 0, ginfo[0], ginfo[1] );
+ ({int})ob->AddAllowed( "polizei", 0, deputies, deputies );
LoadDeputyFileList();
}
@@ -471,7 +471,7 @@
{
tell_object(player, "Arbeitszimmer " + castle + " erzeugt.\n");
// Arbeitszimmer als Home setzen
- player->SetProp(P_START_HOME,castle[0..<3]);
+ ({string})player->SetProp(P_START_HOME,castle[0..<3]);
}
else
tell_object(player, "Arbeitszimmer konnte nicht erzeugt werden !\n");
@@ -497,7 +497,7 @@
mixed mail = ({"Merlin", "<Master>", name, 0, 0, subject,
call_sefun("dtime",time()),
MUDNAME+time(), text });
- MAILDEMON->DeliverMail(mail, 0);
+ ({string*})MAILDEMON->DeliverMail(mail, 0);
}
int allowed_advance_wizlevel(mixed ob)
@@ -558,13 +558,12 @@
void restart_heart_beat(object heart_beat)
{
- if (heart_beat) heart_beat->_restart_beat();
+ if (heart_beat) ({void})heart_beat->_restart_beat();
}
int renew_player_object(string|object who)
{
object newob;
- object *obs, *obs2;
mixed err;
string ob_name;
object *armours, weapon;
@@ -585,7 +584,7 @@
return -2;
if (!object_info(who, OI_ONCE_INTERACTIVE))
return -3;
- if (who->QueryGuest())
+ if (({int})who->QueryGuest())
{
printf("Can't renew guests!\n");
return -6;
@@ -604,11 +603,11 @@
if (!newob)
return -5;
/* Ok, the object is here now ... lets go for it ... */
- who->save_me(0);
+ ({void})who->save_me(0);
/* SSL ip weiterreichen */
if( call_sefun("query_ip_number", who) != efun::interactive_info(who,II_IP_NUMBER) )
{
- newob->set_realip( call_sefun("query_ip_number",who) );
+ ({string})newob->set_realip( call_sefun("query_ip_number",who) );
}
efun::configure_object(who, OC_COMMANDS_ENABLED, 0);
efun::set_this_player(0);
@@ -634,7 +633,7 @@
{
send_channel_msg("Debug",previous_object(),
"ERROR: exec() during Renew unsuccessful.\n");
- newob->remove();
+ ({int})newob->remove();
return 0;
}
}
@@ -643,7 +642,7 @@
{
send_channel_msg("Debug",previous_object(),
"ERROR: still active !\n");
- newob->remove();
+ ({int})newob->remove();
return 0;
}
// newob->start_player(capitalize(getuid(who)),who->_query_my_ip());
@@ -657,65 +656,64 @@
})
), who
),
- capitalize(getuid(who)), who->_query_my_ip() );
+ capitalize(getuid(who)), ({string})who->_query_my_ip() );
- newob->move(environment(who),M_TPORT|M_NOCHECK|M_NO_SHOW|M_SILENT
+ ({int})newob->move(environment(who),M_TPORT|M_NOCHECK|M_NO_SHOW|M_SILENT
|M_NO_ATTACK);
- obs=all_inventory(who);
foreach(object tob: all_inventory(who)) {
- if (!tob->QueryProp(P_AUTOLOADOBJ))
+ if (!({mixed})tob->QueryProp(P_AUTOLOADOBJ))
{
// kein Autoloader...
foreach(object ob: deep_inventory(tob))
{
// aber enthaltene Autoloader entsorgen...
- if (ob->QueryProp(P_AUTOLOADOBJ))
+ if (({mixed})ob->QueryProp(P_AUTOLOADOBJ))
{
- catch(ob->remove();publish);
+ catch(({int})ob->remove();publish);
if (ob) destruct(ob);
}
}
// objekt ohne die AL bewegen.
- catch(tob->move(newob,M_NOCHECK);publish);
+ catch(({int})tob->move(newob,M_NOCHECK);publish);
}
else {
// Inhalt von Autoloadern retten.
// neue instanz des ALs im neuen Objekt.
object new_al_instance = present_clone(tob, newob);
foreach(object ob: deep_inventory(tob)) {
- if (ob->QueryProp(P_AUTOLOADOBJ)) {
+ if (({mixed})ob->QueryProp(P_AUTOLOADOBJ)) {
// autoloader in Autoloadern zerstoeren...
- catch(ob->remove(1);publish);
+ catch(({int})ob->remove(1);publish);
if (ob) destruct(ob);
}
// alle nicht autoloader in die AL-Instanz im neuen Objekt oder
// notfalls ins Inv.
else {
if (objectp(new_al_instance))
- catch(ob->move(new_al_instance, M_NOCHECK);publish);
+ catch(({int})ob->move(new_al_instance, M_NOCHECK);publish);
else
- catch(ob->move(newob, M_NOCHECK);publish);
+ catch(({int})ob->move(newob, M_NOCHECK);publish);
}
}
// Autoloader zerstoeren. Wird nicht vom Spielerobjekt im remove()
// gemacht, wenn nicht NODROP.
- catch(tob->remove(1);publish);
+ catch(({int})tob->remove(1);publish);
if (tob) destruct(tob);
}
}
- who->remove();
+ ({int})who->remove();
if ( objectp(who) )
destruct(who);
rename_object(newob,ob_name);
- newob->__reload_explore();
+ ({void})newob->__reload_explore();
tp=this_player();
efun::set_this_player(newob);
if (objectp(weapon))
- weapon->DoWield();
+ ({int})weapon->DoWield();
if (pointerp(armours))
for (i=sizeof(armours)-1;i>=0;i--)
if (objectp(armours[i]))
- armours[i]->do_wear("alles");
+ ({int})armours[i]->do_wear("alles");
efun::set_this_player(tp);
//Rueckgabewert noetig, weil Funktion vom Typ 'int'
return(1);
diff --git a/secure/master/network.c b/secure/master/network.c
index 31a59b3..b3178b1 100644
--- a/secure/master/network.c
+++ b/secure/master/network.c
@@ -80,7 +80,7 @@
if ( sizeof(mess) < 3 )
data = ({ "Error: Wen soll ich fingern ?" });
else
- data = explode( "/p/daemon/finger"->
+ data = explode( ({string})"/p/daemon/finger"->
finger_single( lower_case(mess[2]), 0 ), "\n" );
break;
@@ -147,13 +147,13 @@
// Die folgenden Services sind keine Intermud-Dienste
if(strstr(msg_text, "IPLOOKUP\n") == 0)
{
- "/p/daemon/iplookup"->update( msg_text );
+ ({void})"/p/daemon/iplookup"->update( msg_text );
return;
}
if( strstr(msg_text, "DNSLOOKUP\n") == 0)
{
- "/p/daemon/dnslookup"->update( msg_text );
+ ({void})"/p/daemon/dnslookup"->update( msg_text );
return;
}
@@ -162,7 +162,7 @@
return udp_query(msg_text[10..],host,port);
}
// Rest an inetd fuer Bearbeitung als Intermud-Nachricht.
- "secure/inetd"->_receive_udp(host, msg_text);
+ ({void})"secure/inetd"->_receive_udp(host, msg_text);
}
diff --git a/secure/master/userinfo.c b/secure/master/userinfo.c
index bde7788..e62a1db 100644
--- a/secure/master/userinfo.c
+++ b/secure/master/userinfo.c
@@ -872,9 +872,9 @@
m_delete(userlist,real_name);
if (wlevel >= LEARNER_LVL)
- TO->BanishName(real_name, "So hiess mal ein Magier hier");
+ ({void})TO->BanishName(real_name, "So hiess mal ein Magier hier");
else if (wlevel >= SEER_LVL)
- TO->BanishName(real_name, "So hiess mal ein Seher hier");
+ ({void})TO->BanishName(real_name, "So hiess mal ein Seher hier");
#ifdef _PUREFTPD_
if (member(ftpuser,real_name)) {
@@ -1080,7 +1080,7 @@
}
}
// Gildenname?
- else if (GUILDMASTER->ValidGuild(alias)) {
+ else if (({int})GUILDMASTER->ValidGuild(alias)) {
uids += ({GUILDID"."+alias});
//hat die Gilde ein Projektverzeichnis?
if (file_size("/"PROJECTDIR"/"+alias) == FSIZE_DIR) {