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

Fixing more incorrect merges

Browse Source
This commit is contained in:
David Anderson 2004-06-24 07:11:52 +00:00
parent 4b3d2d3133
commit 42ff533d65
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
amxmodx/amxmodx.cpp
View File

@ -2181,10 +2181,20 @@ static cell AMX_NATIVE_CALL get_module(AMX *amx, cell *params)
return -1; // not found return -1; // not found
// set name, author, version // set name, author, version
module_info_s *info = (*moduleIter).getInfo(); if ((*moduleIter).isAmxx())
set_amxstring(amx, params[2], info->name, params[3]); {
set_amxstring(amx, params[4], info->author, params[5]); const amxx_module_info_s *info = (*moduleIter).getInfoNew();
set_amxstring(amx, params[6], info->version, params[7]); set_amxstring(amx, params[2], info->name, params[3]);
set_amxstring(amx, params[4], info->author, params[5]);
set_amxstring(amx, params[6], info->version, params[7]);
}
else
{
module_info_s *info = (*moduleIter).getInfo();
set_amxstring(amx, params[2], info->name, params[3]);
set_amxstring(amx, params[4], info->author, params[5]);
set_amxstring(amx, params[6], info->version, params[7]);
}
// compatibility problem possible // compatibility problem possible
int numParams = params[0] / sizeof(cell); int numParams = params[0] / sizeof(cell);