Implemented official level update fix

Reviewed-on: metin2/client#2

bin/pack/locale_ro/locale/ro/guildbuildinglist.txt

@@ -1,67 +1,67 @@
 VNUM	TYPE	MODEL	NAME	REG_1	REG_2	REG_3	REG_4	XROT_LIMIT	YROT_LIMIT	ZROT_LIMIT	PRICE	MATERIALS	NPC	GROUP	DEPEND_GROUP	???????
-14013	FACILITY	jedan	Fegyverkovács 	-525	-525	525	525	0	0	360	20000000	90010,20/90011,30/90012,20	20044	2	1	1
-14014	FACILITY	jedan	Felszerelés kovács	-525	-525	525	525	0	0	360	20000000	90010,20/90011,30/90012,20	20045	2	1	1
-14015	FACILITY	jedan	Ékszerész	-525	-525	525	525	0	0	360	20000000	90010,20/90011,30/90012,20	20046	2	1	1
-14033	FACILITY	suryeonjang	Kiképzõ központ	-832.57	-472.99	832.57	472.99	0	0	360	20000000	90010,25/90011,25/90012,25	0	0	0	2
-14043	FACILITY	yonggwangro	Gyémánt kohó	-179.63	-199.89	179.63	199.89	0	0	360	20000000	90010,15/90011,20/90012,25	20060	3	1	1
-14045	FACILITY	yonggwangro	Fosszilis fa kohó	-179.63	-199.89	179.63	199.89	0	0	360	20000000	90010,15/90011,20/90012,25	20062	3	1	1
-14046	FACILITY	yonggwangro	Réz kohó	-179.63	-199.89	179.63	199.89	0	0	360	20000000	90010,15/90011,20/90012,25	20063	3	1	1
-14047	FACILITY	yonggwangro	Ezüst kohó	-179.63	-199.89	179.63	199.89	0	0	360	20000000	90010,15/90011,20/90012,25	20064	3	1	1
-14048	FACILITY	yonggwangro	Arany kohó	-179.63	-199.89	179.63	199.89	0	0	360	20000000	90010,15/90011,20/90012,25	20065	3	1	1
-14049	FACILITY	yonggwangro	Jáde kohó	-179.63	-199.89	179.63	199.89	0	0	360	20000000	90010,15/90011,20/90012,25	20066	3	1	1
-14050	FACILITY	yonggwangro	Ébenfa kohó	-179.63	-199.89	179.63	199.89	0	0	360	20000000	90010,15/90011,20/90012,25	20067	3	1	1
-14051	FACILITY	yonggwangro	Gyöngy kohó	-179.63	-199.89	179.63	199.89	0	0	360	20000000	90010,15/90011,20/90012,25	20068	3	1	1
-14052	FACILITY	yonggwangro	Fehérarany kohó	-179.63	-199.89	179.63	199.89	0	0	360	20000000	90010,15/90011,20/90012,25	20069	3	1	1
-14053	FACILITY	yonggwangro 	Kristály kohó	-179.63	-199.89	179.63	199.89	0	0	360	20000000	90010,15/90011,20/90012,25	20070	3	1	1
-14054	FACILITY	yonggwangro	Ametiszt kohó	-179.63	-199.89	179.63	199.89	0	0	360	20000000	90010,15/90011,20/90012,25	20071	3	1	1
-14055	FACILITY	yonggwangro	Mennyei könny kohó	-179.63	-199.89	179.63	199.89	0	0	360	20000000	90010,15/90011,20/90012,25	20072	3	1	1
-26992	FACILITY	yonggwangro	Lélekkristály kohó	-179.63	-199.89	179.63	199.89	0	0	360	20000000	90010,15/90011,20/90012,25	20072	3	1	1
-26993	FACILITY	yonggwangro	Rubin kohó	-179.63	-199.89	179.63	199.89	0	0	360	20000000	90010,15/90011,20/90012,25	20072	3	1	1
-26994	FACILITY	yonggwangro	Gránát kohó	-179.63	-199.89	179.63	199.89	0	0	360	20000000	90010,15/90011,20/90012,25	20072	3	1	1
-26995	FACILITY	yonggwangro	Smaragd kohó	-179.63	-199.89	179.63	199.89	0	0	360	20000000	90010,15/90011,20/90012,25	20072	3	1	1
-26996	FACILITY	yonggwangro	Zafír kohó	-179.63	-199.89	179.63	199.89	0	0	360	20000000	90010,15/90011,20/90012,25	20072	3	1	1
-14061	FACILITY	himuijedan_01	Az Erõ oltára	-523.91	-995.84	527.55	750.99	0	0	360	25000000	90010,25/90011,25/90012,25	20077	4	1	1
-14062	FACILITY	himuijedan_02	Az Erõ oltára	-586.17	-995.84	587.18	818.56	0	0	360	500000000	90010,50/90011,50/90012,50	20078	4	4	2
-14063	FACILITY	himuijedan_03	Az Erõ oltára	-664.7	-995.84	665.7	896.57	0	0	360	750000000	90010,75/90011,75/90012,75	20079	4	4	2
-14100	HEADQUARTER	a1-011-workhouse	Ház (1)	-676.52	-894.26	690.18	749.32	0	0	360	20000000	90010,20/90011,30/90012,25	0	1	0	1
-14101	OBJECT	a1-038-wall-corner	Kõfal (1-1)	-400	-153.53	156.48	400	0	0	360	2000000	90010,15/90011,5/90012,5	0	5	0	2
-14102	OBJECT	a1-038-wall-lin	Kõfal (1-2)	-200	-106.73	300	106.73	0	0	360	1000000	90010,15/90011,5/90012,5	0	5	0	2
-14103	OBJECT	a1-038-wall-lin2	Kõfal (1-3)	-500	-106.73	500	106.73	0	0	360	1000000	90010,15/90011,5/90012,5	0	5	0	2
-14104	OBJECT	a1-038-wall-door	Kapu (1)	-1000	-274.73	1000	274.73	0	0	360	2500000	90010,5/90011,15/90012,10	0	5	0	2
-14105	BUILDIN	a1-set	Fal (1)	-1000	-274.73	1000	274.73	0	0	360	2500000	90010,5/90011,15/90012,10	0	5	0	1
-14110	HEADQUARTER	b1-011-workhouse	Ház (2)	-678.76	-894.26	687.94	749.32	0	0	360	20000000	90010,20/90011,30/90012,25	0	1	0	1
-14111	OBJECT	b1-038-wall-corner	Kõfal (2-1)	-400	-153.53	156.48	400	0	0	360	2000000	90010,15/90011,5/90012,5	0	5	0	2
-14112	OBJECT	b1-038-wall-lin	Kõfal (2-2)	-200	-106.73	300	106.73	0	0	360	1000000	90010,15/90011,5/90012,5	0	5	0	2
-14113	OBJECT	b1-038-wall-lin2	Kõfal (2-3)	-500	-106.73	500	106.73	0	0	360	1000000	90010,15/90011,5/90012,5	0	5	0	2
-14114	OBJECT	b1-038-wall-door	Kapu (3)	-1000	-274.73	1000	274.73	0	0	360	2500000	90010,5/90011,15/90012,10	0	5	0	2
-14115	BUILDIN	b1-set	Fal (2)	-1000	-274.73	1000	274.73	0	0	360	2500000	90010,5/90011,15/90012,10	0	5	0	1
-14120	HEADQUARTER	c1-011-workhouse	Ház (3)	-676.52	-894.26	690.18	749.32	0	0	360	20000000	90010,20/90011,30/90012,25	0	1	0	1
-14121	OBJECT	c1-038-wall-corner	Kõfal (3-1)	-400	-153.53	156.48	400	0	0	360	2000000	90010,15/90011,5/90012,5	0	5	0	2
-14122	OBJECT	c1-038-wall-lin	Kõfal (3-2)	-200	-106.73	300	106.73	0	0	360	1000000	90010,15/90011,5/90012,5	0	5	0	2
-14123	OBJECT	c1-038-wall-lin2	Kõfal (3-3)	-500	-106.73	500	106.73	0	0	360	1000000	90010,15/90011,5/90012,5	0	5	0	2
-14124	OBJECT	c1-038-wall-door	Kapu (3)	-1000	-274.73	1000	274.73	0	0	360	2500000	90010,5/90011,15/90012,10	0	5	0	2
-14125	BUILDIN	c1-set	Fal (3)	-1000	-274.73	1000	274.73	0	0	360	2500000	90010,5/90011,15/90012,10	0	5	0	1
-14200	OBJECT	guild_symbol	Céh jelvény	-45.9	-9.44	42.68	40.13	0	0	360	3000000	90011,5/90012,5	0	0	1	1
-14201	WALL	fence01_door01	Homlokzati fal	-1000	-54	1000	20	0	0	360	3000000	"90010.50"	0	0	1	1
-14202	WALL	fence01_back01	Hátsó fal	-1000	-18	1000	18	0	0	360	3000000	"90010.50"	0	0	1	1
-14203	WALL	fence01_left01	Bal oldali fal	-19	-1362	19	1362	0	0	360	3000000	"90010.50"	0	0	1	1
-14204	WALL	fence01_right01	Jobb oldali fal	-18	-1362	18	1362	0	0	360	3000000	"90010.50"	0	0	1	1
-14300	OBJECT	general_obj_stone01	Kõ1	-116.04	-118.44	116.04	118.44	0	0	360	300000	90010,5	0	0	0	1
-14301	OBJECT	general_obj_stone02	Kõ2	-118.05	-132.67	118.05	132.67	0	0	360	300000	90010,5	0	0	0	1
-14302	OBJECT	general_obj_stone03	Kõ3	-133.43	-102.96	133.43	102.96	0	0	360	300000	90010,7	0	0	0	1
-14303	OBJECT	general_obj_stone04	Kõ4	-104.21	-117.82	104.21	117.82	0	0	360	300000	90010,7	0	0	0	1
-14304	OBJECT	general_obj_stone05	Kõ5	-171.59	-145.52	171.59	145.52	0	0	360	300000	90010,7	0	0	0	1
-14305	OBJECT	general_obj_stone06	Kõ6	-192.74	-201.58	192.74	201.58	0	0	360	300000	90010,8	0	0	0	1
-14306	OBJECT	general_obj_stone07	Kõ7	-183.58	-184.01	183.58	184.01	0	0	360	300000	90010,8	0	0	0	1
-14307	OBJECT	general_obj_stone08	Kõ8	-66.89	-56.67	66.89	56.67	0	0	360	300000	90010,8	0	0	0	1
-14308	OBJECT	general_obj_stone09	Kõ9	-65.87	-53.47	65.87	53.47	0	0	360	300000	90010,9	0	0	0	1
-14309	OBJECT	general_obj_stone10	Kõ10	-182.17	-123.03	182.17	123.03	0	0	360	300000	90010,9	0	0	0	1
-14400	OBJECT	B1_PagodaTree_RT	Fa1					0	0	360	2000000	90011,5	0	0	0	1
-14401	OBJECT	B1_PagodaTree_RT3	Fa2					0	0	360	2000000	90011,5	0	0	0	1
-14402	OBJECT	B1_Sassafras_RT_Fall	Fa3					0	0	360	2000000	90011,7	0	0	0	1
-14403	OBJECT	B1_Sassafras_RT_Fall2	Fa4					0	0	360	2000000	90011,7	0	0	0	1
-14404	OBJECT	B3_ShingleOak_RT2	Fa5					0	0	360	2000000	90011,7	0	0	0	1
-14405	OBJECT	B2_IvySpy_RT	Fa6					0	0	360	2000000	90011,9	0	0	0	1
-14406	OBJECT	B2_IvySpy_RT4	Fa7					0	0	360	2000000	90011,9	0	0	0	1
-14407	OBJECT	B2_JapaneseMaple_RT_Fall	Fa8					0	0	360	2000000	90011,9	0	0	0	1
-14408	OBJECT	B2_JapaneseMaple_RT_Fall2	Fa9					0	0	360	2000000	90011,9	0	0	0	1
+14013	FACILITY	jedan	Prelucrator de arme	-525	-525	525	525	0	0	360	20000000	90010,20/90011,30/90012,20	20044	2	1	1
+14014	FACILITY	jedan	Armurier	-525	-525	525	525	0	0	360	20000000	90010,20/90011,30/90012,20	20045	2	1	1
+14015	FACILITY	jedan	Bijutier	-525	-525	525	525	0	0	360	20000000	90010,20/90011,30/90012,20	20046	2	1	1
+14033	FACILITY	suryeonjang	Punct de Instruire	-832.57	-472.99	832.57	472.99	0	0	360	20000000	90010,25/90011,25/90012,25	0	0	0	2
+14043	FACILITY	yonggwangro	Prelucrator diamante	-179.63	-199.89	179.63	199.89	0	0	360	20000000	90010,15/90011,20/90012,25	20060	3	1	1
+14045	FACILITY	yonggwangro	Cuptor de lemn	-179.63	-199.89	179.63	199.89	0	0	360	20000000	90010,15/90011,20/90012,25	20062	3	1	1
+14046	FACILITY	yonggwangro	Turnatorie de cupru	-179.63	-199.89	179.63	199.89	0	0	360	20000000	90010,15/90011,20/90012,25	20063	3	1	1
+14047	FACILITY	yonggwangro	Prelucrator argint	-179.63	-199.89	179.63	199.89	0	0	360	20000000	90010,15/90011,20/90012,25	20064	3	1	1
+14048	FACILITY	yonggwangro	Prelucrator aur	-179.63	-199.89	179.63	199.89	0	0	360	20000000	90010,15/90011,20/90012,25	20065	3	1	1
+14049	FACILITY	yonggwangro	Prelucrator de jad	-179.63	-199.89	179.63	199.89	0	0	360	20000000	90010,15/90011,20/90012,25	20066	3	1	1
+14050	FACILITY	yonggwangro	Prelucrator abanos	-179.63	-199.89	179.63	199.89	0	0	360	20000000	90010,15/90011,20/90012,25	20067	3	1	1
+14051	FACILITY	yonggwangro	Prelucrator de perle	-179.63	-199.89	179.63	199.89	0	0	360	20000000	90010,15/90011,20/90012,25	20068	3	1	1
+14052	FACILITY	yonggwangro	Prelucrator aur alb	-179.63	-199.89	179.63	199.89	0	0	360	20000000	90010,15/90011,20/90012,25	20069	3	1	1
+14053	FACILITY	yonggwangro	Prelucrator cristal	-179.63	-199.89	179.63	199.89	0	0	360	20000000	90010,15/90011,20/90012,25	20070	3	1	1
+14054	FACILITY	yonggwangro	Prelucrator cuart	-179.63	-199.89	179.63	199.89	0	0	360	20000000	90010,15/90011,20/90012,25	20071	3	1	1
+14055	FACILITY	yonggwangro	Topitor Celest	-179.63	-199.89	179.63	199.89	0	0	360	20000000	90010,15/90011,20/90012,25	20072	3	1	1
+26992	FACILITY	yonggwangro	Prel. Cristal Spirit	-179.63	-199.89	179.63	199.89	0	0	360	20000000	90010,15/90011,20/90012,25	20072	3	1	1
+26993	FACILITY	yonggwangro	Prelucrator Rubin	-179.63	-199.89	179.63	199.89	0	0	360	20000000	90010,15/90011,20/90012,25	20072	3	1	1
+26994	FACILITY	yonggwangro	Prelucrator Granat	-179.63	-199.89	179.63	199.89	0	0	360	20000000	90010,15/90011,20/90012,25	20072	3	1	1
+26995	FACILITY	yonggwangro	Prelucrator Smarald	-179.63	-199.89	179.63	199.89	0	0	360	20000000	90010,15/90011,20/90012,25	20072	3	1	1
+26996	FACILITY	yonggwangro	Prelucrator Safir	-179.63	-199.89	179.63	199.89	0	0	360	20000000	90010,15/90011,20/90012,25	20072	3	1	1
+14061	FACILITY	himuijedan_01	Altarul Puterii	-523.91	-995.84	527.55	750.99	0	0	360	25000000	90010,25/90011,25/90012,25	20077	4	1	1
+14062	FACILITY	himuijedan_02	Altarul Puterii	-586.17	-995.84	587.18	818.56	0	0	360	500000000	90010,50/90011,50/90012,50	20078	4	4	2
+14063	FACILITY	himuijedan_03	Altarul Puterii	-664.7	-995.84	665.7	896.57	0	0	360	750000000	90010,75/90011,75/90012,75	20079	4	4	2
+14100	HEADQUARTER	a1-011-workhouse	Casa(1)	-676.52	-894.26	690.18	749.32	0	0	360	20000000	90010,20/90011,30/90012,25	0	1	0	1
+14101	OBJECT	a1-038-wall-corner	Zid de piatra(1-1)	-400	-153.53	156.48	400	0	0	360	2000000	90010,15/90011,5/90012,5	0	5	0	2
+14102	OBJECT	a1-038-wall-lin	Zid de piatra(1-2)	-200	-106.73	300	106.73	0	0	360	1000000	90010,15/90011,5/90012,5	0	5	0	2
+14103	OBJECT	a1-038-wall-lin2	Zid de piatra(1-3)	-500	-106.73	500	106.73	0	0	360	1000000	90010,15/90011,5/90012,5	0	5	0	2
+14104	OBJECT	a1-038-wall-door	Poarta(1)	-1000	-274.73	1000	274.73	0	0	360	2500000	90010,5/90011,15/90012,10	0	5	0	2
+14105	BUILDIN	a1-set	Zid(1)	-1000	-274.73	1000	274.73	0	0	360	2500000	90010,5/90011,15/90012,10	0	5	0	1
+14110	HEADQUARTER	b1-011-workhouse	Casa(2)	-678.76	-894.26	687.94	749.32	0	0	360	20000000	90010,20/90011,30/90012,25	0	1	0	1
+14111	OBJECT	b1-038-wall-corner	Zid de piatra(2-1)	-400	-153.53	156.48	400	0	0	360	2000000	90010,15/90011,5/90012,5	0	5	0	2
+14112	OBJECT	b1-038-wall-lin	Zid de piatra(2-2)	-200	-106.73	300	106.73	0	0	360	1000000	90010,15/90011,5/90012,5	0	5	0	2
+14113	OBJECT	b1-038-wall-lin2	Zid de piatra(2-3)	-500	-106.73	500	106.73	0	0	360	1000000	90010,15/90011,5/90012,5	0	5	0	2
+14114	OBJECT	b1-038-wall-door	Poarta(2)	-1000	-274.73	1000	274.73	0	0	360	2500000	90010,5/90011,15/90012,10	0	5	0	2
+14115	BUILDIN	b1-set	Zid(2)	-1000	-274.73	1000	274.73	0	0	360	2500000	90010,5/90011,15/90012,10	0	5	0	1
+14120	HEADQUARTER	c1-011-workhouse	Casa(3)	-676.52	-894.26	690.18	749.32	0	0	360	20000000	90010,20/90011,30/90012,25	0	1	0	1
+14121	OBJECT	c1-038-wall-corner	Zid de piatra(3-1)	-400	-153.53	156.48	400	0	0	360	2000000	90010,15/90011,5/90012,5	0	5	0	2
+14122	OBJECT	c1-038-wall-lin	Zid de piatra(3-2)	-200	-106.73	300	106.73	0	0	360	1000000	90010,15/90011,5/90012,5	0	5	0	2
+14123	OBJECT	c1-038-wall-lin2	Zid de piatra(3-3)	-500	-106.73	500	106.73	0	0	360	1000000	90010,15/90011,5/90012,5	0	5	0	2
+14124	OBJECT	c1-038-wall-door	Poarta(3)	-1000	-274.73	1000	274.73	0	0	360	2500000	90010,5/90011,15/90012,10	0	5	0	2
+14125	BUILDIN	c1-set	Zid (3)	-1000	-274.73	1000	274.73	0	0	360	2500000	90010,5/90011,15/90012,10	0	5	0	1
+14200	OBJECT	guild_symbol	Simbolul Aliantei	-45.9	-9.44	42.68	40.13	0	0	360	3000000	90011,5/90012,5	0	0	1	1
+14201	WALL	fence01_door01	Perete din fata	-1000	-54	1000	20	0	0	360	3000000	"90010.50"	0	0	1	1
+14202	WALL	fence01_back01	Perete din spate	-1000	-18	1000	18	0	0	360	3000000	"90010.50"	0	0	1	1
+14203	WALL	fence01_left01	Perete din stanga	-19	-1362	19	1362	0	0	360	3000000	"90010.50"	0	0	1	1
+14204	WALL	fence01_right01	Perete din dreapta	-18	-1362	18	1362	0	0	360	3000000	"90010.50"	0	0	1	1
+14300	OBJECT	general_obj_stone01	Piatra1	-116.04	-118.44	116.04	118.44	0	0	360	300000	90010,5	0	0	0	1
+14301	OBJECT	general_obj_stone02	Piatra2	-118.05	-132.67	118.05	132.67	0	0	360	300000	90010,5	0	0	0	1
+14302	OBJECT	general_obj_stone03	Piatrã3	-133.43	-102.96	133.43	102.96	0	0	360	300000	90010,7	0	0	0	1
+14303	OBJECT	general_obj_stone04	Piatrã4	-104.21	-117.82	104.21	117.82	0	0	360	300000	90010,7	0	0	0	1
+14304	OBJECT	general_obj_stone05	Piatrã5	-171.59	-145.52	171.59	145.52	0	0	360	300000	90010,7	0	0	0	1
+14305	OBJECT	general_obj_stone06	Piatrã6	-192.74	-201.58	192.74	201.58	0	0	360	300000	90010,8	0	0	0	1
+14306	OBJECT	general_obj_stone07	Piatrã7	-183.58	-184.01	183.58	184.01	0	0	360	300000	90010,8	0	0	0	1
+14307	OBJECT	general_obj_stone08	Piatrã8	-66.89	-56.67	66.89	56.67	0	0	360	300000	90010,8	0	0	0	1
+14308	OBJECT	general_obj_stone09	Piatrã9	-65.87	-53.47	65.87	53.47	0	0	360	300000	90010,9	0	0	0	1
+14309	OBJECT	general_obj_stone10	Piatrã10	-182.17	-123.03	182.17	123.03	0	0	360	300000	90010,9	0	0	0	1
+14400	OBJECT	B1_PagodaTree_RT	Padure1					0	0	360	2000000	90011,5	0	0	0	1
+14401	OBJECT	B1_PagodaTree_RT3	Padure2					0	0	360	2000000	90011,5	0	0	0	1
+14402	OBJECT	B1_Sassafras_RT_Fall	Padure3					0	0	360	2000000	90011,7	0	0	0	1
+14403	OBJECT	B1_Sassafras_RT_Fall2	Padure4					0	0	360	2000000	90011,7	0	0	0	1
+14404	OBJECT	B3_ShingleOak_RT2	Padure5					0	0	360	2000000	90011,7	0	0	0	1
+14405	OBJECT	B2_IvySpy_RT	Padure6					0	0	360	2000000	90011,9	0	0	0	1
+14406	OBJECT	B2_IvySpy_RT4	Padure7					0	0	360	2000000	90011,9	0	0	0	1
+14407	OBJECT	B2_JapaneseMaple_RT_Fall	Padure8					0	0	360	2000000	90011,9	0	0	0	1
+14408	OBJECT	B2_JapaneseMaple_RT_Fall2	Padure9					0	0	360	2000000	90011,9	0	0	0	1

