From b311a9ccc394f4b246820881f7afb8b367262999 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 24 Mar 2004 02:10:20 +0000 Subject: [PATCH] new file names+headers --- dlls/cstrike/cstrike.h | 5 +++-- dlls/cstrike/cstrike.vcproj | 1 + dlls/engine/build.sh | 8 -------- dlls/engine/engine.def | 2 +- dlls/engine/engine.dsp | 8 ++++---- dlls/engine/engine.dsw | 2 +- dlls/engine/engine.h | 2 +- dlls/engine/engine.vcproj | 6 +++--- 8 files changed, 14 insertions(+), 20 deletions(-) delete mode 100755 dlls/engine/build.sh diff --git a/dlls/cstrike/cstrike.h b/dlls/cstrike/cstrike.h index 8a1f4c01..7b2a51f9 100755 --- a/dlls/cstrike/cstrike.h +++ b/dlls/cstrike/cstrike.h @@ -1,5 +1,5 @@ //#define __cswonbuild__ // comment when compiling for STEAM -#define CS_WON_BUILD +//#define CS_WON_BUILD /* AMX Mod X * Counter-Strike Module @@ -113,7 +113,8 @@ pfnmodule_engine_g* g_engModuleFunc; #define OFFSET_CSDEATHS 448 + EXTRAOFFSET // differs -1 from STEAM // "weapon_*" entities #define OFFSET_WEAPONTYPE 43 + EXTRAOFFSET // same as STEAM - //#define OFFSET_CLIPAMMO 51 + EXTRAOFFSET // not tested under WON!!!!!!!!!!!!!!!!!! + //jghg I uncommented this so it would compile + #define OFFSET_CLIPAMMO 51 + EXTRAOFFSET // not tested under WON!!!!!!!!!!!!!!!!!! #define OFFSET_SILENCER_FIREMODE 70 + EXTRAOFFSET // differs -4 from STEAM // "hostage_entity" entities #define OFFSET_HOSTAGEFOLLOW 86 + EXTRAOFFSET // same as STEAM diff --git a/dlls/cstrike/cstrike.vcproj b/dlls/cstrike/cstrike.vcproj index 146ba440..cc7cbdaa 100755 --- a/dlls/cstrike/cstrike.vcproj +++ b/dlls/cstrike/cstrike.vcproj @@ -3,6 +3,7 @@ ProjectType="Visual C++" Version="7.10" Name="cstrike" + ProjectGUID="{AB148B92-4F47-42E6-8268-AB4E588EC6A2}" SccProjectName="" SccLocalPath=""> diff --git a/dlls/engine/build.sh b/dlls/engine/build.sh deleted file mode 100755 index 1878f011..00000000 --- a/dlls/engine/build.sh +++ /dev/null @@ -1,8 +0,0 @@ -rm meta_api.o -rm engine.so - -#use VexD's optimizations - -gcc -static -march=i686 -O6 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations -fno-exceptions -fno-rtti -s -Wall -Wno-unknown-pragmas -DOPT_TYPE=\"optimized\" -lstdc++ -fPIC -I. -I../metamod/metamod -I../hlsdk/multiplayer/engine -I../hlsdk/multiplayer/common -I../hlsdk/multiplayer/pm_shared -I../hlsdk/multiplayer/dlls -I../hlsdk/multiplayer -I../amxmodx/ -c meta_api.cpp -o meta_api.o - -gcc -static -march=i686 -O6 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations -falign-loops=2 -falign-jumps=2 -falign-functions=2 -fno-exceptions -fno-rtti -s -Wall -Wno-unknown-pragmas -DOPT_TYPE=\"optimized\" -shared -ldl -lm -lstdc++ meta_api.o -o engine.so diff --git a/dlls/engine/engine.def b/dlls/engine/engine.def index 3ac06b47..90004998 100755 --- a/dlls/engine/engine.def +++ b/dlls/engine/engine.def @@ -1,4 +1,4 @@ -LIBRARY engine_mm +LIBRARY engine_amx EXPORTS GiveFnptrsToDll @1 Meta_Attach @2 diff --git a/dlls/engine/engine.dsp b/dlls/engine/engine.dsp index b123d2be..e4b90c8d 100755 --- a/dlls/engine/engine.dsp +++ b/dlls/engine/engine.dsp @@ -17,7 +17,7 @@ CFG=engine - Win32 Debug !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "engine_mm - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "engine_amx - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "engine - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE @@ -29,7 +29,7 @@ CPP=cl.exe MTL=midl.exe RSC=rc.exe -!IF "$(CFG)" == "engine_mm - Win32 Release" +!IF "$(CFG)" == "engine_amx - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -52,7 +52,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"release/engine_mm.dll" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"release/engine_amx.dll" !ELSEIF "$(CFG)" == "engine - Win32 Debug" @@ -83,7 +83,7 @@ LINK32=link.exe # Begin Target -# Name "engine_mm - Win32 Release" +# Name "engine_amx - Win32 Release" # Name "engine - Win32 Debug" # Begin Group "Source Files" diff --git a/dlls/engine/engine.dsw b/dlls/engine/engine.dsw index dda09d5e..9fb1f1e7 100755 --- a/dlls/engine/engine.dsw +++ b/dlls/engine/engine.dsw @@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ############################################################################### -Project: "engine_mm"=".\engine.dsp" - Package Owner=<4> +Project: "engine_amx"=".\engine.dsp" - Package Owner=<4> Package=<5> {{{ diff --git a/dlls/engine/engine.h b/dlls/engine/engine.h index 396f724f..85b0fd8b 100755 --- a/dlls/engine/engine.h +++ b/dlls/engine/engine.h @@ -32,7 +32,7 @@ * version. */ -#define VERSION "0.15" +#define VERSION "0.16" plugin_info_t Plugin_info = { diff --git a/dlls/engine/engine.vcproj b/dlls/engine/engine.vcproj index 86abea03..c18c587e 100755 --- a/dlls/engine/engine.vcproj +++ b/dlls/engine/engine.vcproj @@ -39,12 +39,12 @@ Name="VCCustomBuildTool"/>