Fix Typecasts

Change-Id: I496fb6fafe40a16d93ad8880a07a2e9fe01a25e3
diff --git a/room/death/death_room_vc.c b/room/death/death_room_vc.c
index 9cfd529..d820ab6 100644
--- a/room/death/death_room_vc.c
+++ b/room/death/death_room_vc.c
@@ -81,7 +81,7 @@
       return;
   }
 
-  if ( !(prayroom = (string) this_player()->QueryPrayRoom()) )
+  if ( !(prayroom = ({string}) this_player()->QueryPrayRoom()) )
       prayroom = "/room/pray_room";
   
   if ( !({int})this_player()->QueryProp(P_GHOST) )
@@ -92,7 +92,7 @@
           if ( !({int})this_player()->QueryProp(P_INVIS) )
               tell_room( this_object(),
                          "Der Tod sagt: WAS WILLST DU HIER, "+
-                         upperstring((string) this_player()->name())+"?\n"+
+                         upperstring(({string})this_player()->name())+"?\n"+
                          "Der Tod sagt: DU BIST UNSTERBLICH, DU HAST HIER "
                          "NICHTS ZU SUCHEN!\n\n" );
 	}
@@ -101,7 +101,7 @@
           write("Der Tod sagt: WAS TUST DU HIER? DEINE ZEIT IST NOCH "
                 "NICHT REIF!\n\n");
           
-	  if ( catch(res = (int) this_player()->move( prayroom,M_GO|M_SILENT|M_NOCHECK ))
+	  if ( catch(res = ({int}) this_player()->move( prayroom,M_GO|M_SILENT|M_NOCHECK ))
                || res < 1 && environment(this_player()) == this_object() )
               this_player()->move( "/room/pray_room", M_GO|M_SILENT|M_NOCHECK );
 	}