bin/pack/root/localeinfo.py

@@ -9,7 +9,7 @@ MAP_TREE2 = "MAP_TREE2"
 BLEND_POTION_NO_TIME = "BLEND_POTION_NO_TIME"
 BLEND_POTION_NO_INFO = "BLEND_POTION_NO_INFO"
 
-APP_TITLE = "METIN2"
+APP_TITLE = "Metin2"
 
 GUILD_HEADQUARTER = "Main Building"
 GUILD_FACILITY = "Facility"

src/UserInterface/InstanceBaseEffect.cpp

@@ -656,6 +656,8 @@ void CInstanceBase::UpdateTextTailLevel(DWORD level)
 	//static D3DXCOLOR s_kLevelColor = D3DXCOLOR(119.0f/255.0f, 246.0f/255.0f, 168.0f/255.0f, 1.0f);
 	static D3DXCOLOR s_kLevelColor = D3DXCOLOR(152.0f/255.0f, 255.0f/255.0f, 51.0f/255.0f, 1.0f);
 
+	m_dwLevel = level;
+
 	char szText[256];
 	sprintf(szText, "Lv %d", level);
 	CPythonTextTail::Instance().AttachLevel(GetVirtualID(), szText, s_kLevelColor);

src/UserInterface/Locale.cpp

