Typecasts gefixt
Change-Id: I0d2928c804e9e1779fbd9bec33ba27977a6d1e93
diff --git a/std/clothingHG.c b/std/clothingHG.c
index 314e8e0..a07b850 100644
--- a/std/clothingHG.c
+++ b/std/clothingHG.c
@@ -31,7 +31,7 @@
}
if (objectp(environment()) && objectp(environment(environment())))
tell_room(environment(environment()),
- capitalize((string)PL->name(WER)) + " setzt " + name(WEN,0) +
+ capitalize(({string})PL->name(WER)) + " setzt " + name(WEN,0) +
" auf.\n");
}
@@ -40,7 +40,7 @@
tell_object(worn_by, "Du setzt " + name(WEN,1) + " ab.\n" );
}
tell_room(environment(worn_by),
- (capitalize((string)worn_by->name(WER))) + " setzt " +
+ (capitalize(({string})worn_by->name(WER))) + " setzt " +
name(WEN,0) + " ab.\n", ({worn_by}));
}
diff --git a/std/player/shadows/morph_shadow.c b/std/player/shadows/morph_shadow.c
index f1ff01f..752b442 100644
--- a/std/player/shadows/morph_shadow.c
+++ b/std/player/shadows/morph_shadow.c
@@ -124,7 +124,7 @@
//--------------------------------------------------------------------------
int _query_article( /* void */ )
{
- return (int)_query_property( P_ARTICLE );
+ return _query_property( P_ARTICLE );
}
//--------------------------------------------------------------------------
@@ -136,7 +136,7 @@
//--------------------------------------------------------------------------
int _query_average_size( /* void */ )
{
- return (int)_query_property( P_AVERAGE_SIZE );
+ return _query_property( P_AVERAGE_SIZE );
}
//--------------------------------------------------------------------------
@@ -148,7 +148,7 @@
//--------------------------------------------------------------------------
int _query_average_weight( /* void */ )
{
- return (int)_query_property( P_AVERAGE_WEIGHT );
+ return _query_property( P_AVERAGE_WEIGHT );
}
//--------------------------------------------------------------------------
@@ -160,7 +160,7 @@
//--------------------------------------------------------------------------
int _query_body( /* void */ )
{
- return (int)_query_property( P_BODY );
+ return _query_property( P_BODY );
}
//--------------------------------------------------------------------------
@@ -172,7 +172,7 @@
//--------------------------------------------------------------------------
int _query_gender( /* void */ )
{
- return (int)_query_property( P_GENDER );
+ return _query_property( P_GENDER );
}
//--------------------------------------------------------------------------
@@ -326,7 +326,7 @@
//--------------------------------------------------------------------------
int _query_max_hands( /* void */ )
{
- return (int)_query_property( P_MAX_HANDS );
+ return _query_property( P_MAX_HANDS );
}
//--------------------------------------------------------------------------
@@ -338,7 +338,7 @@
//--------------------------------------------------------------------------
string _query_mmsgin( /* void */ )
{
- return (string)(_query_property( P_MMSGIN ) || "");
+ return (_query_property( P_MMSGIN ) || "");
}
//--------------------------------------------------------------------------
@@ -350,7 +350,7 @@
//--------------------------------------------------------------------------
string _query_mmsgout( /* void */ )
{
- return (string)(_query_property( P_MMSGOUT ) || "");
+ return (_query_property( P_MMSGOUT ) || "");
}
//--------------------------------------------------------------------------
@@ -362,7 +362,7 @@
//--------------------------------------------------------------------------
string _query_msgin( /* void */ )
{
- return (string)(_query_property( P_MSGIN ) || "");
+ return (_query_property( P_MSGIN ) || "");
}
//--------------------------------------------------------------------------
@@ -374,7 +374,7 @@
//--------------------------------------------------------------------------
string _query_msgout( /* void */ )
{
- return (string)(_query_property( P_MSGOUT ) || "");
+ return (_query_property( P_MSGOUT ) || "");
}
//--------------------------------------------------------------------------
@@ -430,7 +430,7 @@
//--------------------------------------------------------------------------
string _query_presay( /* void */ )
{
- return (string)(_query_property( P_PRESAY ) || "");
+ return (_query_property( P_PRESAY ) || "");
}
//--------------------------------------------------------------------------
@@ -442,7 +442,7 @@
//--------------------------------------------------------------------------
string _query_race( /* void */ )
{
- return (string)(_query_property( P_RACE ) || "");
+ return (_query_property( P_RACE ) || "");
}
//--------------------------------------------------------------------------
@@ -454,7 +454,7 @@
//--------------------------------------------------------------------------
string* _query_racestring( /* void */ )
{
- return (string*)_query_property( P_RACESTRING );
+ return _query_property( P_RACESTRING );
}
//--------------------------------------------------------------------------
@@ -466,7 +466,7 @@
//--------------------------------------------------------------------------
int _query_size( /* void */ )
{
- return (int)_query_property( P_SIZE );
+ return _query_property( P_SIZE );
}
//--------------------------------------------------------------------------
@@ -478,7 +478,7 @@
//--------------------------------------------------------------------------
string _query_title( /* void */ )
{
- return (string)(_query_property( P_TITLE ) || "");
+ return (_query_property( P_TITLE ) || "");
}
//--------------------------------------------------------------------------
@@ -490,7 +490,7 @@
//--------------------------------------------------------------------------
int _query_weight( /* void */ )
{
- return (int)(_query_property( P_WEIGHT ) || "");
+ return (_query_property( P_WEIGHT ) || "");
}
//--------------------------------------------------------------------------
@@ -563,7 +563,7 @@
IS_LEARNING( previous_object() ) )
return "(" + pl->Query( P_NAME ) + ") \n";
else
- return (string)0;
+ return 0;
names = _query_name_full();
if ( stringp( names ) )