From 75d4bc947ddbb92ecf660d9a9858c854d5e34a15 Mon Sep 17 00:00:00 2001
From: frosch <frosch@openttd.org>
Date: Sat, 17 Apr 2010 13:31:41 +0000
Subject: (svn r19654) -Codechange: Use Extract<> in more places.

---
 src/town_cmd.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/town_cmd.cpp')

diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp
index c4f10b072..a77203014 100644
--- a/src/town_cmd.cpp
+++ b/src/town_cmd.cpp
@@ -14,6 +14,7 @@
 #include "road_cmd.h"
 #include "landscape.h"
 #include "viewport_func.h"
+#include "cmd_helper.h"
 #include "command_func.h"
 #include "industry.h"
 #include "station_base.h"
@@ -1518,9 +1519,9 @@ static bool IsUniqueTownName(const char *name)
  */
 CommandCost CmdFoundTown(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
 {
-	TownSize size = (TownSize)GB(p1, 0, 2);
+	TownSize size = Extract<TownSize, 0, 2>(p1);
 	bool city = HasBit(p1, 2);
-	TownLayout layout = (TownLayout)GB(p1, 3, 3);
+	TownLayout layout = Extract<TownLayout, 3, 3>(p1);
 	TownNameParams par(_settings_game.game_creation.town_name);
 	bool random = HasBit(p1, 6);
 	uint32 townnameparts = p2;
-- 
cgit v1.2.3-54-g00ecf