@@ -18,12 +18,6 @@ const char* LSS_GLOBAL		= "GLOBAL";
 
 static bool IS_CHEONMA = false;
 
-#ifndef LSS_SECURITY_KEY
-#define LSS_SECURITY_KEY	"testtesttesttest"
-#endif
-
-std::string __SECURITY_KEY_STRING__ = LSS_SECURITY_KEY;
-
 char	MULTI_LOCALE_SERVICE[256]	= "YMIR";
 char	MULTI_LOCALE_PATH[256]		= "locale/ymir";
 char	MULTI_LOCALE_NAME[256]		= "ymir";
@@ -165,11 +159,6 @@ int LocaleService_GetSkillPower(unsigned level)
 	return INTERNATIONAL_SKILL_POWERS[level];
 }
 
-const char*	LocaleService_GetSecurityKey()
-{
-	return __SECURITY_KEY_STRING__.c_str();
-}
-
 // CHEONMA
 void LocaleService_SetCHEONMA(bool isEnable)
 {
@@ -243,12 +232,6 @@ void LocaleService_ForceSetLocale(const char* name, const char* localePath)
 {
 	strcpy(MULTI_LOCALE_NAME, name);
 	strcpy(MULTI_LOCALE_PATH, localePath);
-
-	// 기존 천마 서버로 접속시에는 security key 변경 (WE 버전 클라로 천마서버 접속하기 위함)
-	if (0 == stricmp(name, "ymir"))
-		__SECURITY_KEY_STRING__ = "testtesttesttest";
-	if (0 == stricmp(name, "we_korea"))
-		__SECURITY_KEY_STRING__ = "1234abcd5678efgh";
 }
 
 #if defined(LOCALE_SERVICE_GLOBAL)
@@ -257,36 +240,35 @@ struct SLOCALEDATA
 	const char* szServiceName;
 	const char* szLocaleName;
 	WORD		wCodePage;
-	const char*	szSecurityKey;
 } gs_stLocaleData[] = {
-	{ LSS_YMIR,		"ymir",			949,	"testtesttesttest"	},		// Korea
-	{ LSS_EUROPE,	"de",			1252,	"1234abcd5678efgh"	},		// GameForge (Germany)
-	{ LSS_EUROPE,	"en",			1252,	"1234abcd5678efgh"	},		// GameForge (United Kingdom)
-	{ LSS_EUROPE,	"us",			1252,	"1234abcd5678efgh"	},		// GameForge (USA)
-	{ LSS_EUROPE,	"es",			1252,	"1234abcd5678efgh"	},		// GameForge (Spain)
-	{ LSS_EUROPE,	"it",			1252,	"1234abcd5678efgh"	},		// GameForge (Italy)
-	{ LSS_EUROPE,	"fr",			1252,	"1234abcd5678efgh"	},		// GameForge (France)
-	{ LSS_EUROPE,	"pt",			1252,	"1234abcd5678efgh"	},		// GameForge (Portugal)
-	{ LSS_EUROPE,	"tr",			1253,	"1234abcd5678efgh"	},		// GameForge (Greece)
-	{ LSS_EUROPE,	"pl",			1250,	"1234abcd5678efgh"	},		// GameForge (Poland)
-	{ LSS_EUROPE,	"tr",			1254,	"1234abcd5678efgh"	},		// GameForge (Turkey)
-	{ LSS_EUROPE,	"dk",			1252,	"1234abcd5678efgh"	},		// GameForge (Demmark)
-	{ LSS_EUROPE,	"ae",			1256,	"1234abcd5678efgh"	},		// GameForge (United Arab Emirate)
-	{ LSS_EUROPE,	"mx",			1252,	"1234abcd5678efgh"	},		// GameForge (Mexico)
-	{ LSS_EUROPE,	"nl",			1252,	"1234abcd5678efgh"	},		// GameForge (Netherlands)
-	{ LSS_EUROPE,	"cz",			1252,	"1234abcd5678efgh"	},		// GameForge (Czech Republic)
-	{ LSS_EUROPE,	"ru",			1251,	"1234abcd5678efgh"	},		// GameForge (Russian Federation)
-	{ LSS_EUROPE,	"hu",			1250,	"1234abcd5678efgh"	},		// GameForge (Hungary)
-	{ LSS_EUROPE,	"ro",			1250,	"1234abcd5678efgh"	},		// GameForge (Romania)
-	{ LSS_EUROPE,	"ca",			1252,	"testtesttesttest"	},		// Z8Games (Canada)
-	{ LSS_EUROPE,	"sg",			1252,	"testtesttesttest"	},		// TEC (Singapore)
-	{ LSS_JAPAN,	"japan",		932,	"testtesttesttest"	},		// Japan
-	{ LSS_EUROPE,	"br",			1252,	"testtesttesttest"	},		// OnGame (Brazil)
-	{ LSS_HONGKONG,	"hongkong",		950,	"testtesttesttest"	},		// HongKong & Taiwan
-	{ LSS_NEWCIBN,	"newcibn",		936,	"testtesttesttest"	},		// CIBN (Free world)
-	{ LSS_ENGLISH,	"english",		949,	"testtesttesttest"	},		// English (Obsoleted)
-	{ LSS_YMIR,		"kr",			949,	"testtesttesttest"	},		// Korea (Obsoleted)
-	{ NULL,			NULL,			0,		"testtesttesttest"	}
+	{ LSS_YMIR,		"ymir",			949		},		// Korea
+	{ LSS_EUROPE,	"de",			1252	},		// GameForge (Germany)
+	{ LSS_EUROPE,	"en",			1252	},		// GameForge (United Kingdom)
+	{ LSS_EUROPE,	"us",			1252	},		// GameForge (USA)
+	{ LSS_EUROPE,	"es",			1252	},		// GameForge (Spain)
+	{ LSS_EUROPE,	"it",			1252	},		// GameForge (Italy)
+	{ LSS_EUROPE,	"fr",			1252	},		// GameForge (France)
+	{ LSS_EUROPE,	"pt",			1252	},		// GameForge (Portugal)
+	{ LSS_EUROPE,	"tr",			1253	},		// GameForge (Greece)
+	{ LSS_EUROPE,	"pl",			1250	},		// GameForge (Poland)
+	{ LSS_EUROPE,	"tr",			1254	},		// GameForge (Turkey)
+	{ LSS_EUROPE,	"dk",			1252	},		// GameForge (Demmark)
+	{ LSS_EUROPE,	"ae",			1256	},		// GameForge (United Arab Emirate)
+	{ LSS_EUROPE,	"mx",			1252	},		// GameForge (Mexico)
+	{ LSS_EUROPE,	"nl",			1252	},		// GameForge (Netherlands)
+	{ LSS_EUROPE,	"cz",			1252	},		// GameForge (Czech Republic)
+	{ LSS_EUROPE,	"ru",			1251	},		// GameForge (Russian Federation)
+	{ LSS_EUROPE,	"hu",			1250	},		// GameForge (Hungary)
+	{ LSS_EUROPE,	"ro",			1250	},		// GameForge (Romania)
+	{ LSS_EUROPE,	"ca",			1252	},		// Z8Games (Canada)
+	{ LSS_EUROPE,	"sg",			1252	},		// TEC (Singapore)
+	{ LSS_JAPAN,	"japan",		932		},		// Japan
+	{ LSS_EUROPE,	"br",			1252	},		// OnGame (Brazil)
+	{ LSS_HONGKONG,	"hongkong",		950		},		// HongKong & Taiwan
+	{ LSS_NEWCIBN,	"newcibn",		936		},		// CIBN (Free world)
+	{ LSS_ENGLISH,	"english",		949		},		// English (Obsoleted)
+	{ LSS_YMIR,		"kr",			949		},		// Korea (Obsoleted)
+	{ NULL,			NULL,			0		}
 };
 
 const char* LocaleService_GetName()
