Fix race condition in registration leading to duplicate create_auth calls

[minetest.git] / src / hud.cpp

diff --git a/src/hud.cpp b/src/hud.cpp
index 0d2d092a7930f6d94213ce8b926d5ba2f24c0b59..841c907587eb456f199791d94c0ba6185d256549 100644 (file)
--- a/src/hud.cpp
+++ b/src/hud.cpp
@@ -1,5 +1,24 @@
-#include "hud.h"
+/*
+Minetest
+Copyright (C) 2010-2018 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
 
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "hud.h"
+#include <cmath>
 
 const struct EnumString es_HudElementType[] =
 {
@@ -8,6 +27,9 @@ const struct EnumString es_HudElementType[] =
        {HUD_ELEM_STATBAR,   "statbar"},
        {HUD_ELEM_INVENTORY, "inventory"},
        {HUD_ELEM_WAYPOINT,  "waypoint"},
+       {HUD_ELEM_IMAGE_WAYPOINT, "image_waypoint"},
+       {HUD_ELEM_COMPASS,   "compass"},
+       {HUD_ELEM_MINIMAP,   "minimap"},
        {0, NULL},
 };
 
@@ -20,20 +42,27 @@ const struct EnumString es_HudElementStat[] =
        {HUD_STAT_TEXT,   "text"},
        {HUD_STAT_NUMBER, "number"},
        {HUD_STAT_ITEM,   "item"},
+       {HUD_STAT_ITEM,   "precision"},
        {HUD_STAT_DIR,    "direction"},
        {HUD_STAT_ALIGN,  "alignment"},
        {HUD_STAT_OFFSET, "offset"},
        {HUD_STAT_WORLD_POS, "world_pos"},
+       {HUD_STAT_SIZE,    "size"},
+       {HUD_STAT_Z_INDEX, "z_index"},
+       {HUD_STAT_TEXT2,   "text2"},
+       {HUD_STAT_STYLE,   "style"},
        {0, NULL},
 };
 
 const struct EnumString es_HudBuiltinElement[] =
 {
-       {HUD_FLAG_HOTBAR_VISIBLE,    "hotbar"},
-       {HUD_FLAG_HEALTHBAR_VISIBLE, "healthbar"},
-       {HUD_FLAG_CROSSHAIR_VISIBLE, "crosshair"},
-       {HUD_FLAG_WIELDITEM_VISIBLE, "wielditem"},
-       {HUD_FLAG_BREATHBAR_VISIBLE, "breathbar"},
-       {HUD_FLAG_MINIMAP_VISIBLE,   "minimap"},
+       {HUD_FLAG_HOTBAR_VISIBLE,        "hotbar"},
+       {HUD_FLAG_HEALTHBAR_VISIBLE,     "healthbar"},
+       {HUD_FLAG_CROSSHAIR_VISIBLE,     "crosshair"},
+       {HUD_FLAG_WIELDITEM_VISIBLE,     "wielditem"},
+       {HUD_FLAG_BREATHBAR_VISIBLE,     "breathbar"},
+       {HUD_FLAG_MINIMAP_VISIBLE,       "minimap"},
+       {HUD_FLAG_MINIMAP_RADAR_VISIBLE, "minimap_radar"},
+       {HUD_FLAG_BASIC_DEBUG,           "basic_debug"},
        {0, NULL},
 };