reHLDS/localizebugfix
2
0
Fork 0
mirror of https://github.com/rehlds/localizebugfix.git synced 2025-03-19 18:40:14 +03:00
Code Issues Projects Releases Wiki Activity

Refactoring.

Browse Source 
Added more localization strings to check.
This commit is contained in:
s1lentq 2015-09-28 17:08:46 +06:00
parent f13d93cfdc
commit 6846f1deb7
14 changed files with 443 additions and 354 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
.gitattributes vendored Normal file
View File

@ -0,0 +1,63 @@
###############################################################################
# Set default behavior to automatically normalize line endings.
###############################################################################
* text=auto
###############################################################################
# Set default behavior for command prompt diff.
#
# This is need for earlier builds of msysgit that does not have it on by
# default for csharp files.
# Note: This is only used by command line
###############################################################################
#*.cs diff=csharp
###############################################################################
# Set the merge driver for project and solution files
#
# Merging from the command prompt will add diff markers to the files if there
# are conflicts (Merging from VS is not affected by the settings below, in VS
# the diff markers are never inserted). Diff markers may cause the following
# file extensions to fail to load in VS. An alternative would be to treat
# these files as binary and thus will always conflict and require user
# intervention with every merge. To do so, just uncomment the entries below
###############################################################################
#*.sln merge=binary
#*.csproj merge=binary
#*.vbproj merge=binary
#*.vcxproj merge=binary
#*.vcproj merge=binary
#*.dbproj merge=binary
#*.fsproj merge=binary
#*.lsproj merge=binary
#*.wixproj merge=binary
#*.modelproj merge=binary
#*.sqlproj merge=binary
#*.wwaproj merge=binary
###############################################################################
# behavior for image files
#
# image files are treated as binary by default.
###############################################################################
#*.jpg binary
#*.png binary
#*.gif binary
###############################################################################
# diff behavior for common document formats
#
# Convert binary document formats to text before diffing them. This feature
# is only available from the command line. Turn it on by uncommenting the
# entries below.
###############################################################################
#*.doc diff=astextplain
#*.DOC diff=astextplain
#*.docx diff=astextplain
#*.DOCX diff=astextplain
#*.dot diff=astextplain
#*.DOT diff=astextplain
#*.pdf diff=astextplain
#*.PDF diff=astextplain
#*.rtf diff=astextplain
#*.RTF diff=astextplain

8
.gitignore vendored Normal file
View File

@ -0,0 +1,8 @@
**/msvc/Debug*
**/msvc/Release*
**/msvc/*.sdf
**/msvc/*.opensdf
**/msvc/*.user
**/msvc/*.suo
**/msvc/PublishPath*.txt
**/msvc/ipch

67
Makefile
View File