@@ -379,8 +361,6 @@ bool LocaleService_LoadGlobal(HINSTANCE hInstance)
 	strcpy(MULTI_LOCALE_NAME, gs_stLocaleData[gs_iLocale].szLocaleName);
 	sprintf(MULTI_LOCALE_PATH, "locale/%s", gs_stLocaleData[gs_iLocale].szLocaleName);
 	MULTI_LOCALE_CODE = gs_stLocaleData[gs_iLocale].wCodePage;
-	if(gs_stLocaleData[gs_iLocale].szSecurityKey)
-		__SECURITY_KEY_STRING__ = gs_stLocaleData[gs_iLocale].szSecurityKey;
 	return true;
 }
 #else

src/UserInterface/Locale.h

@@ -1,6 +1,12 @@
 #pragma once
 
-#include "Locale_inc.h"
+#define LOCALE_SERVICE_EUROPE
+
+#define ENABLE_COSTUME_SYSTEM
+#define ENABLE_ENERGY_SYSTEM
+#define ENABLE_DRAGON_SOUL_SYSTEM
+#define ENABLE_NEW_EQUIPMENT_SYSTEM	
+
 
 bool		LocaleService_IsYMIR();
 bool		LocaleService_IsJAPAN();
@@ -9,13 +15,11 @@ bool		LocaleService_IsHONGKONG();
 bool		LocaleService_IsTAIWAN();
 bool		LocaleService_IsNEWCIBN();
 bool		LocaleService_IsEUROPE();
