From 56e50f4d587967698daeeed4f5530fb0dcfd45b8 Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Thu, 18 Apr 2019 14:21:25 +0100
Subject: [PATCH] Minor fixes

Former-commit-id: 54c2b050fd9be82916d66c872fa9ab5f5354f9dd
---
 voxygen/src/hud/mod.rs                | 2 +-
 voxygen/src/menu/char_selection/ui.rs | 2 +-
 voxygen/src/menu/main/ui.rs           | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs
index 026126e909..589b283f85 100644
--- a/voxygen/src/hud/mod.rs
+++ b/voxygen/src/hud/mod.rs
@@ -481,7 +481,7 @@ impl Hud {
     fn update_layout(&mut self) -> Vec<Event> {
         let mut events = Vec::new();
         let ref mut ui_widgets = self.ui.set_widgets();
-        let version = env!("Cargo_PKG_VERSION");
+        let version = env!("CARGO_PKG_VERSION");
 
         const TEXT_COLOR: Color = Color::Rgba(1.0, 1.0, 1.0, 1.0);
         const HP_COLOR: Color = Color::Rgba(0.33, 0.63, 0.0, 1.0);
diff --git a/voxygen/src/menu/char_selection/ui.rs b/voxygen/src/menu/char_selection/ui.rs
index 7a6e6cfe33..34ebd08c70 100644
--- a/voxygen/src/menu/char_selection/ui.rs
+++ b/voxygen/src/menu/char_selection/ui.rs
@@ -411,7 +411,7 @@ impl CharSelectionUi {
     fn update_layout(&mut self) -> Vec<Event> {
         let mut events = Vec::new();
         let ref mut ui_widgets = self.ui.set_widgets();
-        let version = env!("Cargo_PKG_VERSION");
+        let version = env!("CARGO_PKG_VERSION");
 
         // Character Selection /////////////////
         // Supposed functionality:
diff --git a/voxygen/src/menu/main/ui.rs b/voxygen/src/menu/main/ui.rs
index 0068a6e740..798c386182 100644
--- a/voxygen/src/menu/main/ui.rs
+++ b/voxygen/src/menu/main/ui.rs
@@ -2,6 +2,7 @@ use crate::{
     render::Renderer,
     ui::{self, ScaleMode, Ui},
     window::Window,
+    DEFAULT_PUBLIC_SERVER,
 };
 use common::assets;
 use conrod_core::{
@@ -152,7 +153,7 @@ impl MainMenuUi {
             font_metamorph,
             font_opensans,
             username: "Username".to_string(),
-            server_address: "veloren.mac94.de".to_string(),
+            server_address: DEFAULT_PUBLIC_SERVER.to_string(),
             login_error: None,
             connecting: None,
         }
@@ -161,7 +162,7 @@ impl MainMenuUi {
     fn update_layout(&mut self) -> Vec<Event> {
         let mut events = Vec::new();
         let ref mut ui_widgets = self.ui.set_widgets();
-        let version = env!("Cargo_PKG_VERSION");
+        let version = env!("CARGO_PKG_VERSION");
         // Background image, Veloren logo, Alpha-Version Label
         Image::new(self.imgs.bg)
             .middle_of(ui_widgets.window)