From 42ff533d65f05ed3493b3d2e21b952f6a675dd94 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Thu, 24 Jun 2004 07:11:52 +0000 Subject: [PATCH] Fixing more incorrect merges --- amxmodx/amxmodx.cpp | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/amxmodx/amxmodx.cpp b/amxmodx/amxmodx.cpp index 8ac4a45c..3bc6317d 100755 --- a/amxmodx/amxmodx.cpp +++ b/amxmodx/amxmodx.cpp @@ -2181,10 +2181,20 @@ static cell AMX_NATIVE_CALL get_module(AMX *amx, cell *params) return -1; // not found // set name, author, version - 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]); + if ((*moduleIter).isAmxx()) + { + const amxx_module_info_s *info = (*moduleIter).getInfoNew(); + 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 int numParams = params[0] / sizeof(cell);