diff --git a/dlls/cstrike/cstrike/AMBuilder b/dlls/cstrike/cstrike/AMBuilder index b96e0207..904ab6d6 100644 --- a/dlls/cstrike/cstrike/AMBuilder +++ b/dlls/cstrike/cstrike/AMBuilder @@ -7,7 +7,7 @@ binary.sources = [ 'sdk/amxxmodule.cpp', 'amxx_api.cpp', 'CstrikePlayer.cpp', - 'cstrike.cpp', + 'CstrikeNatives.cpp', 'CstrikeHacks.cpp', ] diff --git a/dlls/cstrike/cstrike/CstrikeHacks.cpp b/dlls/cstrike/cstrike/CstrikeHacks.cpp index 97278dc7..11119b43 100644 --- a/dlls/cstrike/cstrike/CstrikeHacks.cpp +++ b/dlls/cstrike/cstrike/CstrikeHacks.cpp @@ -1,6 +1,6 @@ #include #include -#include "cstrike.h" +#include "CstrikeNatives.h" #if defined(__linux__) || defined(__APPLE__) #include diff --git a/dlls/cstrike/cstrike/cstrike.cpp b/dlls/cstrike/cstrike/CstrikeNatives.cpp old mode 100755 new mode 100644 similarity index 97% rename from dlls/cstrike/cstrike/cstrike.cpp rename to dlls/cstrike/cstrike/CstrikeNatives.cpp index dc90838f..ef106976 --- a/dlls/cstrike/cstrike/cstrike.cpp +++ b/dlls/cstrike/cstrike/CstrikeNatives.cpp @@ -1,4 +1,36 @@ -#include "cstrike.h" +/* AMX Mod X + * Counter-Strike Module + * + * by the AMX Mod X Development Team + * + * This file is part of AMX Mod X. + * + * + * This program 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 + * 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, + * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * In addition, as a special exception, the author gives permission to + * link the code of this program with the Half-Life Game Engine ("HL + * Engine") and Modified Game Libraries ("MODs") developed by Valve, + * L.L.C ("Valve"). You must obey the GNU General Public License in all + * respects for all of the code used other than the HL Engine and MODs + * from Valve. If you modify this file, you may extend this exception + * 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 "CstrikeNatives.h" CCstrikePlayer g_players[33]; int g_zooming[33] = {0}; @@ -1306,8 +1338,8 @@ static cell AMX_NATIVE_CALL cs_user_spawn(AMX *amx, cell *params) MDLL_Think(pPlayer); const char *auth = GETPLAYERAUTHID(pPlayer); - if (((pPlayer->v.flags & FL_FAKECLIENT) == FL_FAKECLIENT || (auth && (strcmp(auth, "BOT") == 0))) && pPlayer->v.deadflag == DEAD_RESPAWNABLE) { - MDLL_Spawn(pPlayer); + if (((pPlayer->v.flags & FL_FAKECLIENT) == FL_FAKECLIENT || (auth && (strcmp(auth, "BOT") == 0))) && pPlayer->v.deadflag == DEAD_RESPAWNABLE) { + MDLL_Spawn(pPlayer); } // pPlayer->v.iuser1 = 0; diff --git a/dlls/cstrike/cstrike/cstrike.h b/dlls/cstrike/cstrike/CstrikeNatives.h old mode 100755 new mode 100644 similarity index 100% rename from dlls/cstrike/cstrike/cstrike.h rename to dlls/cstrike/cstrike/CstrikeNatives.h diff --git a/dlls/cstrike/cstrike/Makefile b/dlls/cstrike/cstrike/Makefile index c3c22401..61140da5 100755 --- a/dlls/cstrike/cstrike/Makefile +++ b/dlls/cstrike/cstrike/Makefile @@ -14,7 +14,7 @@ MM_ROOT = ../../../../metamod/metamod PROJECT = cstrike -OBJECTS = sdk/amxxmodule.cpp amxx_api.cpp CstrikePlayer.cpp cstrike.cpp CstrikeHacks.cpp +OBJECTS = sdk/amxxmodule.cpp amxx_api.cpp CstrikePlayer.cpp CstrikeNatives.cpp CstrikeHacks.cpp ############################################## ### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ### diff --git a/dlls/cstrike/cstrike/amxx_api.cpp b/dlls/cstrike/cstrike/amxx_api.cpp index 2b8c27eb..3a4f0c68 100644 --- a/dlls/cstrike/cstrike/amxx_api.cpp +++ b/dlls/cstrike/cstrike/amxx_api.cpp @@ -31,7 +31,7 @@ * version. */ #include "amxxmodule.h" -#include "cstrike.h" +#include "CstrikeNatives.h" extern AMX_NATIVE_INFO cstrikeNatives[]; diff --git a/dlls/cstrike/cstrike/msvc10/cstrike.vcxproj b/dlls/cstrike/cstrike/msvc10/cstrike.vcxproj index 5904a14e..7232ab8a 100644 --- a/dlls/cstrike/cstrike/msvc10/cstrike.vcxproj +++ b/dlls/cstrike/cstrike/msvc10/cstrike.vcxproj @@ -136,13 +136,13 @@ - + - + diff --git a/dlls/cstrike/cstrike/msvc10/cstrike.vcxproj.filters b/dlls/cstrike/cstrike/msvc10/cstrike.vcxproj.filters index 1cea77cc..b3e7ccc3 100644 --- a/dlls/cstrike/cstrike/msvc10/cstrike.vcxproj.filters +++ b/dlls/cstrike/cstrike/msvc10/cstrike.vcxproj.filters @@ -20,9 +20,6 @@ - - Source Files - Source Files @@ -32,11 +29,14 @@ Module SDK\SDK Base + + Source Files + + + Source Files + - - Header Files - Header Files @@ -49,6 +49,9 @@ Module SDK\SDK Base + + Header Files +