GitHub/amxmodx
2
0
Fork 0
mirror of https://github.com/alliedmodders/amxmodx.git synced 2024-12-25 06:15:37 +03:00
Code Issues Projects Releases Wiki Activity

making sure evrything is in cvs :)

Browse Source 
+ changed directory structure

base dir:
moddir/addons/amxx
core dll / so:
moddir/addons/amxx/dlls
modules dll / so files:
moddir/addons/amxx/modules
plugins .amx files:
moddir/addons/amxx/plugins
configs:
moddir/addons/amxx/config
  modules.ini - module file names, without path info
  plugins.ini - plugin file names, without path info
  core.ini - renamed from config.ini
This commit is contained in:
Pavol Marko 2004-03-05 18:32:29 +00:00
parent 35470c1ecb
commit 71b590eb15
29 changed files with 779 additions and 755 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
amxmodx/CCmd.cpp
View File

@ -1,21 +1,20 @@
/* AMX Mod X
/*
* Copyright (c) 2002-2003 Aleksander Naszko
*
* by the AMX Mod X Development Team
* originally developed by OLO
* This file is part of AMX Mod.
*
*
* This program is free software; you can redistribute it and/or modify it
* AMX Mod is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* AMX Mod is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* along with AMX Mod; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, the author gives permission to
@ -27,6 +26,7 @@
* to your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from your
* version.
*
*/
#include <extdll.h>

14
amxmodx/CCmd.h
View File

@ -1,21 +1,20 @@
/* AMX Mod X
/*
* Copyright (c) 2002-2003 Aleksander Naszko
*
* by the AMX Mod X Development Team
* originally developed by OLO
* This file is part of AMX Mod.
*
*
* This program is free software; you can redistribute it and/or modify it
* AMX Mod is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* AMX Mod is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* along with AMX Mod; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, the author gives permission to
@ -27,6 +26,7 @@
* to your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from your
* version.
*
*/
#ifndef COMMANDS_H

5
amxmodx/CEvent.cpp
View File

