From b2cf3c48fb02d8dddbcb3df66088e6ee2fae7e88 Mon Sep 17 00:00:00 2001
From: dP <dp@dpointer.org>
Date: Sun, 4 Feb 2024 23:10:49 +0530
Subject: [PATCH] Fix language files

---
 src/command_func.h   | 1 -
 src/lang/english.txt | 5 +----
 src/lang/german.txt  | 3 +--
 src/stdafx.h         | 6 ++++++
 src/window_gui.h     | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/command_func.h b/src/command_func.h
index c7f9bb3802..ce2c0c18d3 100644
--- a/src/command_func.h
+++ b/src/command_func.h
@@ -17,7 +17,6 @@
 #include "core/backup_type.hpp"
 #include "misc/endian_buffer.hpp"
 #include "tile_map.h"
-#include "date_func.h"
 #include "core/random_func.hpp"  // CM for _random debug print
 extern uint32 _frame_counter;
 
diff --git a/src/lang/english.txt b/src/lang/english.txt
index 3322f60fa5..195c5cb600 100644
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -468,12 +468,10 @@ STR_FILE_MENU_QUIT_GAME                                         :Abandon game
 STR_FILE_MENU_EXIT                                              :Exit
 
 # Map menu
-TODO length is gone
 STR_MAP_MENU_MAP_OF_WORLD                                       :Map of world
 STR_MAP_MENU_EXTRA_VIEWPORT                                     :Extra viewport
 STR_MAP_MENU_LINGRAPH_LEGEND                                    :Cargo flow legend
 STR_MAP_MENU_SIGN_LIST                                          :Sign list
-CM_STR_MAP_MENU_WATCH_COMPANY                                   :Watch Company
 
 # Town menu
 STR_TOWN_MENU_TOWN_DIRECTORY                                    :Town directory
@@ -530,9 +528,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU                              :Message history
 STR_NEWS_MENU_DELETE_ALL_MESSAGES                               :Delete all messages
 
 # About menu
-TODO length is gone
 STR_ABOUT_MENU_LAND_BLOCK_INFO                                  :Land area information
-CM_STR_ABOUT_MENU_LOGIN_WINDOW                                  :CityMania server login
 STR_ABOUT_MENU_HELP                                             :Help & manuals
 STR_ABOUT_MENU_TOGGLE_CONSOLE                                   :Toggle console
 STR_ABOUT_MENU_AI_DEBUG                                         :AI/Game script debug
@@ -6284,3 +6280,4 @@ CM_STR_CONFIG_SETTING_TYPE_DROPDOWN_CITYMANIA                   :CityMania patch
 CM_BUILDING_PREVIEW_COST_ENOUGH                                 :Cost
 
 CM_STR_NO_BLUEPRINT_IN_SLOT                                     :{WHITE}No blueprint in slot {NUM}
+CM_STR_ABOUT_MENU_LOGIN_WINDOW                                  :CityMania-Serverlogin
diff --git a/src/lang/german.txt b/src/lang/german.txt
index 6a9ca29adf..222ef62de0 100644
--- a/src/lang/german.txt
+++ b/src/lang/german.txt
@@ -456,7 +456,6 @@ STR_MAP_MENU_MAP_OF_WORLD                                       :Weltkarte
 STR_MAP_MENU_EXTRA_VIEWPORT                                     :Zusatzansicht
 STR_MAP_MENU_LINGRAPH_LEGEND                                    :Frachtverbindungen
 STR_MAP_MENU_SIGN_LIST                                          :Schilderliste
-CM_STR_MAP_MENU_WATCH_COMPANY                                   :Firma beobachten
 
 # Town menu
 STR_TOWN_MENU_TOWN_DIRECTORY                                    :Städteverzeichnis
@@ -514,7 +513,6 @@ STR_NEWS_MENU_DELETE_ALL_MESSAGES                               :Alle Nachrichte
 
 # About menu
 STR_ABOUT_MENU_LAND_BLOCK_INFO                                  :Gebietsinformationen
-CM_STR_ABOUT_MENU_LOGIN_WINDOW                                  :CityMania-Serverlogin
 STR_ABOUT_MENU_HELP                                             :Hilfe u. Anleitungen
 STR_ABOUT_MENU_TOGGLE_CONSOLE                                   :Konsole öffnen/schließen
 STR_ABOUT_MENU_AI_DEBUG                                         :KI-/Skript-Debug
@@ -6079,3 +6077,4 @@ CM_STR_INDUSTRY_TYPE_WITH_ID                                    :{STRING} {SILVE
 CM_STR_CONFIG_SETTING_TYPE_DROPDOWN_CITYMANIA                   :CityMania-Patchpack-Einstellungen
 
 CM_BUILDING_PREVIEW_COST_ENOUGH                                 :Kosten
+CM_STR_ABOUT_MENU_LOGIN_WINDOW                                  :CityMania-Serverlogin
diff --git a/src/stdafx.h b/src/stdafx.h
index 5fc27f4dcc..d63c760577 100644
--- a/src/stdafx.h
+++ b/src/stdafx.h
@@ -408,4 +408,10 @@ inline void free(const void *ptr)
 #	define IGNORE_UNINITIALIZED_WARNING_STOP
 #endif
 
+/* CityMania code start */
+#define uint8 uint8_t
+#define uint16 uint16_t
+#define uint32 uint32_t
+/* CityMania code end */
+
 #endif /* STDAFX_H */
diff --git a/src/window_gui.h b/src/window_gui.h
index 00cf5491f4..90987855c4 100644
--- a/src/window_gui.h
+++ b/src/window_gui.h
@@ -18,7 +18,7 @@
 #include "widget_type.h"
 #include "string_type.h"
 
-#include "station_base.h"  // CM
+// #include "station_base.h"  // CM
 
 /**
  * Flags to describe the look of the frame