diff options
| author | Elias Fleckenstein <54945686+EliasFleckenstein03@users.noreply.github.com> | 2020-11-04 16:57:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-04 16:57:47 +0100 |
| commit | 3e16c3a78fff61c20e63ba730d15e94e3bb877b4 (patch) | |
| tree | c070350db219f2c4241d22bc31949685c7b42fe9 /src/hud.cpp | |
| parent | 5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (diff) | |
| parent | 6ccb5835ff55d85156be91473c598eca9d6cb9a6 (diff) | |
| download | dragonfireclient-3e16c3a78fff61c20e63ba730d15e94e3bb877b4.tar.xz | |
Merge branch 'master' into master
Diffstat (limited to 'src/hud.cpp')
| -rw-r--r-- | src/hud.cpp | 69 |
1 files changed, 36 insertions, 33 deletions
diff --git a/src/hud.cpp b/src/hud.cpp index 705d0cfb3..3079b5cd8 100644 --- a/src/hud.cpp +++ b/src/hud.cpp @@ -20,41 +20,44 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "hud.h" #include <cmath> -const struct EnumString es_HudElementType[] = { - {HUD_ELEM_IMAGE, "image"}, - {HUD_ELEM_TEXT, "text"}, - {HUD_ELEM_STATBAR, "statbar"}, - {HUD_ELEM_INVENTORY, "inventory"}, - {HUD_ELEM_WAYPOINT, "waypoint"}, - {HUD_ELEM_IMAGE_WAYPOINT, "image_waypoint"}, - {0, NULL}, +const struct EnumString es_HudElementType[] = +{ + {HUD_ELEM_IMAGE, "image"}, + {HUD_ELEM_TEXT, "text"}, + {HUD_ELEM_STATBAR, "statbar"}, + {HUD_ELEM_INVENTORY, "inventory"}, + {HUD_ELEM_WAYPOINT, "waypoint"}, + {HUD_ELEM_IMAGE_WAYPOINT, "image_waypoint"}, + {0, NULL}, }; -const struct EnumString es_HudElementStat[] = { - {HUD_STAT_POS, "position"}, - {HUD_STAT_POS, "pos"}, /* Deprecated, only for compatibility's sake */ - {HUD_STAT_NAME, "name"}, - {HUD_STAT_SCALE, "scale"}, - {HUD_STAT_TEXT, "text"}, - {HUD_STAT_NUMBER, "number"}, - {HUD_STAT_ITEM, "item"}, - {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"}, - {0, NULL}, +const struct EnumString es_HudElementStat[] = +{ + {HUD_STAT_POS, "position"}, + {HUD_STAT_POS, "pos"}, /* Deprecated, only for compatibility's sake */ + {HUD_STAT_NAME, "name"}, + {HUD_STAT_SCALE, "scale"}, + {HUD_STAT_TEXT, "text"}, + {HUD_STAT_NUMBER, "number"}, + {HUD_STAT_ITEM, "item"}, + {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"}, + {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_MINIMAP_RADAR_VISIBLE, "minimap_radar"}, - {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_MINIMAP_RADAR_VISIBLE, "minimap_radar"}, + {0, NULL}, }; |