@ -345,6 +345,11 @@ void EventsMngr::executeEvents()
{
int err;
if (!m_ParseFun)
{
return;
}
#ifdef ENABLEEXEPTIONS
try
{

14
amxmodx/CFile.cpp
View File

@ -1,21 +1,20 @@
/* AMX Mod X
/*
* Copyright (c) 2002-2003 Aleksander Naszko
*
* by the AMX Mod X Development Team
* originally developed by OLO
* This file is part of AMX Mod.
*
*
* This program is free software; you can redistribute it and/or modify it
* AMX Mod is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* AMX Mod is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* along with AMX Mod; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, the author gives permission to
@ -27,6 +26,7 @@
* to your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from your
* version.
*
*/
#include "CFile.h"

16
amxmodx/CFile.h
View File

@ -1,21 +1,20 @@
/* AMX Mod X
/*
* Copyright (c) 2002-2003 Aleksander Naszko
*
* by the AMX Mod X Development Team
* originally developed by OLO
* This file is part of AMX Mod.
*
*
* This program is free software; you can redistribute it and/or modify it
* AMX Mod is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* AMX Mod is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* along with AMX Mod; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, the author gives permission to
@ -27,10 +26,11 @@
* to your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from your
* version.
*
*/
#include "CString.h"
#include <stdio.h>
#include "CString.h"
// *****************************************************
// class File

16
amxmodx/CForward.cpp
View File

@ -1,21 +1,20 @@
/* AMX Mod X
/*
* Copyright (c) 2002-2003 Aleksander Naszko
*
* by the AMX Mod X Development Team
* originally developed by OLO
* This file is part of AMX Mod.
*
*
* This program is free software; you can redistribute it and/or modify it
* AMX Mod is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* AMX Mod is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* along with AMX Mod; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, the author gives permission to
@ -27,6 +26,7 @@
* to your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from your
* version.
*
*/
#include <extdll.h>
@ -68,7 +68,7 @@ void CForwardMngr::executeForwards( int type , int num , int player ) {
{
if ((err = amx_Exec(a->getPlugin()->getAMX(), &ret, a->getFunction() , num, player)) != AMX_ERR_NONE)
print_srvconsole("[AMX] Run time error %d on line %ld (plugin \"%s\")\n", err,a->getPlugin()->getAMX()->curline,a->getPlugin()->getName());
UTIL_Log("[AMXX] Run time error %d on line %ld (plugin \"%s\")", err,a->getPlugin()->getAMX()->curline,a->getPlugin()->getName());
if ( ret )
break;

14
amxmodx/CForward.h
View File

@ -1,21 +1,20 @@
/* AMX Mod X
/*
* Copyright (c) 2002-2003 Aleksander Naszko
*
* by the AMX Mod X Development Team
* originally developed by OLO
* This file is part of AMX Mod.
*
*
* This program is free software; you can redistribute it and/or modify it
* AMX Mod is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* AMX Mod is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* along with AMX Mod; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, the author gives permission to
@ -27,6 +26,7 @@
* to your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from your
* version.
*
*/
#ifndef FORWARD_H

14
amxmodx/CLogEvent.h
View File

@ -1,21 +1,20 @@
/* AMX Mod X
/*
* Copyright (c) 2002-2003 Aleksander Naszko
*
* by the AMX Mod X Development Team
* originally developed by OLO
* This file is part of AMX Mod.
*
*
* This program is free software; you can redistribute it and/or modify it
* AMX Mod is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* AMX Mod is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* along with AMX Mod; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, the author gives permission to
@ -27,6 +26,7 @@
* to your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from your
* version.
*
*/
#ifndef LOGEVENTS_H

14
amxmodx/CMenu.cpp
View File

@ -1,21 +1,20 @@
/* AMX Mod X
/*
* Copyright (c) 2002-2003 Aleksander Naszko
*
* by the AMX Mod X Development Team
* originally developed by OLO
* This file is part of AMX Mod.
*
*
* This program is free software; you can redistribute it and/or modify it
* AMX Mod is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* AMX Mod is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* along with AMX Mod; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, the author gives permission to
@ -27,6 +26,7 @@
* to your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from your
* version.
*
*/
#include <extdll.h>

14
amxmodx/CMenu.h
View File

@ -1,21 +1,20 @@
/* AMX Mod X
/*
* Copyright (c) 2002-2003 Aleksander Naszko
*
* by the AMX Mod X Development Team
* originally developed by OLO
* This file is part of AMX Mod.
*
*
* This program is free software; you can redistribute it and/or modify it
* AMX Mod is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* AMX Mod is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* along with AMX Mod; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, the author gives permission to
@ -27,6 +26,7 @@
* to your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from your
* version.
*
*/
#ifndef MENUS_H

14
amxmodx/CModule.cpp
View File

@ -1,21 +1,20 @@
/* AMX Mod X
/*
* Copyright (c) 2002-2003 Aleksander Naszko
*
* by the AMX Mod X Development Team
* originally developed by OLO
* This file is part of AMX Mod.
*
*
* This program is free software; you can redistribute it and/or modify it
* AMX Mod is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* AMX Mod is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* along with AMX Mod; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, the author gives permission to
@ -27,6 +26,7 @@
* to your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from your
* version.
*
*/
#include <extdll.h>

14
amxmodx/CModule.h
View File

@ -1,21 +1,20 @@
/* AMX Mod X
/*
* Copyright (c) 2002-2003 Aleksander Naszko
*
* by the AMX Mod X Development Team
* originally developed by OLO
* This file is part of AMX Mod.
*
*
* This program is free software; you can redistribute it and/or modify it
* AMX Mod is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* AMX Mod is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* along with AMX Mod; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, the author gives permission to
@ -27,6 +26,7 @@
* to your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from your
* version.
*
*/
// *****************************************************

10
amxmodx/CPlugin.cpp
View File

@ -60,14 +60,8 @@ int CPluginMngr::loadPluginsFromFile( const char* filename )
}
// Find now folder
char pluginName[256], line[256], error[256], pluginsDir[256];
strcpy(pluginsDir,filename);
char* ptrEnd = pluginsDir;
for (int i = 0; pluginsDir[i];++i ) {
if (pluginsDir[i] == '/' || pluginsDir[i] == '\\')
ptrEnd = &pluginsDir[i];
}
*ptrEnd = 0;
char pluginName[256], line[256], error[256];
const char pluginsDir[] = "addons/amxx/plugins"; // hardcoded; :TODO: make it localinfo
while ( fp.getline(line , 255 ) )

15
amxmodx/CPlugin.h
View File

@ -1,21 +1,20 @@
/* AMX Mod X
/*
* Copyright (c) 2002-2003 Aleksander Naszko
*
* by the AMX Mod X Development Team
* originally developed by OLO
* This file is part of AMX Mod.
*
*
* This program is free software; you can redistribute it and/or modify it
* AMX Mod is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* AMX Mod is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* along with AMX Mod; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, the author gives permission to
@ -27,8 +26,8 @@
* to your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from your
* version.
*
*/
#ifndef PLUGIN_H
#define PLUGIN_H

14
amxmodx/CString.cpp
View File

@ -1,21 +1,20 @@
/* AMX Mod X
/*
* Copyright (c) 2002-2003 Aleksander Naszko
*
* by the AMX Mod X Development Team
* originally developed by OLO
* This file is part of AMX Mod.
*
*
* This program is free software; you can redistribute it and/or modify it
* AMX Mod is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* AMX Mod is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* along with AMX Mod; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, the author gives permission to
@ -27,6 +26,7 @@
* to your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from your
* version.
*
*/
#include "CString.h"

14
amxmodx/CString.h
View File

@ -1,21 +1,20 @@
/* AMX Mod X
/*
* Copyright (c) 2002-2003 Aleksander Naszko
*
* by the AMX Mod X Development Team
* originally developed by OLO
* This file is part of AMX Mod.
*
*
* This program is free software; you can redistribute it and/or modify it
* AMX Mod is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* AMX Mod is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* along with AMX Mod; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, the author gives permission to
@ -27,6 +26,7 @@
* to your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from your
* version.
*
*/
#ifndef STRING_CUSTOM_H

14
amxmodx/CTask.cpp
View File

@ -1,21 +1,20 @@
/* AMX Mod X
/*
* Copyright (c) 2002-2003 Aleksander Naszko
*
* by the AMX Mod X Development Team
* originally developed by OLO
* This file is part of AMX Mod.
*
*
* This program is free software; you can redistribute it and/or modify it
* AMX Mod is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* AMX Mod is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* along with AMX Mod; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, the author gives permission to
@ -27,6 +26,7 @@
* to your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from your
* version.
*
*/
#include <extdll.h>

14
amxmodx/CTask.h
View File

@ -1,21 +1,20 @@
/* AMX Mod X
/*
* Copyright (c) 2002-2003 Aleksander Naszko
*
* by the AMX Mod X Development Team
* originally developed by OLO
* This file is part of AMX Mod.
*
*
* This program is free software; you can redistribute it and/or modify it
* AMX Mod is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* AMX Mod is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* along with AMX Mod; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, the author gives permission to
@ -27,6 +26,7 @@
* to your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from your
* version.
*
*/
#ifndef CTASK_H

14
amxmodx/CVault.cpp
View File

@ -1,21 +1,20 @@
/* AMX Mod X
/*
* Copyright (c) 2002-2003 Aleksander Naszko
*
* by the AMX Mod X Development Team
* originally developed by OLO
* This file is part of AMX Mod.
*
*
* This program is free software; you can redistribute it and/or modify it
* AMX Mod is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* AMX Mod is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* along with AMX Mod; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, the author gives permission to
@ -27,6 +26,7 @@
* to your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from your
* version.
*
*/
#include "CVault.h"

14
amxmodx/CVault.h
View File

@ -1,21 +1,20 @@
/* AMX Mod X
/*
* Copyright (c) 2002-2003 Aleksander Naszko
*
* by the AMX Mod X Development Team
* originally developed by OLO
* This file is part of AMX Mod.
*
*
* This program is free software; you can redistribute it and/or modify it
* AMX Mod is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* AMX Mod is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* along with AMX Mod; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, the author gives permission to
@ -27,6 +26,7 @@
* to your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from your
* version.
*
*/
#ifndef VAULT_CUSTOM_H

6
amxmodx/amxmod.cpp
View File

@ -2056,7 +2056,7 @@ int g_CallFunc_CurParam = 0; // Current param id
#define CALLFUNC_FLAG_BYREF 1 /* Byref flag so that mem is released */
// native callfunc_begin(const plugin[], const func[]);
// native callfunc_begin(const func[], const plugin[]="");
static cell AMX_NATIVE_CALL callfunc_begin(AMX *amx, cell *params)
{
CPluginMngr::CPlugin *curPlugin = g_plugins.findPluginFast(amx);
@ -2070,8 +2070,8 @@ static cell AMX_NATIVE_CALL callfunc_begin(AMX *amx, cell *params)
int numparams = *params / sizeof(cell);
int len;
char *pluginStr = get_amxstring(amx, params[1], 0, len);
char *funcStr = get_amxstring(amx, params[2], 1, len);
char *pluginStr = get_amxstring(amx, params[2], 0, len);
char *funcStr = get_amxstring(amx, params[1], 1, len);
CPluginMngr::CPlugin *plugin = NULL;
if (!pluginStr || !*pluginStr)
plugin = curPlugin;

14
amxmodx/emsg.cpp
View File

@ -1,21 +1,20 @@
/* AMX Mod X
/*
* Copyright (c) 2002-2003 Aleksander Naszko
*
* by the AMX Mod X Development Team
* originally developed by OLO
* This file is part of AMX Mod.
*
*
* This program is free software; you can redistribute it and/or modify it
* AMX Mod is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* AMX Mod is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* along with AMX Mod; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, the author gives permission to
@ -27,6 +26,7 @@
* to your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from your
* version.
*
*/
#include <extdll.h>

14
amxmodx/file.cpp
View File

@ -1,21 +1,20 @@
/* AMX Mod X
/*
* Copyright (c) 2002-2003 Aleksander Naszko
*
* by the AMX Mod X Development Team
* originally developed by OLO
* This file is part of AMX Mod.
*
*
* This program is free software; you can redistribute it and/or modify it
* AMX Mod is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* AMX Mod is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* along with AMX Mod; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, the author gives permission to
@ -27,6 +26,7 @@
* to your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from your
* version.
*
*/
// intptr_t

20
amxmodx/meta_api.cpp
View File

@ -212,8 +212,8 @@ int Spawn( edict_t *pent ) {
hostname = CVAR_GET_POINTER("hostname");
mp_timelimit = CVAR_GET_POINTER("mp_timelimit");
// ###### Initialize logging]
g_log_dir.set( get_localinfo("amx_logdir" , "addons/amx/logs" ) );
// ###### Initialize logging
g_log_dir.set( get_localinfo("amx_logdir" , "addons/amxx/logs" ) );
UTIL_MakeNewLogFile();
// ###### Initialize task manager
@ -229,7 +229,7 @@ int Spawn( edict_t *pent ) {
Vault amx_config;
// ###### Load custom path configuration
amx_config.setSource( build_pathname("%s",
get_localinfo("amx_cfg" , "addons/amx/config.ini")) );
get_localinfo("amx_cfg" , "addons/amxx/config/core.ini")) );
if ( amx_config.loadVault() ){
Vault::iterator a = amx_config.begin();
@ -241,10 +241,10 @@ int Spawn( edict_t *pent ) {
}
// ###### Make sure basedir is set
get_localinfo("amx_basedir" , "addons/amx" );
get_localinfo("amx_basedir" , "addons/amxx" );
// ###### Load modules
int loaded = loadModules( get_localinfo("amx_modules" , "addons/amx/modules.ini" ) );
int loaded = loadModules( get_localinfo("amx_modules" , "addons/amxx/config/modules.ini" ) );
attachModules();
// Set some info about amx version and modules
if ( loaded ){
@ -261,7 +261,7 @@ int Spawn( edict_t *pent ) {
// ###### Load Vault
g_vault.setSource( build_pathname("%s",
get_localinfo("amx_vault" , "addons/amx/vault.ini" ) ) );
get_localinfo("amx_vault" , "addons/amxx/config/vault.ini" ) ) );
g_vault.loadVault( );
@ -276,7 +276,7 @@ int Spawn( edict_t *pent ) {
// ###### Load AMX scripts
g_plugins.loadPluginsFromFile(
get_localinfo("amx_plugins" , "addons/amx/plugins/plugins.ini" ) );
get_localinfo("amx_plugins" , "addons/amxx/config/plugins.ini" ) );
// ###### Call precache forward function
g_dontprecache = false;
@ -962,7 +962,7 @@ C_DLLEXPORT int Meta_Attach(PLUG_LOADTIME now, META_FUNCTIONS *pFunctionTable, m
CVAR_REGISTER (&init_amxmodx_version);
amx_version = CVAR_GET_POINTER(init_amx_version.name );
amxmodx_version = CVAR_GET_POINTER(init_amxmodx_version.name);
REG_SVR_COMMAND("amx",amx_command);
REG_SVR_COMMAND("amxx",amx_command);
char gameDir[512];
GET_GAME_DIR(gameDir);
@ -975,7 +975,7 @@ C_DLLEXPORT int Meta_Attach(PLUG_LOADTIME now, META_FUNCTIONS *pFunctionTable, m
// ###### Now attach metamod modules
attachMetaModModules( get_localinfo("amx_modules" ,
"addons/amx/modules.ini" ) );
"addons/amxx/config/modules.ini" ) );
return(TRUE);
}
@ -1005,7 +1005,7 @@ C_DLLEXPORT int Meta_Detach(PLUG_LOADTIME now, PL_UNLOAD_REASON reason) {
// ###### Now dettach metamod modules
dettachMetaModModules( get_localinfo("amx_modules" ,
"addons/amx/modules.ini" ) );
"addons/amxx/config/modules.ini" ) );
return(TRUE);
}

40
amxmodx/modules.cpp
View File

@ -282,6 +282,32 @@ char* build_pathname(char *fmt, ... )
return string;
}
// build pathname based on addons dir
char* build_pathname_addons(char *fmt, ... )
{
static char string[256];
va_list argptr;
va_start (argptr, fmt);
vsnprintf (string, 255, fmt, argptr);
va_end (argptr);
char* path = string;
while (*path)
{
#ifndef __linux__
if (*path == '/') *path = '\\';
#else
if (*path == '\\') *path = '/';
#endif
++path;
}
return string;
}
int add_amxnatives(module_info_s* info,AMX_NATIVE_INFO*natives)
{
CList<CModule>::iterator a = g_modules.begin();
@ -333,11 +359,10 @@ int loadModules(const char* filename)
{
*moduleName = 0;
sscanf(line,"%s",moduleName);
if (!isalnum(*moduleName) || !validFile(moduleName) )
continue;
char* pathname = build_pathname("%s",moduleName);
char* pathname = build_pathname("addons/amxx/modules/%s", line);
CList<CModule>::iterator a = g_modules.find( pathname );
@ -451,7 +476,8 @@ void dettachMetaModModules( const char* filename )
if (!isalnum(*moduleName) || !validFile(moduleName) )
continue;
char* pathname = build_pathname("%s",moduleName);
char* pathname = build_pathname_addons("addons/amxx/modules/%s", line);
char* mmpathname = build_pathname_addons("addons/amxx/modules/%s", line);
module = DLLOAD( pathname ); // link dll
@ -461,7 +487,7 @@ void dettachMetaModModules( const char* filename )
if ( a )
{
snprintf(cmdline,255, "meta unload %s\n", strip_name(moduleName) );
snprintf(cmdline,255, "meta unload %s\n", strip_name(mmpathname) );
cmdline[255] = 0;
SERVER_COMMAND( cmdline );
}
@ -494,8 +520,8 @@ void attachMetaModModules( const char* filename )
if (!isalnum(*moduleName) || !validFile(moduleName) )
continue;
char* pathname = build_pathname("%s",moduleName);
char* pathname = build_pathname("addons/amxx/modules/%s", line);
char* mmpathname = build_pathname_addons("addons/amxx/modules/%s", line);
module = DLLOAD( pathname ); // link dll
if ( module )
@ -504,7 +530,7 @@ void attachMetaModModules( const char* filename )
if ( a )
{
snprintf(cmdline,255, "meta load %s\n", moduleName );
snprintf(cmdline,255, "meta load %s\n", mmpathname );
cmdline[255] = 0;
SERVER_COMMAND( cmdline );
++loaded;

14
amxmodx/modules.h
View File

@ -1,21 +1,20 @@
/* AMX Mod X
/*
* Copyright (c) 2002-2003 Aleksander Naszko
*
* by the AMX Mod X Development Team
* originally developed by OLO
* This file is part of AMX Mod.
*
*
* This program is free software; you can redistribute it and/or modify it
* AMX Mod is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* AMX Mod is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* along with AMX Mod; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, the author gives permission to
@ -27,6 +26,7 @@
* to your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from your
* version.
*
*/
#ifndef __MODULES_H__

22
amxmodx/srvcmd.cpp
View File

@ -1,21 +1,20 @@
/* AMX Mod X
/*
* Copyright (c) 2002-2003 Aleksander Naszko
*
* by the AMX Mod X Development Team
* originally developed by OLO
* This file is part of AMX Mod.
*
*
* This program is free software; you can redistribute it and/or modify it
* AMX Mod is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* AMX Mod is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* along with AMX Mod; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, the author gives permission to
@ -27,6 +26,7 @@
* to your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from your
* version.
*
*/
#include <extdll.h>
@ -172,9 +172,9 @@ void amx_command(){
{
print_srvconsole("Usage: amx < command > [ argument ]\n");
print_srvconsole("Usage: amxx < command > [ argument ]\n");
print_srvconsole("Commands:\n");
print_srvconsole(" version - display amx version info\n");
print_srvconsole(" version - display amxx version info\n");
print_srvconsole(" plugins - list plugins currently loaded\n");
print_srvconsole(" modules - list modules currently loaded\n");
print_srvconsole(" cvars - list cvars registered by plugins\n");
@ -209,7 +209,7 @@ void plugin_srvcmd()
if ((err = amx_Exec( (*a).getPlugin()->getAMX(), &ret , (*a).getFunction()
, 3 , g_srvindex , (*a).getFlags() , (*a).getId() )) != AMX_ERR_NONE)
print_srvconsole("[AMX] Run time error %d on line %ld (plugin \"%s\")\n",
UTIL_Log("[AMXX] Run time error %d on line %ld (plugin \"%s\")",
err,(*a).getPlugin()->getAMX()->curline,(*a).getPlugin()->getName());
if ( ret ) break;
@ -221,7 +221,7 @@ void plugin_srvcmd()
#ifdef ENABLEEXEPTIONS
}catch( ... )
{
print_srvconsole( "[AMX] fatal error at forward function execution\n");
UTIL_Log( "[AMXX] fatal error at forward function execution");
}
#endif

14
amxmodx/string.cpp
View File

@ -1,21 +1,20 @@
/* AMX Mod X
/*
* Copyright (c) 2002-2003 Aleksander Naszko
*
* by the AMX Mod X Development Team
* originally developed by OLO
* This file is part of AMX Mod.
*
*
* This program is free software; you can redistribute it and/or modify it
* AMX Mod is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* AMX Mod is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* along with AMX Mod; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, the author gives permission to
@ -27,6 +26,7 @@
* to your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from your
* version.
*
*/
#include <extdll.h>

14
amxmodx/vault.cpp
View File

@ -1,21 +1,20 @@
/* AMX Mod X
/*
* Copyright (c) 2002-2003 Aleksander Naszko
*
* by the AMX Mod X Development Team
* originally developed by OLO
* This file is part of AMX Mod.
*
*
* This program is free software; you can redistribute it and/or modify it
* AMX Mod is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* AMX Mod is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* along with AMX Mod; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, the author gives permission to
@ -27,6 +26,7 @@
* to your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from your
* version.
*
*/
#include <extdll.h>