Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enabled import for translations by default (#2535)

Browse Source 
Added possibility to override MAP_MAX_MSG with defines_pre.h
Added possibility to override LANG_ENABLE with defines_pre.h

Thanks to @Daegaladh for the idea with LANG_ENABLE.
This commit is contained in:
Lemongrass3110 2017-10-24 22:36:59 +02:00 committed by GitHub
parent cb760a0a42
commit 3b219565d3
10 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/msg_conf/map_msg.conf
View File

@ -1668,4 +1668,4 @@
1504: You've entered a PK Zone (safe until level %d).
//Custom translations
//import: conf/msg_conf/import/map_msg_eng_conf.txt
import: conf/msg_conf/import/map_msg_eng_conf.txt

2
conf/msg_conf/map_msg_chn.conf
View File

@ -1498,4 +1498,4 @@
1498: You cannot create a guild because you are in a clan.
//Custom translations
//import: conf/msg_conf/import/map_msg_chn_conf.txt
import: conf/msg_conf/import/map_msg_chn_conf.txt

2
conf/msg_conf/map_msg_frn.conf
View File

@ -1490,4 +1490,4 @@
1498: You cannot create a guild because you are in a clan.
//Custom translations
//import: conf/msg_conf/import/map_msg_frn_conf.txt
import: conf/msg_conf/import/map_msg_frn_conf.txt

2
conf/msg_conf/map_msg_idn.conf
View File

@ -1606,4 +1606,4 @@
1498: You cannot create a guild because you are in a clan.
//Bila ada terjemahan lain
//import: conf/msg_conf/import/map_msg_idn_conf.txt
import: conf/msg_conf/import/map_msg_idn_conf.txt

2
conf/msg_conf/map_msg_por.conf
View File

@ -1467,4 +1467,4 @@
1498: You cannot create a guild because you are in a clan.
//Custom translations
//import: conf/msg_conf/import/map_msg_por_conf.txt
import: conf/msg_conf/import/map_msg_por_conf.txt

2
conf/msg_conf/map_msg_rus.conf
View File

@ -1490,4 +1490,4 @@
1498: You cannot create a guild because you are in a clan.
// Ďîëüçîâŕňĺëüńęčé ďĺđĺâîä
//import: conf/msg_conf/import/map_msg_rus_conf.txt
import: conf/msg_conf/import/map_msg_rus_conf.txt

2
conf/msg_conf/map_msg_spn.conf
View File

@ -1470,4 +1470,4 @@
1498: You cannot create a guild because you are in a clan.
//Traducciones personalizadas
//import: conf/msg_conf/import/map_msg_spn_conf.txt
import: conf/msg_conf/import/map_msg_spn_conf.txt

2
conf/msg_conf/map_msg_tha.conf
View File

@ -1509,4 +1509,4 @@
1498: You cannot create a guild because you are in a clan.
//Custom translations
//import: conf/msg_conf/import/map_msg_tha_conf.txt
import: conf/msg_conf/import/map_msg_tha_conf.txt

13
src/common/msg_conf.h
View File

@ -4,6 +4,8 @@
#ifndef MSG_CONF_H
#define MSG_CONF_H
#include "../config/core.h"
#ifdef __cplusplus
extern "C" {
#endif
@ -20,10 +22,13 @@ enum lang_types {
LANG_THA = 0x100,
LANG_MAX
};
// Multilanguage System.
// Define which languages to enable (bitmask).
// 0xFFF will enable all, while 0x000 will enable English only.
#define LANG_ENABLE 0x000
#ifndef LANG_ENABLE
// Multilanguage System.
// Define which languages to enable (bitmask).
// 0xFFF will enable all, while 0x000 will enable English only.
#define LANG_ENABLE 0x000
#endif
//read msg in table
const char* _msg_txt(int msg_number,int size, char ** msg_table);

4
src/map/map.cpp
View File

@ -115,7 +115,9 @@ static int block_free_count = 0, block_free_lock = 0;
static struct block_list *bl_list[BL_LIST_MAX];
static int bl_list_count = 0;
#define MAP_MAX_MSG 1550
#ifndef MAP_MAX_MSG
#define MAP_MAX_MSG 1550
#endif
struct map_data map[MAX_MAP_PER_SERVER];
int map_num = 0;