commit 6fa8c9e3af8067548097ec13ff6e8a29f44ab0c5
author Arathorn <mud@mg.mud.de> Wed Aug 05 13:29:02 2020 +0200
committer MG Mud User <mud@mg.mud.de> Wed Aug 05 13:29:02 2020 +0200
tree 9c86db15884f581c27e63c896b82e477e97fd636
parent 0a8e4d341b702915a4574f08b865d66791928e87

Typefixes

Change-Id: I8097deff4ec4073b14a49173c85e615d3035cf97

room/death/death_room.c

diff --git a/room/death/death_room.c b/room/death/death_room.c
index 21e11ca..5669267 100644
--- a/room/death/death_room.c
+++ b/room/death/death_room.c
@@ -405,7 +405,7 @@
         kill_ob = prev; // killendes Objekt
     }
 
-    object pre = (object) pl->QueryProp(P_KILLER);
+    string|object pre = pl->QueryProp(P_KILLER);
     if ( objectp(pre) ) {
         dseq = pre->QueryProp(P_ENEMY_DEATH_SEQUENCE);
 

secure/udp/htmlwho.c

diff --git a/secure/udp/htmlwho.c b/secure/udp/htmlwho.c
index d9cd899..51a24b4 100644
--- a/secure/udp/htmlwho.c
+++ b/secure/udp/htmlwho.c
@@ -23,10 +23,10 @@
 udp_htmlwho(data)
 {
   int i,num;
-  string *mdata;
   string wholiste,tmp,tmp2;
- 
-  mdata="/obj/werliste"->QueryWhoListe(0,0,1);
+
+  <object|string>** mdata="/obj/werliste"->QueryWhoListe(0,0,1);
+
   num=sizeof(mdata);
   for (i=num-1;i>=0;i--)
   {

std/clothing/wear.c

diff --git a/std/clothing/wear.c b/std/clothing/wear.c
index 742b813..22261d5 100644
--- a/std/clothing/wear.c
+++ b/std/clothing/wear.c
@@ -295,7 +295,7 @@
     // Aktion noch setzen, Spieler hat ja was angezogen
     ({int*})PL->SetProp(P_LAST_WEAR_ACTION,({WA_WEAR,time()}));
     // Im Kampf verliert der Spieler durch Kleidungswechsel eine Runde.
-    if (({int})PL->InFight()) {
+    if (({object})PL->InFight()) {
       ({int})PL->SetProp(P_ATTACK_BUSY,1);
     }
   }
@@ -427,7 +427,7 @@
     //Behinderung beim Wechsel nur fuer Spieler
     if (query_once_interactive(PL)) {
       ({int*})PL->SetProp(P_LAST_WEAR_ACTION,({WA_UNWEAR,time()}));
-      if (({int})PL->InFight()) {
+      if (({object})PL->InFight()) {
         ({int})PL->SetProp(P_ATTACK_BUSY,1);
       }
     }
@@ -505,7 +505,7 @@
   }
 
   // Vielleicht darf der Spieler ja gar nichts mehr ausziehen.
-  if (({int})PL->InFight()) {
+  if (({object})PL->InFight()) {
     last=({int*})PL->QueryProp(P_LAST_WEAR_ACTION);
     if (pointerp(last) && (last[0]==WA_WEAR) && ((time()-last[1])<2)) {
       notify_fail("Du hast doch gerade erst etwas angezogen!\n"