@ -1,70 +1,49 @@
#(C)2004-2005 AMX Mod X Development Team
# Makefile written by David "BAILOPAN" Anderson
HLSDK = sdk/hlsdk HLSDK = sdk/hlsdk
METAMOD = sdk/metamod METAMOD = sdk/metamod
M_INCLUDE = include M_INCLUDE = include
OPT_FLAGS = -O2 -funroll-loops -s -pipe -fomit-frame-pointer -fno-strict-aliasing
DEBUG_FLAGS = -g -ggdb3
CPP = g++
NAME = localizebugfix NAME = localizebugfix
COMPILER = /opt/intel/bin/icpc
BIN_SUFFIX_32 = mm_i386.so
BIN_SUFFIX_64 = mm_amd64.so
OBJECTS = main.cpp memory.cpp meta_api.cpp OBJECTS = main.cpp memory.cpp meta_api.cpp
LINK = LINK = -lm -ldl -static-intel -static-libgcc -no-intel-extensions
OPT_FLAGS = -O3 -msse3 -ipo -no-prec-div -fp-model fast=2 -funroll-loops -fomit-frame-pointer -fno-stack-protector
INCLUDE = -I. -I$(M_INCLUDE)/ -I$(HLSDK)/common -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/pm_shared -I$(METAMOD) INCLUDE = -I. -I$(M_INCLUDE)/ -I$(HLSDK)/common -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/pm_shared -I$(METAMOD)
GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1) BIN_DIR = Release
CFLAGS = $(OPT_FLAGS)
ifeq "$(GCC_VERSION)" "4" CFLAGS += -g0 -fvisibility=hidden -fvisibility-inlines-hidden -DNDEBUG -Dlinux -std=c++0x -shared -wd147,274 -fasm-blocks
OPT_FLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
endif
ifeq "$(DEBUG)" "true" OBJ_LINUX := $(OBJECTS:%.c=$(BIN_DIR)/%.o)
BIN_DIR = Debug
CFLAGS = $(DEBUG_FLAGS)
else
BIN_DIR = Release
CFLAGS = $(OPT_FLAGS)
endif
CFLAGS += -DNDEBUG -Wall -Wno-char-subscripts -Wno-unknown-pragmas -Wno-write-strings -Wno-deprecated -Wno-non-virtual-dtor -fno-exceptions -DHAVE_STDINT_H -fno-rtti -static-libgcc -m32 $(BIN_DIR)/%.o: %.c
$(COMPILER) $(INCLUDE) $(CFLAGS) -o $@ -c $<
ifeq "$(AMD64)" "true"
BINARY = $(NAME)_$(BIN_SUFFIX_64)
CFLAGS += -DPAWN_CELL_SIZE=64 -DHAVE_I64 -m64
else
BINARY = $(NAME)_$(BIN_SUFFIX_32)
CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32
OPT_FLAGS += -march=i586
endif
OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
$(BIN_DIR)/%.o: %.cpp
$(CPP) $(INCLUDE) $(CFLAGS) -o $@ -c $<
all: all:
mkdir -p $(BIN_DIR) mkdir -p $(BIN_DIR)
$(MAKE) $(NAME) mkdir -p $(BIN_DIR)/sdk
amd64: $(MAKE) $(NAME) && strip -x $(BIN_DIR)/$(NAME)_mm_i386.so
$(MAKE) all AMD64=true
$(NAME): $(OBJ_LINUX) $(NAME): $(OBJ_LINUX)
$(CPP) $(INCLUDE) $(CFLAGS) $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY) $(COMPILER) $(INCLUDE) $(CFLAGS) $(OBJ_LINUX) $(LINK) -o$(BIN_DIR)/$(NAME)_mm_i386.so
check:
cppcheck $(INCLUDE) --quiet --max-configs=100 -D__linux__ -DNDEBUG -DHAVE_STDINT_H .
debug: debug:
$(MAKE) all DEBUG=true $(MAKE) all DEBUG=false
default: all default: all
clean: clean:
rm -rf $(BIN_DIR)/*.o rm -rf Release/sdk/*.o
rm -rf $(BIN_DIR)/$(NAME)_$(BIN_SUFFIX_32) rm -rf Release/*.o
rm -rf $(BIN_DIR)/$(NAME)_$(BIN_SUFFIX_64) rm -rf Release/$(NAME)_mm_i386.so
rm -rf Debug/sdk/*.o
rm -rf Debug/*.o
rm -rf Debug/$(NAME)_mm_i386.so

BIN
bin/2.4/localizebugfix.dll Normal file
View File

Binary file not shown.

BIN
bin/2.4/localizebugfix.pdb Normal file
View File

Binary file not shown.

BIN
bin/2.4/localizebugfix_mm_i386.so Normal file
View File

Binary file not shown.

80
include/main.h
View File

@ -40,15 +40,13 @@
#include "extdll.h" #include "extdll.h"
#include "meta_api.h" #include "meta_api.h"
#define MAX_CLIENTS 32
#ifdef _WIN32 #ifdef _WIN32
#define SIZEOF_CLIENT_T 20504 #define SIZEOF_CLIENT_T 20504
#define PLAYER_NAME_OFFSET 19720 #define PLAYER_NAME_OFFSET 19720
#else #else
#define SIZEOF_CLIENT_T 20212 #define SIZEOF_CLIENT_T 20212
#define PLAYER_NAME_OFFSET 19432 #define PLAYER_NAME_OFFSET 19432
#endif #endif // _WIN32
typedef struct server_static_s typedef struct server_static_s
{ {
@ -60,45 +58,35 @@ typedef struct server_static_s
const char *szLocalizeBuffer[] = const char *szLocalizeBuffer[] =
{ {
"#GameUI_DetailTextures", "#Team_Select", "#Team_Select_Spect", "#IG_Team_Select", "#IG_Team_Select_Spect", "#IG_VIP_Team_Select", "#IG_VIP_Team_Select_Spect", "#Terrorist_Select",
"#Team_Select","#Team_Select_Spect","#IG_Team_Select","#IG_Team_Select_Spect","#IG_VIP_Team_Select","#IG_VIP_Team_Select_Spect","#Terrorist_Select", "#CT_Select", "#Buy", "#CT_BuyItem", "#T_BuyItem", "#DCT_BuyItem", "#DT_BuyItem", "#CT_BuyPistol", "#T_BuyPistol", "#AS_BuyShotgun", "#BuyShotgun",
"#CT_Select","#Buy","#CT_BuyItem","#T_BuyItem","#DCT_BuyItem","#DT_BuyItem","#CT_BuyPistol","#T_BuyPistol","#AS_BuyShotgun","#BuyShotgun","#CT_BuySubMachineGun", "#CT_BuySubMachineGun", "#T_BuySubMachineGun", "#AS_CT_BuySubMachineGun", "#AS_T_BuySubMachineGun", "#T_BuyRifle", "#CT_BuyRifle", "#AS_T_BuyRifle",
"#T_BuySubMachineGun","#AS_CT_BuySubMachineGun","#AS_T_BuySubMachineGun","#T_BuyRifle","#CT_BuyRifle","#AS_T_BuyRifle","#AS_CT_BuyRifle","#AS_T_BuyMachineGun", "#AS_CT_BuyRifle", "#AS_T_BuyMachineGun", "#BuyMachineGun", "#RadioA", "#RadioB", "#RadioC", "#AK47", "#SG552", "#M4A1", "#Famas", "#Galil", "#Aug", "#Scout",
"#BuyMachineGun","#RadioA","#RadioB","#RadioC","#AK47","#SG552","#M4A1","#Famas","#Galil","#Aug","#Scout","#ArcticWarfareMagnum","#G3SG1","#SG550","#USP45","#Glock18", "#ArcticWarfareMagnum", "#G3SG1", "#SG550", "#USP45", "#Glock18", "#DesertEagle", "#P228", "#Beretta96G", "#FiveSeven", "#Super90", "#XM1014", "#mp5navy", "#tmp",
"#DesertEagle","#P228","#Beretta96G","#FiveSeven","#Super90","#XM1014","#mp5navy","#tmp","#FNP90","#Mac10","#UMP45","#M249","#Krieg552","#M4A1_Short","#Schmidt","#Magnum", "#FNP90", "#Mac10", "#UMP45", "#M249", "#Krieg552", "#M4A1_Short", "#Schmidt", "#Magnum", "#D3AU1", "#Krieg550", "#KM45Tactical", "#Sidearm9X19mm", "#NightHawk",
"#D3AU1","#Krieg550","#KM45Tactical","#Sidearm9X19mm","#NightHawk","#P228Compact","#Dual40","#ESFiveSeven","#Leone12","#AutoShotgun","#SubMachineGun","#SchmidtMP","#ESC90", "#P228Compact", "#Dual40", "#ESFiveSeven", "#Leone12", "#AutoShotgun", "#SubMachineGun", "#SchmidtMP", "#ESC90", "#Mac10_Short", "#KMUMP45", "#ESM249", "#TEAMS",
"#Mac10_Short","#KMUMP45","#ESM249","#TEAMS","#PLAYERS","#CLASS","#SCORE","#DEATHS","#LATENCY","#VOICE","#Menu_OK","#Menu_Cancel","#Menu_Spectate","#Team_AutoAssign", "#PLAYERS", "#CLASS", "#SCORE", "#DEATHS", "#LATENCY", "#VOICE", "#Menu_OK", "#Menu_Cancel", "#Menu_Spectate", "#Team_AutoAssign", "#Target_Bombed", "#VIP_Escaped",
"#Title_SelectYourTeam","#Target_Bombed","#VIP_Escaped","#VIP_Assassinated","#Terrorists_Escaped","#CTs_PreventEscape","#Escaping_Terrorists_Neutralized","#Bomb_Defused", "#VIP_Assassinated", "#Terrorists_Escaped", "#CTs_PreventEscape", "#Escaping_Terrorists_Neutralized", "#Bomb_Defused", "#CTs_Win", "#Terrorists_Win", "#Round_Draw",
"#CTs_Win","#Terrorists_Win","#Round_Draw","#All_Hostages_Rescued","#Target_Saved","#Hostages_Not_Rescued","#Terrorists_Not_Escaped","#VIP_Not_Escaped","#Cannot_Buy_This", "#All_Hostages_Rescued", "#Target_Saved", "#Hostages_Not_Rescued", "#Terrorists_Not_Escaped", "#VIP_Not_Escaped", "#Cannot_Buy_This", "#Not_Enough_Money", "#Weapon_Not_Available",
"#Not_Enough_Money","#Weapon_Not_Available","#Already_Have_Kevlar","#Already_Have_Kevlar_Helmet","#Already_Have_Kevlar_Bought_Helmet","#Cannot_Carry_Anymore","#Already_Have_One", "#Already_Have_Kevlar", "#Already_Have_Kevlar_Helmet", "#Already_Have_Kevlar_Bought_Helmet", "#Cannot_Carry_Anymore", "#Already_Have_One", "#Cannot_Switch_From_VIP", "#All_Teams_Full",
"#Cannot_Switch_From_VIP","#All_Teams_Full","#Terrorists_Full","#CTs_Full","#Too_Many_Terrorists","#Too_Many_CTs","#Wait_3_Seconds","#Only_1_Team_Change","#Ignore_Broadcast_Messages", "#Terrorists_Full", "#CTs_Full", "#Too_Many_Terrorists", "#Too_Many_CTs", "#Wait_3_Seconds", "#Only_1_Team_Change", "#Ignore_Broadcast_Messages", "#Ignore_Broadcast_Team_Messages",
"#Ignore_Broadcast_Team_Messages","#Accept_All_Messages","#Ignore_Radio","#Accept_Radio","#Command_Not_Available","#Defusing_Bomb_With_Defuse_Kit", "#Accept_All_Messages", "#Ignore_Radio", "#Accept_Radio", "#Command_Not_Available", "#Defusing_Bomb_With_Defuse_Kit", "#Defusing_Bomb_Without_Defuse_Kit", "#Killed_Hostage",
"#Defusing_Bomb_Without_Defuse_Kit","#Killed_Hostage","#Injured_Hostage","#Auto_Team_Balance_Next_Round","#All_VIP_Slots_Full","#Killed_Teammate", "#Injured_Hostage", "#Auto_Team_Balance_Next_Round", "#All_VIP_Slots_Full", "#Killed_Teammate", "#Banned_For_Killing_Teammates", "#Cannot_Vote_Map", "#Weapon_Cannot_Be_Dropped",
"#Banned_For_Killing_Teammates","#Cannot_Vote_Map","#Weapon_Cannot_Be_Dropped","#Terrorist_Escaped","#C4_Plant_At_Bomb_Spot","#C4_Plant_Must_Be_On_Ground", "#Terrorist_Escaped", "#C4_Plant_At_Bomb_Spot", "#C4_Plant_Must_Be_On_Ground", "#C4_Arming_Cancelled", "#Bomb_Planted", "#C4_Activated_At_Bomb_Spot", "#Switch_To_BurstFire",
"#C4_Arming_Cancelled","#Bomb_Planted","#C4_Activated_At_Bomb_Spot","#Switch_To_BurstFire","#Switch_To_SemiAuto","#Switch_To_FullAuto","#TRAINING1","#TRAINING2","#TRAINING3", "#Switch_To_SemiAuto", "#Switch_To_FullAuto", "#TRAINING1", "#TRAINING2", "#TRAINING3", "#TRAINING4", "#TRAINING5", "#TRAINING6", "#TRAINING7", "#GAMESAVED", "#Cannot_Vote_Need_More_People",
"#TRAINING4","#TRAINING5","#TRAINING6","#TRAINING7","#GAMESAVED","#Game_Commencing","#Game_connected","#Game_disconnected","#Game_join_terrorist","#Game_join_ct", "#Map_Vote_Extend", "#Cannot_Vote_With_Less_Than_Three", "#Cover_me", "#You_take_the_point", "#Hold_this_position", "#Regroup_team", "#Follow_me", "#Taking_fire", "#Go_go_go", "#Team_fall_back",
"#Game_join_terrorist_auto","#Game_join_ct_auto","#Game_scoring","#Game_idle_kick","#Game_bomb_drop","#Game_bomb_pickup","#Game_no_timelimit","#Game_timelimit", "#Stick_together_team", "#Get_in_position_and_wait", "#Storm_the_front", "#Report_in_team", "#Affirmative", "#Roger_that", "#Enemy_spotted", "#Need_backup", "#Sector_clear", "#In_position",
"#Game_unknown_command","#Game_in_position","#Game_added_position","#Game_teammate_kills","#Game_required_votes","#Game_radio","#Game_teammate_attack","#Game_kicked", "#Reporting_in", "#Get_out_of_there", "#Negative", "#Enemy_down", "#Hostage_down", "#Fire_in_the_hole", "#Cant_buy", "#VIP_cant_buy", "#CT_cant_buy", "#Terrorist_cant_buy", "#Vote", "#Votes",
"#Game_vote_cast","#Game_vote_usage","#Game_vote_player_not_found","#Game_vote_players_on_your_team","#Game_vote_not_yourself","#Game_voted_for_map","#Game_votemap_usage", "#Friend", "#Enemy", "#Hostage", "#Health", "#Map_descr_not_avail", "#Class_descr_not_avail", "#Phoenix_Connexion", "#L337_Krew", "#Arctic_Avengers", "#Guerilla_Warfare", "#Auto_Select",
"#Cannot_Vote_Need_More_People","#Map_Vote_Extend","#Cannot_Vote_With_Less_Than_Three","#Game_will_restart_in","#Game_will_restart_in_console","#Cover_me","#You_take_the_point", "#Seal_Team_6", "#GSG_9", "#SAS", "#GIGN", "#Kevlar", "#Kevlar_Vest", "#Kevlar_Helmet", "#Kevlar_Vest_Ballistic_Helmet", "#Flashbang", "#HE_Grenade", "#High_Explosive_Grenade", "#Smoke_Grenade",
"#Hold_this_position","#Regroup_team","#Follow_me","#Taking_fire","#Go_go_go","#Team_fall_back","#Stick_together_team","#Get_in_position_and_wait","#Storm_the_front","#Report_in_team", "#Defusal_Kit", "#Bomb_Defusal_Kit", "#NightVision", "#Nightvision_Goggles", "#TactShield", "#TactShield_Desc", "#Pistols", "#Buy_pistols", "#Shotguns", "#Buy_shotguns", "#SMGs", "#Buy_smgs",
"#Affirmative","#Roger_that","#Enemy_spotted","#Need_backup","#Sector_clear","#In_position","#Reporting_in","#Get_out_of_there","#Negative","#Enemy_down","#Hostage_down", "#Rifles", "#Buy_rifles", "#MachineGuns", "#Buy_machineguns", "#Prim_Ammo", "#Buy_prim_ammo", "#Sec_Ammo", "#Buy_sec_ammo", "#Equipment", "#Buy_equipment", "#Terrorist_Forces", "#CT_Forces",
"#Fire_in_the_hole","#Cant_buy","#VIP_cant_buy","#CT_cant_buy","#Terrorist_cant_buy","#Vote","#Votes","#Hint_press_buy_to_purchase","#Hint_use_nightvision","#Hint_lost_money", "#VIP", "#WINS", "#BOMB", "#DEAD", "#SCORES", "#Player", "#Player_plural", "#Got_defuser", "#Got_bomb", "#Mic_Volume", "#Speaker_Volume", "#Voice_Properties", "#Cannot_Be_Spectator",
"#Hint_removed_for_next_hostage_killed","#Hint_careful_around_hostages","#Hint_careful_around_teammates","#Hint_reward_for_killing_vip","#Hint_win_round_by_killing_enemy", "#Map_Description_not_available", "#Muted", "#Unmuted", "#No_longer_hear_that_player", "#OBS_NONE", "#OBS_CHASE_LOCKED", "#OBS_CHASE_FREE", "#OBS_ROAMING", "#OBS_IN_EYE", "#OBS_MAP_FREE",
"#Hint_try_not_to_injure_teammates","#Hint_you_are_in_targetzone","#Hint_hostage_rescue_zone","#Hint_terrorist_escape_zone","#Hint_ct_vip_zone","#Hint_terrorist_vip_zone", "#OBS_MAP_CHASE", "#SPECT_OPTIONS", "#CAM_OPTIONS", "#Name_change_at_respawn", "#C4_Defuse_Must_Be_On_Ground", "#Spectators", "#Unassigned", "#Only_CT_Can_Move_Hostages", "#Selection_Not_Available",
"#Hint_cannot_play_because_tk","#Hint_use_hostage_to_stop_him","#Hint_lead_hostage_to_rescue_point","#Hint_you_have_the_bomb","#Hint_you_are_the_vip","#Hint_out_of_ammo", "#Alias_Not_Avail", "T0A0TITLE", "C0A0TITLE", "C0A1TITLE", "C1A1TITLE", "C1A2TITLE", "C1A3TITLE", "C1A4TITLE", "C2A1TITLE", "C2A2TITLE", "C2A3TITLE", "C2A4TITLE1", "C2A4TITLE2", "C2A5TITLE",
"#Hint_spotted_a_friend","#Hint_spotted_an_enemy","#Hint_prevent_hostage_rescue","#Hint_rescue_the_hostages","#Hint_press_use_so_hostage_will_follow","#Friend","#Enemy","#Hostage", "C3A1TITLE", "C3A2TITLE", "C4A1TITLE", "C4A1ATITLE", "C4A2TITLE", "C4A3TITLE", "C5TITLE",
"#Health","#Map_descr_not_avail","#Class_descr_not_avail","#Title_terrorist_model_selection","#Phoenix_Connexion","#L337_Krew","#Arctic_Avengers","#Guerilla_Warfare","#Auto_Select",
"#Title_ct_model_selection","#Seal_Team_6","#Title_seal_team","#GSG_9","#Title_gsg9","#SAS","#Title_sas","#GIGN","#Title_gign","#Title_select_category_of_purchase",
"#Title_equipment_selection","#Kevlar","#Kevlar_Vest","#Kevlar_Helmet","#Kevlar_Vest_Ballistic_Helmet","#Flashbang","#HE_Grenade","#High_Explosive_Grenade","#Smoke_Grenade",
"#Defusal_Kit","#Bomb_Defusal_Kit","#NightVision","#Nightvision_Goggles","#TactShield","#TactShield_Desc","#Title_pistol_selection","#Pistols","#Buy_pistols",
"#Title_shotgun_selection","#Shotguns","#Buy_shotguns","#Title_smg_selection","#SMGs","#Buy_smgs","#Title_rifle_selection","#Rifles","#Buy_rifles","#Title_machinegun_selection",
"#MachineGuns","#Buy_machineguns","#Prim_Ammo","#Buy_prim_ammo","#Sec_Ammo","#Buy_sec_ammo","#Equipment","#Buy_equipment","#Terrorist_Forces","#CT_Forces","#VIP","#WINS","#BOMB","#DEAD",
"#SCORES","#Player","#Player_plural","#Got_defuser","#Got_bomb","#Mic_Volume","#Speaker_Volume","#Voice_Properties","#Cannot_Be_Spectator","#Map_Description_not_available","#Muted",
"#Unmuted","#No_longer_hear_that_player","#OBS_NONE","#OBS_CHASE_LOCKED","#OBS_CHASE_FREE","#OBS_ROAMING","#OBS_IN_EYE","#OBS_MAP_FREE","#OBS_MAP_CHASE","#SPECT_OPTIONS","#CAM_OPTIONS",
"#Name_change_at_respawn","#C4_Defuse_Must_Be_On_Ground","#Spec_Mode1","#Spec_Mode2","#Spec_Mode3","#Spec_Mode4","#Spec_Mode5","#Spec_Mode6","#Spec_NoTarget","#Spec_Help_Title",
"#Spec_Help_Text","#Spec_Slow_Motion","#Spec_Replay","#Spec_Auto","#Spec_Time","#Spec_Map","#Spectators","#Unassigned","#Only_CT_Can_Move_Hostages","#Spec_Duck",
"#Spec_Not_Valid_Choice","#Spec_Not_In_Spectator_Mode","#Spec_NoPlayers","#Spec_ListPlayers","#Selection_Not_Available","#Alias_Not_Avail","#Spec_No_PIP"
}; };
extern DLL_FUNCTIONS *g_pFunctionTable; extern DLL_FUNCTIONS *g_pFunctionTable;
@ -107,7 +95,7 @@ static server_static_t *global_svs;
static CVector<const char *> localize; static CVector<const char *> localize;
static int localize_string(char *buf,bool apersand); static int localize_string(char *buf, bool apersand);
static void (*pfnCmd_TokenizeString)(char *buf); static void (*pfnCmd_TokenizeString)(char *buf);
@ -117,12 +105,12 @@ static inline void localize_push()
for(int i = 0; i < j; i++) for(int i = 0; i < j; i++)
localize.push_back(szLocalizeBuffer[i]); localize.push_back(szLocalizeBuffer[i]);
}; }
static inline char *getClientName(edict_t *pEdict) static inline char *getClientName(edict_t *pEdict)
{ {
unsigned int p = ENTINDEX(pEdict) - 1; unsigned int p = ENTINDEX(pEdict) - 1;
return (char *)(global_svs->clients + p * SIZEOF_CLIENT_T + PLAYER_NAME_OFFSET); return (char *)(global_svs->clients + p * SIZEOF_CLIENT_T + PLAYER_NAME_OFFSET);
} }
#endif //_MAIN_H_ #endif // _MAIN_H_

138
main.cpp
View File

@ -35,12 +35,14 @@
void Cmd_TokenizeString_Handler(char *buf) void Cmd_TokenizeString_Handler(char *buf)
{ {
if(!strncmp(buf,"say ",4) || !strncmp(buf,"say_team ",9)) if (!strncmp(buf, "say ", 4) || !strncmp(buf, "say_team ", 9))
{ {
localize_string(buf,true); localize_string(buf, true);
} }
pfnCmd_TokenizeString(buf); pfnCmd_TokenizeString(buf);
} }
void OnMetaAttach() void OnMetaAttach()
{ {
lib_t lib; lib_t lib;
@ -51,19 +53,20 @@ void OnMetaAttach()
#ifdef _WIN32 #ifdef _WIN32
char p1[] = "\x55\x8B\x2A\xA1\x2A\x2A\x2A\x2A\x56\x33\x2A\x85\x2A\x7E\x2A\x8B\x2A\x2A\x2A\x2A\x2A\x2A\x50"; char p1[] = "\x55\x8B\x2A\xA1\x2A\x2A\x2A\x2A\x56\x33\x2A\x85\x2A\x7E\x2A\x8B\x2A\x2A\x2A\x2A\x2A\x2A\x50";
char p2[] = "\x56\xE8\x2A\x2A\x2A\x2A\xA1\x2A\x2A\x2A\x2A\x50\xFF\x2A\x2A\x2A\x2A\x2A\x83\x2A\x2A\x5E\xC3"; char p2[] = "\x56\xE8\x2A\x2A\x2A\x2A\xA1\x2A\x2A\x2A\x2A\x50\xFF\x2A\x2A\x2A\x2A\x2A\x83\x2A\x2A\x5E\xC3";
#endif #endif // _WIN32
lib_load_info((void *)gpGlobals,&lib); lib_load_info((void *)gpGlobals, &lib);
#ifdef _WIN32 #ifdef _WIN32
// * Cmd_TokenizeString | addr - 049A3FC0 // * Cmd_TokenizeString | addr - 049A3FC0
addr = lib_find_pattern(&lib,p1,sizeof(p1) - 1);//23 addr = lib_find_pattern(&lib, p1, sizeof(p1) - 1);//23
#else #else
addr = lib_find_symbol(&lib,"Cmd_TokenizeString"); addr = lib_find_symbol(&lib, "Cmd_TokenizeString");
#endif #endif // _WIN32
if(!addr)
if (!addr)
{ {
LOG_ERROR(PLID,"can't find \"Cmd_TokenizeString\""); LOG_ERROR(PLID, "can't find \"Cmd_TokenizeString\"");
return; return;
} }
@ -71,11 +74,11 @@ void OnMetaAttach()
#ifdef _WIN32 #ifdef _WIN32
// * SV_ParseStringCommand | addr - 01DAB0AF // * SV_ParseStringCommand | addr - 01DAB0AF
addr = lib_find_pattern(&lib,p2,sizeof(p2) - 1); addr = lib_find_pattern(&lib, p2, sizeof(p2) - 1);
if(!addr) if (!addr)
{ {
LOG_ERROR(PLID,"can't find \"Cmd_TokenizeString\" inside function \"SV_ParseStringCommand\""); LOG_ERROR(PLID, "can't find \"Cmd_TokenizeString\" inside function \"SV_ParseStringCommand\"");
return; return;
} }
// 01DAB0D8 56 push esi // 01DAB0D8 56 push esi
@ -84,44 +87,45 @@ void OnMetaAttach()
addr += 2;// 01DAB0D8 + 1 addr += 2;// 01DAB0D8 + 1
#else #else
addr = lib_find_symbol(&lib,"SV_ParseStringCommand"); addr = lib_find_symbol(&lib, "SV_ParseStringCommand");
if(!addr) if (!addr)
{ {
LOG_ERROR(PLID,"can't find \"SV_ParseStringCommand\""); LOG_ERROR(PLID, "can't find \"SV_ParseStringCommand\"");
return; return;
} }
// 0009B1B0 53 push ebx // 0009B1B0 53 push ebx
// 0009B1B1 E8 AA A5 FA FF call Cmd_TokenizeString // 0009B1B1 E8 AA A5 FA FF call Cmd_TokenizeString
addr = mem_find_ref(addr,200,'\xE8',(dword)pfnCmd_TokenizeString,1); addr = mem_find_ref(addr, 200, '\xE8', (dword)pfnCmd_TokenizeString, 1);
if(!addr) if (!addr)
{ {
LOG_ERROR(PLID,"can't find \"Cmd_TokenizeString\" inside function \"SV_ParseStringCommand\""); LOG_ERROR(PLID, "can't find \"Cmd_TokenizeString\" inside function \"SV_ParseStringCommand\"");
return; return;
} }
addr += 1; addr += 1;
#endif #endif // _WIN32
*(dword *)patch = (dword)Cmd_TokenizeString_Handler - (dword)addr - 4; *(dword *)patch = (dword)Cmd_TokenizeString_Handler - (dword)addr - 4;
if(!mem_change_protection(addr,patch,sizeof(patch))) if (!mem_change_protection(addr, patch, sizeof(patch)))
{ {
LOG_ERROR(PLID,"patch failed."); LOG_ERROR(PLID, "patch failed.");
return; return;
} }
#ifdef _WIN32 #ifdef _WIN32
addr = lib_find_pattern_fstr(&lib,"# name userid uniqueid frag time ping loss adr\n",-12,"\x68\x2A\x2A\x2A\x2A\x53\x56",7); addr = lib_find_pattern_fstr(&lib, "# name userid uniqueid frag time ping loss adr\n", -12, "\x68\x2A\x2A\x2A\x2A\x53\x56", 7);
#else #else
addr = lib_find_symbol(&lib,"svs"); addr = lib_find_symbol(&lib, "svs");
#endif #endif // _WIN32
if(!addr) if (!addr)
{ {
LOG_ERROR(PLID,"can't find \"svs\""); LOG_ERROR(PLID, "can't find \"svs\"");
return; return;
} }
@ -130,13 +134,14 @@ void OnMetaAttach()
global_svs = (struct server_static_s *)(*(dword **)addr - 2); global_svs = (struct server_static_s *)(*(dword **)addr - 2);
#else #else
global_svs = (struct server_static_s *)addr; global_svs = (struct server_static_s *)addr;
#endif #endif // _WIN32
localize_push(); localize_push();
}; }
void ClientUserInfoChanged(edict_t *pEdict,char *infobuffer)
void ClientUserInfoChanged(edict_t *pEdict, char *infobuffer)
{ {
if(!global_svs) if (!global_svs)
RETURN_META(MRES_IGNORED); RETURN_META(MRES_IGNORED);
char c; char c;
@ -147,55 +152,60 @@ void ClientUserInfoChanged(edict_t *pEdict,char *infobuffer)
int j = 0; int j = 0;
s = getClientName(pEdict); s = getClientName(pEdict);
buf = INFOKEY_VALUE(infobuffer,"name"); buf = INFOKEY_VALUE(infobuffer, "name");
if(*s != '\0' && !strcmp(s,buf)) if (*s != '\0' && !strcmp(s, buf))
{
RETURN_META(MRES_IGNORED); RETURN_META(MRES_IGNORED);
}
if(*s == '#') if (*s == '#')
*s = '*'; *s = '*';
for(;*buf != '\0'; buf++, i++) for (;*buf != '\0'; buf++, i++)
{ {
if(*buf != '+') if (*buf != '+')
continue; continue;
c = *(buf + 1); c = *(buf + 1);
if(!isspace(c) && (isdigit(c) || isalpha(c))) if (!isspace(c) && (isdigit(c) || isalpha(c)))
{ {
*buf = '*'; *buf = '*';
j++; j++;
} }
}; };
if(localize_string(buf -= i,false) || j) if (localize_string(buf -= i, false) || j)
{ {
SET_CLIENT_KEYVALUE(ENTINDEX(pEdict),infobuffer,"name",buf); SET_CLIENT_KEYVALUE(ENTINDEX(pEdict), infobuffer, "name", buf);
} }
RETURN_META(MRES_IGNORED); RETURN_META(MRES_IGNORED);
}; }
#ifdef _WIN32 #ifdef _WIN32
static char *strcasestr(const char *phaystack,const char *pneedle) static char *strcasestr(const char *phaystack, const char *pneedle)
{ {
const char *a,*b; const char *a,*b;
for(;*phaystack; *phaystack++) for (;*phaystack; *phaystack++)
{ {
a = phaystack; a = phaystack;
b = pneedle; b = pneedle;
while((*a++|32) == (*b++|32)) while ((*a++|32) == (*b++|32))
{ {
if(!*b) if (!*b)
return (char *)phaystack; return (char *)phaystack;
} }
} }
return NULL; return NULL;
}; }
#endif #endif // _WIN32
static int localize_string(char *buf,bool apersand)
static int localize_string(char *buf, bool apersand)
{ {
if(*buf == '\0') if (*buf == '\0')
{ {
return 0; return 0;
} }
@ -204,39 +214,44 @@ static int localize_string(char *buf,bool apersand)
char *j,*a; char *j,*a;
char *c = buf; char *c = buf;
if(apersand) if (apersand)
{ {
do { do {
if(*c == '%') if (*c == '%')
*c = ' '; *c = ' ';
t++; t++;
} while(*c++); } while (*c++);
c -= t; c -= t;
} }
t = 0; t = 0;
while(1) while (true)
{ {
if(!c || !(j = strstr(c,"#"))) if (!c || !(j = strstr(c, "#")))
break; break;
c = j + 1; c = j + 1;
if(!isdigit(*c) && isalpha(*c) && !isspace(*c)) if (!isdigit(*c) && isalpha(*c) && !isspace(*c))
{ {
CVector<const char *> *p = &(localize); for (CVector<const char *>::iterator i = localize.begin(); i != localize.end(); i++)
for(CVector<const char *>::iterator i = p->begin(); i != p->end(); i++)
{ {
while(1) while (true)
{ {
if(!(a = strcasestr(buf,(*i))) if (!(a = strcasestr(buf, (*i)))
&& !(a = strcasestr(buf,"#CZero_")) && !(a = strcasestr(buf, "#CZero_"))
&& !(a = strcasestr(buf,"#Cstrike_")) && !(a = strcasestr(buf, "#Cstrike_"))
&& !(a = strcasestr(buf,"#Career_"))) && !(a = strcasestr(buf, "#Career_"))
&& !(a = strcasestr(buf, "#GameUI_"))
&& !(a = strcasestr(buf, "#Hint_"))
&& !(a = strcasestr(buf, "#Spec_"))
&& !(a = strcasestr(buf, "#Game_"))
&& !(a = strcasestr(buf, "#Title_"))
&& !(a = strcasestr(buf, "#Valve_")))
{ {
break; break;
} }
@ -247,5 +262,6 @@ static int localize_string(char *buf,bool apersand)
} }
} }
} }
return (t > 0 && *buf != '\0'); return (t > 0 && *buf != '\0');
}; }

6
meta_api.cpp
View File

@ -35,19 +35,17 @@
#include "meta_api.h" #include "meta_api.h"
#undef C_DLLEXPORT #undef C_DLLEXPORT
#ifdef _WIN32 #ifdef _WIN32
#define C_DLLEXPORT extern "C" __declspec(dllexport) #define C_DLLEXPORT extern "C" __declspec(dllexport)
#else #else
#include <sys/mman.h>
#define C_DLLEXPORT extern "C" __attribute__((visibility("default"))) #define C_DLLEXPORT extern "C" __attribute__((visibility("default")))
#endif #endif // _WIN32
plugin_info_t Plugin_info = { plugin_info_t Plugin_info = {
META_INTERFACE_VERSION, META_INTERFACE_VERSION,
"LocalizeBug Fix", "LocalizeBug Fix",
"2.3", "2.4",
"20/09/14", "20/09/14",
"s1lent", "s1lent",
"http://www.aghl.ru/", "http://www.aghl.ru/",

39
msvc/PostBuild.bat Normal file
View File

@ -0,0 +1,39 @@
@echo OFF
::
:: Post-build auto-deploy script
:: Create and fill PublishPath.txt file with path to deployment folder
:: I.e. PublishPath.txt should contain one line with a folder path
:: Call it so:
:: IF EXIST "$(ProjectDir)PostBuild.bat" (CALL "$(ProjectDir)PostBuild.bat" "$(TargetDir)" "$(TargetName)" "$(TargetExt)" "$(ProjectDir)")
::
SET targetDir=%~1
SET targetName=%~2
SET targetExt=%~3
SET projectDir=%~4
SET destination=
IF NOT EXIST "%projectDir%\PublishPath.txt" (
ECHO No deployment path specified. Create PublishPath.txt near PostBuild.bat with paths on separate lines for auto deployment.
exit /B 0
)
FOR /f "tokens=* delims= usebackq" %%a IN ("%projectDir%\PublishPath.txt") DO (
ECHO Deploying to: %%a
IF NOT "%%a" == "" (
copy /Y "%targetDir%%targetName%%targetExt%" "%%a"
IF NOT ERRORLEVEL 1 (
IF EXIST "%targetDir%%targetName%.pdb" (
copy /Y "%targetDir%%targetName%.pdb" "%%a"
)
) ELSE (
ECHO PostBuild.bat ^(27^) : warning : Can't copy '%targetName%%targetExt%' to deploy path '%%a'
)
)
)
IF "%%a" == "" (
ECHO No deployment path specified.
)
exit /B 0

6
msvc10/localizebugfix.sln → msvc/localizebugfix.sln
View File

@ -1,6 +1,8 @@
 
Microsoft Visual Studio Solution File, Format Version 11.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2010 # Visual Studio 2013
VisualStudioVersion = 12.0.21005.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "localizebugfix", "localizebugfix.vcxproj", "{933B0D94-C6EC-47FB-AE34-2DC9F2B6D851}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "localizebugfix", "localizebugfix.vcxproj", "{933B0D94-C6EC-47FB-AE34-2DC9F2B6D851}"
EndProject EndProject
Global Global

50
msvc10/localizebugfix.vcxproj → msvc/localizebugfix.vcxproj
View File

@ -30,13 +30,13 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v110</PlatformToolset> <PlatformToolset>v120_xp</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v100</PlatformToolset> <PlatformToolset>v120_xp</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup> </PropertyGroup>
@ -55,6 +55,8 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>
<PreBuildEventUseInBuild>true</PreBuildEventUseInBuild>
<PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>
@ -93,13 +95,15 @@
</PrecompiledHeaderFile> </PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile> <PrecompiledHeaderOutputFile>
</PrecompiledHeaderOutputFile> </PrecompiledHeaderOutputFile>
<SDLCheck>
</SDLCheck>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>psapi.lib</AdditionalDependencies> <AdditionalDependencies>psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link> </Link>
<Bscmake> <Bscmake>
@ -108,33 +112,25 @@
<PreBuildEvent> <PreBuildEvent>
<Command> <Command>
</Command> </Command>
<Message>
</Message>
</PreBuildEvent> </PreBuildEvent>
<PostBuildEvent> <PostBuildEvent>
<Command>echo "LocalizeBugFix Compiling" <Command>IF EXIST "$(ProjectDir)PostBuild.bat" (CALL "$(ProjectDir)PostBuild.bat" "$(TargetDir)" "$(TargetName)" "$(TargetExt)" "$(ProjectDir)")</Command>
<Message>Automatic deployment script</Message>
copy /Y "$(TargetDir)localizebugfix.dll" "D:\HLDS\cstrike\addons\localizebugfix\localizebugfix.dll"
copy /Y "$(TargetDir)localizebugfix.dll" "C:\CrashDumps\localizebugfix.dll"
copy /Y "$(TargetDir)localizebugfix.pdb" "C:\CrashDumps\localizebugfix.pdb"
rmdir /q /s Release
IF EXIST "$(ProjectDir)ServerStart.bat" (CALL "$(ProjectDir)ServerStart.bat" "$(ProjectDir)..\" "$(ProjectDir)..\")</Command>
</PostBuildEvent> </PostBuildEvent>
<CustomBuildStep>
<Command>echo Empty Action</Command>
</CustomBuildStep>
<CustomBuildStep>
<Message>Force build to run Pre-Build event</Message>
</CustomBuildStep>
<CustomBuildStep>
<Outputs>subversion.always.run</Outputs>
</CustomBuildStep>
<CustomBuildStep>
<Inputs>subversion.always.run</Inputs>
</CustomBuildStep>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

0
msvc10/localizebugfix.vcxproj.filters → msvc/localizebugfix.vcxproj.filters
View File

BIN
msvc10/localizebugfix.suo
View File

Binary file not shown.