From bb54b373995dff8ed0eb54379c068a8904cdd3bc Mon Sep 17 00:00:00 2001 From: David Anderson Date: Sun, 4 Mar 2007 04:37:42 +0000 Subject: [PATCH] removed allow_nongpl, it wasn't really viable --- amxmodx/CPlugin.cpp | 11 +++-------- amxmodx/version.rc | 4 ++-- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/amxmodx/CPlugin.cpp b/amxmodx/CPlugin.cpp index a8989633..c9ecfa66 100755 --- a/amxmodx/CPlugin.cpp +++ b/amxmodx/CPlugin.cpp @@ -240,15 +240,10 @@ void CPluginMngr::CPlugin::AddToFailCounter(unsigned int i) { failcounter += i; if ((failcounter >= 3) - && (status == ps_paused - || status == ps_running)) + && (status )) { - int allow_nongpl = atoi(get_localinfo("allow_nongpl", "0")); - if (!allow_nongpl) - { - errorMsg.assign("This plugin is non-GPL, violating AMX Mod X's license. Edit core.ini to allow this."); - status = ps_bad_load; - } + errorMsg.assign("This plugin is non-GPL which violates AMX Mod X's license."); + status = ps_bad_load; } } diff --git a/amxmodx/version.rc b/amxmodx/version.rc index 2d87d159..90a6406d 100755 --- a/amxmodx/version.rc +++ b/amxmodx/version.rc @@ -27,8 +27,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,7,6,3377 - PRODUCTVERSION 1,7,6,3377 + FILEVERSION 1,7,6,3380 + PRODUCTVERSION 1,7,6,3380 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L