-bool		LocaleService_IsWorldEdition();
 
 unsigned	LocaleService_GetCodePage();
 const char* LocaleService_GetName();
 const char*	LocaleService_GetLocaleName();
 const char*	LocaleService_GetLocalePath();
-const char*	LocaleService_GetSecurityKey();
 BOOL		LocaleService_IsLeadByte( const char chByte );
 int			LocaleService_StringCompareCI( LPCSTR szStringLeft, LPCSTR szStringRight, size_t sizeLength );
 

src/UserInterface/Locale_inc.h

@@ -1,4 +0,0 @@
-#define LOCALE_SERVICE_SINGAPORE			// 教啊弃
-#define ENABLE_COSTUME_SYSTEM
-#define ENABLE_ENERGY_SYSTEM
-#define ENABLE_NEW_EQUIPMENT_SYSTEM

src/UserInterface/Locale_inc_BR.h

@@ -1,5 +0,0 @@
-#define LOCALE_SERVICE_BRAZIL				// 브라질
-
-#define ENABLE_COSTUME_SYSTEM
-#define ENABLE_ENERGY_SYSTEM
-#define ENABLE_DRAGON_SOUL_SYSTEM

src/UserInterface/Locale_inc_CA.h

@@ -1,4 +0,0 @@
-#define LOCALE_SERVICE_CANADA				// 캐나다
-
-#define ENABLE_COSTUME_SYSTEM
-#define ENABLE_ENERGY_SYSTEM

