From: Markus Armbruster <armbru@pond.sub.org>
Date: Sat, 23 Apr 2011 05:55:45 +0000 (+0200)
Subject: Simplify build_bridge(): replace a switch by a function pointer
X-Git-Tag: v4.3.28~108
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=9ef720040679324e3ff55cdfdb7d58162593a447

Simplify build_bridge(): replace a switch by a function pointer
---

diff --git a/src/lib/commands/buil.c b/src/lib/commands/buil.c
index 6902971e5..f2f6fc4ff 100644
--- a/src/lib/commands/buil.c
+++ b/src/lib/commands/buil.c
@@ -643,7 +643,8 @@ build_bridge(char what)
 {
     struct natstr *natp = getnatp(player->cnum);
     struct nstr_sect nstr;
-    int gotsect, built;
+    int (*build_it)(struct sctstr *, short[]);
+    int gotsect;
     struct sctstr sect;
 
     switch (what) {
@@ -652,6 +653,7 @@ build_bridge(char what)
 	    pr("Building a span requires a tech of %.0f\n", buil_bt);
 	    return RET_FAIL;
 	}
+	build_it = build_bspan;
 	break;
     case 't':
 	if (!opt_BRIDGETOWERS) {
@@ -663,6 +665,7 @@ build_bridge(char what)
 	       buil_tower_bt);
 	    return RET_FAIL;
 	}
+	build_it = build_btower;
 	break;
     default:
 	CANT_REACH();
@@ -676,15 +679,7 @@ build_bridge(char what)
 	gotsect++;
 	if (!player->owner)
 	    continue;
-	switch (what) {
-	case 'b':
-	    built = build_bspan(&sect, sect.sct_item);
-	    break;
-	case 't':
-	    built = build_btower(&sect, sect.sct_item);
-	    break;
-	}
-	if (built)
+	if (build_it(&sect, sect.sct_item))
 	    putsect(&sect);
     }
     if (!gotsect) {