Aenderungen fuer wieder funktionierendes strict_types
- Deklarative Casts hinzugefuegt
- Typen gefixt
Change-Id: I44c6082d907efb241a35da248774809054f8c5ab
diff --git a/std/container/description.c b/std/container/description.c
index 1de834e..cf56803 100644
--- a/std/container/description.c
+++ b/std/container/description.c
@@ -47,16 +47,16 @@
if ( (!(flags & 4) && (flags & 1))) {
//wenn Magier und Magierinfos angehaengt werden sollen:
- tmp = capitalize(obj->short()||"")[0..<2]
+ tmp = capitalize(({string})obj->short()||"")[0..<2]
+ " ["+object_name(obj)+"]";
}
- else if (obj->QueryProp(P_INVIS)) {
+ else if (({int})obj->QueryProp(P_INVIS)) {
//keine Ausgabe bzw. leerer String, wird dann von collect rausgeschmissen
tmp="";
}
else {
//Spieler, Magier ohne P_WANTS_TO_LEARN etc.
- tmp = capitalize(obj->short()||"")[0..<2];
+ tmp = capitalize(({string})obj->short()||"")[0..<2];
}
//wenn wizard und 'dont collect equal objects': id ist object_name()
if(flags & 3 || living(obj))
@@ -90,7 +90,7 @@
int iswiz;
mixed objs, info;
- iswiz = IS_LEARNER( viewer ) && viewer->QueryProp(P_WANTS_TO_LEARN);
+ iswiz = IS_LEARNER( viewer ) && ({int})viewer->QueryProp(P_WANTS_TO_LEARN);
objs = ({}); info = ({});
map(inv, #'stringenize/*'*/, iswiz | (flags & 2) | (flags & 4), &objs, &info);
if(flags & 1) return info;