src/UserInterface/Locale_inc_EU.h

@@ -1,3 +0,0 @@
-#define LOCALE_SERVICE_EUROPE				// 유럽
-
-#define LSS_SECURITY_KEY		"1234abcd5678efgh"

src/UserInterface/Locale_inc_EU2.h

@@ -1,11 +0,0 @@
-#define LOCALE_SERVICE_EUROPE				// À¯·´
-
-#define LSS_SECURITY_KEY					"1234abcd5678efgh"
-
-#define ENABLE_COSTUME_SYSTEM
-
-#define ENABLE_ENERGY_SYSTEM
-
-#define ENABLE_DRAGON_SOUL_SYSTEM
-#define ENABLE_NEW_EQUIPMENT_SYSTEM	
-

src/UserInterface/Locale_inc_GB.h

@@ -1,3 +0,0 @@
-#define LOCALE_SERVICE_GLOBAL			// GLOBAL version
-
-#define USE_RELATIVE_PATH

src/UserInterface/Locale_inc_HK.h

@@ -1,2 +0,0 @@
-#define LOCALE_SERVICE_HONGKONG			// 全尼
-

src/UserInterface/Locale_inc_JP.h

@@ -1,8 +0,0 @@
-#define LOCALE_SERVICE_WE_JAPAN				// World Edition(유럽 버젼) 버젼의 일본
-#define LOCALE_SERVICE_EUROPE				// 유럽
-
-#define LSS_SECURITY_KEY		"1234abcd5678efgh"
-
-#define ENABLE_COSTUME_SYSTEM
-#define ENABLE_ENERGY_SYSTEM
-#define USE_OPENID

