Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Engine: Use UTF-8 functions where KeyValueData is touched

Browse Source
This commit is contained in:
Valentin Grünbacher
2015-05-11 00:35:14 +02:00
parent c24fbda302
commit 7bf47f90d9
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/engine/engine.cpp
View File

@@ -372,7 +372,7 @@ static cell AMX_NATIVE_CALL get_info_keybuffer(AMX *amx, cell *params)
char *info = GETINFOKEYBUFFER((iEnt == -1) ? NULL : INDEXENT2(iEnt)); char *info = GETINFOKEYBUFFER((iEnt == -1) ? NULL : INDEXENT2(iEnt));
return MF_SetAmxString(amx, params[2], info, params[3]); return MF_SetAmxStringUTF8Char(amx, params[2], info, strlen(info), params[3]);
} }
//from jghg, who says it doesn't work //from jghg, who says it doesn't work

11
modules/engine/entity.cpp
View File

@@ -200,20 +200,21 @@ static cell AMX_NATIVE_CALL get_keyvalue(AMX *amx, cell *params)
edict_t *pEntity = INDEXENT2(idx); edict_t *pEntity = INDEXENT2(idx);
int iLength=0; int iLength=0;
char *char1 = MF_GetAmxString(amx, params[2], 1, &iLength); char *char1 = MF_GetAmxString(amx, params[2], 1, &iLength);
return MF_SetAmxString(amx, params[3], INFO_KEY_VALUE(INFO_KEY_BUFFER(pEntity),char1), params[4]); char *val = INFO_KEY_VALUE(INFO_KEY_BUFFER(pEntity), char1);
return MF_SetAmxStringUTF8Char(amx, params[3], val, strlen(val), params[4]);
} }
static cell AMX_NATIVE_CALL copy_keyvalue(AMX *amx, cell *params) static cell AMX_NATIVE_CALL copy_keyvalue(AMX *amx, cell *params)
{ {
if (!g_inKeyValue) if (!g_inKeyValue)
return 0; return 0;
if (g_pkvd->szClassName) if (g_pkvd->szClassName)
MF_SetAmxString(amx, params[1], g_pkvd->szClassName, params[2]); MF_SetAmxStringUTF8Char(amx, params[1], g_pkvd->szClassName, strlen(g_pkvd->szClassName), params[2]);
if (g_pkvd->szKeyName) if (g_pkvd->szKeyName)
MF_SetAmxString(amx, params[3], g_pkvd->szKeyName, params[4]); MF_SetAmxStringUTF8Char(amx, params[3], g_pkvd->szKeyName, strlen(g_pkvd->szKeyName), params[4]);
if (g_pkvd->szValue) if (g_pkvd->szValue)
MF_SetAmxString(amx, params[5], g_pkvd->szValue, params[6]); MF_SetAmxStringUTF8Char(amx, params[5], g_pkvd->szValue, strlen(g_pkvd->szValue), params[6]);
return 1; return 1;
} }