commit 7dfd0e0ccc5e8537fa8e7decf56479d64fbf3bf0
author Bugfix <mg@henning-ullrich.de> Fri Jan 05 17:23:32 2024 +0100
committer Bugfix <mg@henning-ullrich.de> Fri Jan 05 18:00:21 2024 +0100
tree 6583b696d014a20f429134a1894bd4cdabfc0292
parent 61af87f080caf0e83556ba62fb69fc352787401e

Codestyle

Einige veraltete oder einfach nur schlecht lesbare Konstrukte und ein
mixed entfernt.

Change-Id: I7cae6ffc69c637f2fd84caf3b5711d8054270fd1

std/living/combat.c

diff --git a/std/living/combat.c b/std/living/combat.c
index d6fbc53..2b05440 100644
--- a/std/living/combat.c
+++ b/std/living/combat.c
@@ -857,35 +857,31 @@
 }
 
 public void AddDefender(object friend)
-{ object *defs;
-
-  if ( !objectp(friend) )
+{
+  if(!objectp(friend))
     return;
 
-  if ( !pointerp(defs=QueryProp(P_DEFENDERS)) )
-    defs=({});
+  object* defs = QueryProp(P_DEFENDERS) || ({});
 
-  if ( member(defs,friend)>=0 )
+  if(friend in defs)
     return;
 
-  defs+=({friend});
-  SetProp(P_DEFENDERS,defs);
+  defs += ({friend});
+  SetProp(P_DEFENDERS, defs);
 }
 
 public void RemoveDefender(object friend)
-{ object *defs;
-
+{
   if ( !objectp(friend) )
     return;
 
-  if ( !pointerp(defs=QueryProp(P_DEFENDERS)) )
-    defs=({});
+  object* defs = QueryProp(P_DEFENDERS) || ({});
 
-  if ( member(defs,friend)==-1 )
+  if(!(friend in defs))
     return;
 
   defs -= ({friend});
-  SetProp(P_DEFENDERS,defs);
+  SetProp(P_DEFENDERS, defs);
 }
 
 public object* QueryDefenders()