src/UserInterface/Locale_inc_KO.h

@@ -1,6 +0,0 @@
-#include "Locale_inc_EU.h"
-
-#define ENABLE_COSTUME_SYSTEM
-#define ENABLE_ENERGY_SYSTEM
-#define ENABLE_DRAGON_SOUL_SYSTEM
-#define ENABLE_NEW_EQUIPMENT_SYSTEM

src/UserInterface/Locale_inc_KO_DEV.h

@@ -1,5 +0,0 @@
-#define LOCALE_SERVICE_YMIR					// Korean
-
-#define LOCALE_SERVICE_STAGE_DEVELOPMENT
-
-#define USE_RELATIVE_PATH

src/UserInterface/Locale_inc_NEWCIBN.h

@@ -1,6 +0,0 @@
-#define LOCALE_SERVICE_NEWCIBN			// 중국 자유세계
-
-#define ENABLE_COSTUME_SYSTEM
-#define ENABLE_ENERGY_SYSTEM
-#define ENABLE_DRAGON_SOUL_SYSTEM
-#define ENABLE_NEW_EQUIPMENT_SYSTEM

src/UserInterface/Locale_inc_SG.h

@@ -1,3 +0,0 @@
-#define LOCALE_SERVICE_SINGAPORE			// 教啊弃
-#define ENABLE_COSTUME_SYSTEM
-#define ENABLE_ENERGY_SYSTEM

src/UserInterface/Locale_inc_VI.h

@@ -1 +0,0 @@
-#define LOCALE_SERVICE_VIETNAM			// 베트남

src/UserInterface/Locale_inc_dev.h

@@ -1,6 +0,0 @@
-#include "Locale_inc_EU.h"
-
-#define ENABLE_COSTUME_SYSTEM
-#define ENABLE_ENERGY_SYSTEM
-#define ENABLE_DRAGON_SOUL_SYSTEM
-#define ENABLE_NEW_EQUIPMENT_SYSTEM

src/UserInterface/PythonNetworkStreamPhaseGame.cpp

@@ -1524,6 +1524,12 @@ bool CPythonNetworkStream::RecvPointChange()
 			}
 		}
 	}
+	else if (POINT_LEVEL == PointChange.Type)
+	{
+		CInstanceBase* pOtherInstance = CPythonCharacterManager::Instance().GetInstancePtr(PointChange.dwVID);
+		if (pOtherInstance)
+			pOtherInstance->UpdateTextTailLevel(PointChange.value);
+	}
 
 	return true;
 }

src/UserInterface/PythonNetworkStreamPhaseLogin.cpp

@@ -89,8 +89,6 @@ void CPythonNetworkStream::LoginPhase()
 
 void CPythonNetworkStream::SetLoginPhase()
 {
-	const char* key = LocaleService_GetSecurityKey();
-
 	if ("Login" != m_strPhase)
 		m_phaseLeaveFunc.Run();
 

src/UserInterface/UserInterface.rc

@@ -1,7 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
 #include "resource.h"
-#include "version.h" 
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -14,61 +13,11 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// 일본어 resources
+// English (United States) resources
 
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN)
-#ifdef _WIN32
-LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
-#pragma code_page(932)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE 
-BEGIN
-    IDS_POSSESSIVE_MORPHENE "'s"
-END
-
-#endif    // 일본어 resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// 중국어(중국) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS)
-#ifdef _WIN32
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
-#pragma code_page(936)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE 
-BEGIN
-    IDS_POSSESSIVE_MORPHENE "'s"
-    IDS_WARN_BAD_DRIVER     "句寡퀭콘뫘劤鞫엥혜땡。"
-    IDS_WARN_NO_TNL         "퀭돨鞫엥꼇連넣3D TnL 袒숭속醵\n踏狗쉥轟랬攣끽頓契。"
-END
-
-#endif    // 중국어(중국) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// 한국어 resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_KOR)
-#ifdef _WIN32
-LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
-#pragma code_page(949)
-#endif //_WIN32
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -118,19 +67,32 @@ END
 //
 
 IDC_CURSOR_NORMAL       CURSOR                  "Cursors\\cursor.cur"
+
 IDC_CURSOR_CHAIR        CURSOR                  "Cursors\\cursor_chair.cur"
+
 IDC_CURSOR_DOOR         CURSOR                  "Cursors\\cursor_door.cur"
+
 IDC_CURSOR_NO           CURSOR                  "Cursors\\cursor_no.cur"
+
 IDC_CURSOR_PICK         CURSOR                  "Cursors\\cursor_pick.cur"
+
 IDC_CURSOR_TALK         CURSOR                  "Cursors\\cursor_talk.cur"
+
 IDC_CURSOR_ATTACK       CURSOR                  "Cursors\\cursor_attack.cur"
-IDC_CURSOR_BUY          CURSOR                  "cursors\\cursor_buy.cur"
-IDC_CURSOR_SELL         CURSOR                  "cursors\\cursor_sell.cur"
+
+IDC_CURSOR_BUY          CURSOR                  "Cursors\\cursor_buy.cur"
+
+IDC_CURSOR_SELL         CURSOR                  "Cursors\\cursor_sell.cur"
+
 IDC_CURSOR_CAMERA_ROTATE CURSOR                  "Cursors\\cursor_camera_rotate.cur"
+
 IDC_CURSOR_HSIZE        CURSOR                  "Cursors\\cursor_hsize.cur"
+
 IDC_CURSOR_VSIZE        CURSOR                  "Cursors\\cursor_vsize.cur"
+
 IDC_CURSOR_HVSIZE       CURSOR                  "Cursors\\cursor_hvsize.cur"
 
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // DESIGNINFO
@@ -157,14 +119,15 @@ END
 // remains consistent on all systems.
 IDI_METIN2              ICON                    "metin2.ico"
 
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Version
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION VER_FILE_VERSION 
- PRODUCTVERSION 1,0,0,1
+ FILEVERSION 0,2,3,0
+ PRODUCTVERSION 0,2,3,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -179,14 +142,14 @@ BEGIN
     BEGIN
         BLOCK "080003b5"
         BEGIN
