make conditional CHINESE preprocessor def into global constant

This commit is contained in:
Marco Antonio J. Costa
2024-12-31 16:28:44 -03:00
parent 4624fe92f0
commit 5d19c1fe25
6 changed files with 13 additions and 6 deletions
@@ -55,6 +55,7 @@
#include "connect.h" #include "connect.h"
#include <language.hpp>
struct UILayout_BottomButtons struct UILayout_BottomButtons
{ {
-6
View File
@@ -4,12 +4,6 @@
#include "types.h" #include "types.h"
#include "Soldier Control.h" #include "Soldier Control.h"
#ifdef CHINESE //zwwoooooo: Chinese fonts relatively high , so to reduce the number of rows
#define MAX_MESSAGES_ON_MAP_BOTTOM 6
#else
#define MAX_MESSAGES_ON_MAP_BOTTOM 9
#endif
#ifdef JA2UB #ifdef JA2UB
extern INT8 gbExitingMapScreenToWhere; extern INT8 gbExitingMapScreenToWhere;
#endif #endif
+1
View File
@@ -115,6 +115,7 @@
#include "connect.h" //hayden #include "connect.h" //hayden
#include "InterfaceItemImages.h" #include "InterfaceItemImages.h"
#include "vobject.h" #include "vobject.h"
#include <language.hpp>
#ifdef JA2UB #ifdef JA2UB
#include "laptop.h" #include "laptop.h"
+1
View File
@@ -22,6 +22,7 @@
#include "GameSettings.h" #include "GameSettings.h"
#include "sgp_logger.h" #include "sgp_logger.h"
#include <language.hpp>
typedef struct typedef struct
{ {
UINT32 uiFont; UINT32 uiFont;
+2
View File
@@ -15,3 +15,5 @@ enum class Lang
} }
extern const i18n::Lang g_lang; extern const i18n::Lang g_lang;
extern const int MAX_MESSAGES_ON_MAP_BOTTOM;
+8
View File
@@ -22,3 +22,11 @@ const i18n::Lang g_lang{
i18n::Lang::ru i18n::Lang::ru
#endif #endif
}; };
const int MAX_MESSAGES_ON_MAP_BOTTOM{
#if defined(CHINESE) // zwwoooooo: Chinese fonts relatively high , so to reduce the number of rows
6
#else
9
#endif
};