-            VALUE "CompanyName", "Ymir Entertainment"
-            VALUE "FileDescription", "Metin2Client"
-            VALUE "FileVersion",  VER_FILE_VERSION_STR "\0"
+            VALUE "CompanyName", "The Old Metin2 Project"
+            VALUE "FileDescription", "The Metin2 Client"
+            VALUE "FileVersion", "0.2.3.0"
             VALUE "InternalName", "Metin2Client"
-            VALUE "LegalCopyright", "Copyright (C) 2011"
-            VALUE "OriginalFilename", "Metin2Client.exe"
+            VALUE "LegalCopyright", "Copyright (C) 2024"
+            VALUE "OriginalFilename", "Metin2.exe"
             VALUE "ProductName", "Metin2Client"
-            VALUE "ProductVersion", "1, 0, 0, 1"
+            VALUE "ProductVersion", "0.2.3.0"
         END
     END
     BLOCK "VarFileInfo"
@@ -196,35 +159,6 @@ BEGIN
 END
 
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE 
-BEGIN
-    IDS_APP_NAME            "메틴2"
-    IDS_POSSESSIVE_MORPHENE "의"
-    IDS_WARN_BAD_DRIVER     "그래픽 드라이버를 업데이트 하시기 바랍니다."
-    IDS_WARN_NO_TNL         "사용하고 계신 시스템의 그래픽카드는 3D TnL 하드웨어 가속이 지원되지 않아\n게임이 느리게 실행되거나 제대로 실행되지 않을수 있습니다."
-    IDS_ERR_CANNOT_READ_FILE "%s 파일을 읽을 수 없습니다."
-    IDS_ERR_NOT_LATEST_FILE "'%s' 파일은 최신버전이 아닙니다. 런처를 다시 실행해주세요."
-    IDS_ERR_MUST_LAUNCH_FROM_PATCHER "클라이언트는 패처를 사용해서 실행되어야 합니다."
-END
-
-#endif    // 한국어 resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// 영어(미국) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // String Table
@@ -241,7 +175,7 @@ BEGIN
     IDS_ERR_MUST_LAUNCH_FROM_PATCHER "Please run patcher."
 END
 
-#endif    // 영어(미국) resources
+#endif    // English (United States) resources
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -255,3 +189,4 @@ END
 
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
+

src/UserInterface/UserInterface.vcxproj

@@ -143,7 +143,7 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0412</Culture>
+      <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
       <ShowProgress>NotSet</ShowProgress>
@@ -196,7 +196,7 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0412</Culture>
+      <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
       <ShowProgress>NotSet</ShowProgress>
@@ -241,7 +241,7 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0412</Culture>
+      <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
       <ShowProgress>NotSet</ShowProgress>
@@ -292,7 +292,7 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0412</Culture>
+      <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
       <ShowProgress>NotSet</ShowProgress>
@@ -422,20 +422,6 @@
     <ClInclude Include="InstanceBase.h" />
     <ClInclude Include="InsultChecker.h" />
     <ClInclude Include="Locale.h" />
-    <ClInclude Include="Locale_inc.h" />
-    <ClInclude Include="Locale_inc_BR.h" />
-    <ClInclude Include="Locale_inc_CA.h" />
-    <ClInclude Include="Locale_inc_dev.h" />
-    <ClInclude Include="Locale_inc_EU.h" />
-    <ClInclude Include="Locale_inc_EU2.h" />
-    <ClInclude Include="Locale_inc_GB.h" />
-    <ClInclude Include="Locale_inc_HK.h" />
-    <ClInclude Include="Locale_inc_JP.h" />
-    <ClInclude Include="Locale_inc_KO.h" />
-    <ClInclude Include="Locale_inc_KO_DEV.h" />
-    <ClInclude Include="Locale_inc_NEWCIBN.h" />
-    <ClInclude Include="Locale_inc_SG.h" />
-    <ClInclude Include="Locale_inc_VI.h" />
     <ClInclude Include="MarkImage.h" />
     <ClInclude Include="MarkManager.h" />
     <ClInclude Include="MovieMan.h" />

src/UserInterface/UserInterface.vcxproj.filters

@@ -406,48 +406,6 @@
     <ClInclude Include="Locale.h">
       <Filter>Locale</Filter>
     </ClInclude>
-    <ClInclude Include="Locale_inc.h">
-      <Filter>Locale</Filter>
-    </ClInclude>
-    <ClInclude Include="Locale_inc_BR.h">
-      <Filter>Locale</Filter>
-    </ClInclude>
-    <ClInclude Include="Locale_inc_CA.h">
-      <Filter>Locale</Filter>
-    </ClInclude>
-    <ClInclude Include="Locale_inc_dev.h">
-      <Filter>Locale</Filter>
-    </ClInclude>
-    <ClInclude Include="Locale_inc_EU.h">
-      <Filter>Locale</Filter>
-    </ClInclude>
-    <ClInclude Include="Locale_inc_EU2.h">
-      <Filter>Locale</Filter>
-    </ClInclude>
-    <ClInclude Include="Locale_inc_GB.h">
-      <Filter>Locale</Filter>
-    </ClInclude>
-    <ClInclude Include="Locale_inc_HK.h">
-      <Filter>Locale</Filter>
-    </ClInclude>
-    <ClInclude Include="Locale_inc_JP.h">
-      <Filter>Locale</Filter>
-    </ClInclude>
-    <ClInclude Include="Locale_inc_KO.h">
-      <Filter>Locale</Filter>
-    </ClInclude>
-    <ClInclude Include="Locale_inc_KO_DEV.h">
-      <Filter>Locale</Filter>
-    </ClInclude>
-    <ClInclude Include="Locale_inc_NEWCIBN.h">
-      <Filter>Locale</Filter>
-    </ClInclude>
-    <ClInclude Include="Locale_inc_SG.h">
-      <Filter>Locale</Filter>
-    </ClInclude>
-    <ClInclude Include="Locale_inc_VI.h">
-      <Filter>Locale</Filter>
-    </ClInclude>
     <ClInclude Include="AccountConnector.h">
       <Filter>Network</Filter>
     </ClInclude>