Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Backed out changeset 41ca53ad9bff

Browse Source
This commit is contained in:
Scott Ehlert 2013-02-04 18:37:37 -06:00
parent 86bfeec554
commit 77e900585a
8 changed files with 7189 additions and 7238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

400
configs/hamdata.ini
View File

@ -45,112 +45,112 @@
; TODO: check these - all are estimates ; TODO: check these - all are estimates
@section cstrike linux @section cstrike linux
pev 4 pev 0
base 0x0 base 0x94
spawn 0 spawn 2
precache 1 precache 3
keyvalue 3 keyvalue 5
objectcaps 6 objectcaps 8
activate 7 activate 9
setobjectcollisionbox 8 setobjectcollisionbox 10
classify 9 classify 11
deathnotice 10 deathnotice 12
traceattack 11 traceattack 13
takedamage 12 takedamage 14
takehealth 13 takehealth 15
killed 14 killed 16
bloodcolor 15 bloodcolor 17
tracebleed 16 tracebleed 18
istriggered 17 istriggered 19
mymonsterpointer 18 mymonsterpointer 20
mysquadmonsterpointer 19 mysquadmonsterpointer 21
gettogglestate 20 gettogglestate 22
addpoints 21 addpoints 23
addpointstoteam 22 addpointstoteam 24
addplayeritem 23 addplayeritem 25
removeplayeritem 24 removeplayeritem 26
giveammo 25 giveammo 27
getdelay 26 getdelay 28
ismoving 27 ismoving 29
overridereset 28 overridereset 30
damagedecal 29 damagedecal 31
settogglestate 30 settogglestate 32
startsneaking 31 startsneaking 33
stopsneaking 32 stopsneaking 34
oncontrols 33 oncontrols 35
issneaking 34 issneaking 36
isalive 35 isalive 37
isbspmodel 36 isbspmodel 38
reflectgauss 37 reflectgauss 39
hastarget 38 hastarget 40
isinworld 39 isinworld 41
isplayer 40 isplayer 42
isnetclient 41 isnetclient 43
teamid 42 teamid 44
getnexttarget 43 getnexttarget 45
think 44 think 46
touch 45 touch 47
use 46 use 48
blocked 47 blocked 49
respawn 48 respawn 50
updateowner 49 updateowner 51
fbecomeprone 50 fbecomeprone 52
center 51 center 53
eyeposition 52 eyeposition 54
earposition 53 earposition 55
bodytarget 54 bodytarget 56
illumination 55 illumination 57
fvisible 56 fvisible 58
fvecvisible 57 fvecvisible 59
player_jump 76 player_jump 78
player_duck 77 player_duck 79
player_prethink 78 player_prethink 80
player_postthink 79 player_postthink 81
player_getgunposition 80 player_getgunposition 82
player_shouldfadeondeath 66 player_shouldfadeondeath 68
player_impulsecommands 83 player_impulsecommands 84
player_updateclientdata 82 player_updateclientdata 83
item_addtoplayer 59 item_addtoplayer 61
item_addduplicate 60 item_addduplicate 62
item_getiteminfo 61 item_getiteminfo 63
item_candeploy 62 item_candeploy 64
item_deploy 64 item_deploy 66
item_canholster 66 item_canholster 68
item_holster 67 item_holster 69
item_updateiteminfo 68 item_updateiteminfo 70
item_preframe 69 item_preframe 71
item_postframe 70 item_postframe 72
item_drop 71 item_drop 73
item_kill 72 item_kill 74
item_attachtoplayer 73 item_attachtoplayer 75
item_primaryammoindex 74 item_primaryammoindex 76
item_secondaryammoindex 75 item_secondaryammoindex 77
item_updateclientdata 76 item_updateclientdata 78
item_getweaponptr 77 item_getweaponptr 79
item_itemslot 79 item_itemslot 81
weapon_extractammo 80 weapon_extractammo 82
weapon_extractclipammo 81 weapon_extractclipammo 83
weapon_addweapon 82 weapon_addweapon 84
weapon_playemptysound 83 weapon_playemptysound 85
weapon_resetemptysound 84 weapon_resetemptysound 86
weapon_sendweaponanim 85 weapon_sendweaponanim 87
weapon_isusable 86 weapon_isusable 88
weapon_primaryattack 87 weapon_primaryattack 89
weapon_secondaryattack 88 weapon_secondaryattack 90
weapon_reload 89 weapon_reload 91
weapon_weaponidle 90 weapon_weaponidle 92
weapon_retireweapon 91 weapon_retireweapon 93
weapon_shouldweaponidle 92 weapon_shouldweaponidle 94
weapon_usedecrement 93 weapon_usedecrement 95
cstrike_restart 2 cstrike_restart 4
cstrike_roundrespawn 84 cstrike_roundrespawn 86
cstrike_item_candrop 63 cstrike_item_candrop 65
cstrike_item_getmaxspeed 78 cstrike_item_getmaxspeed 80
@end @end
@section cstrike windows @section cstrike windows
@ -219,8 +219,8 @@
player_postthink 79 player_postthink 79
player_getgunposition 80 player_getgunposition 80
player_shouldfadeondeath 66 player_shouldfadeondeath 66
player_impulsecommands 83 player_impulsecommands 82
player_updateclientdata 82 player_updateclientdata 81
item_addtoplayer 59 item_addtoplayer 59
item_addduplicate 60 item_addduplicate 60
@ -1543,107 +1543,107 @@
@end @end
@section valve linux @section valve linux
pev 4 pev 0
base 0x0 base 0x60
spawn 0 spawn 2
precache 1 precache 3
keyvalue 2 keyvalue 4
objectcaps 5 objectcaps 7
activate 6 activate 8
setobjectcollisionbox 7 setobjectcollisionbox 9
classify 8 classify 10
deathnotice 9 deathnotice 11
traceattack 10 traceattack 12
takedamage 11 takedamage 13
takehealth 12 takehealth 14
killed 13 killed 15
bloodcolor 14 bloodcolor 16
tracebleed 15 tracebleed 17
istriggered 16 istriggered 18
mymonsterpointer 17 mymonsterpointer 19
mysquadmonsterpointer 18 mysquadmonsterpointer 20
gettogglestate 19 gettogglestate 21
addpoints 20 addpoints 22
addpointstoteam 21 addpointstoteam 23
addplayeritem 22 addplayeritem 24
removeplayeritem 23 removeplayeritem 25
giveammo 24 giveammo 26
getdelay 25 getdelay 27
ismoving 26 ismoving 28
overridereset 27 overridereset 29
damagedecal 28 damagedecal 30
settogglestate 29 settogglestate 31
startsneaking 30 startsneaking 32
stopsneaking 31 stopsneaking 33
oncontrols 32 oncontrols 34
issneaking 33 issneaking 35
isalive 34 isalive 36
isbspmodel 35 isbspmodel 37
reflectgauss 36 reflectgauss 38
hastarget 37 hastarget 39
isinworld 38 isinworld 40
isplayer 39 isplayer 41
isnetclient 40 isnetclient 42
teamid 41 teamid 43
getnexttarget 42 getnexttarget 44
think 43 think 45
touch 44 touch 46
use 45 use 47
blocked 46 blocked 48
respawn 47 respawn 49
updateowner 48 updateowner 50
fbecomeprone 49 fbecomeprone 51
center 50 center 52
eyeposition 51 eyeposition 53
earposition 52 earposition 54
bodytarget 53 bodytarget 55
illumination 54 illumination 56
fvisible 55 fvisible 57
fvecvisible 56 fvecvisible 58
player_jump 125 player_jump 127
player_duck 126 player_duck 128
player_prethink 127 player_prethink 129
player_postthink 128 player_postthink 130
player_getgunposition 119 player_getgunposition 121
player_shouldfadeondeath 60 player_shouldfadeondeath 62
player_impulsecommands 130 player_impulsecommands 132
player_updateclientdata 129 player_updateclientdata 131
item_addtoplayer 58 item_addtoplayer 60
item_addduplicate 59 item_addduplicate 61
item_getiteminfo 60 item_getiteminfo 62
item_candeploy 61 item_candeploy 63
item_deploy 62 item_deploy 64
item_canholster 63 item_canholster 65
item_holster 64 item_holster 66
item_updateiteminfo 65 item_updateiteminfo 67
item_preframe 66 item_preframe 68
item_postframe 67 item_postframe 69
item_drop 68 item_drop 70
item_kill 69 item_kill 71
item_attachtoplayer 70 item_attachtoplayer 72
item_primaryammoindex 71 item_primaryammoindex 73
item_secondaryammoindex 72 item_secondaryammoindex 74
item_updateclientdata 73 item_updateclientdata 75
item_getweaponptr 74 item_getweaponptr 76
item_itemslot 75 item_itemslot 77
weapon_extractammo 76 weapon_extractammo 78
weapon_extractclipammo 77 weapon_extractclipammo 79
weapon_addweapon 78 weapon_addweapon 80
weapon_playemptysound 79 weapon_playemptysound 81
weapon_resetemptysound 80 weapon_resetemptysound 82
weapon_sendweaponanim 81 weapon_sendweaponanim 83
weapon_isusable 82 weapon_isusable 84
weapon_primaryattack 83 weapon_primaryattack 85
weapon_secondaryattack 84 weapon_secondaryattack 86
weapon_reload 85 weapon_reload 87
weapon_weaponidle 86 weapon_weaponidle 88
weapon_retireweapon 87 weapon_retireweapon 89
weapon_shouldweaponidle 88 weapon_shouldweaponidle 90
weapon_usedecrement 89 weapon_usedecrement 91
@end @end
@section valve windows @section valve windows
pev 4 pev 4

47
dlls/hamsandwich/config/hamdata.ini
View File

@ -1147,6 +1147,14 @@
ts_weapon_alternateattack 95 ts_weapon_alternateattack 95
@end @end
; Sven-Coop has no linux binaries. This makes disassembly much harder.
@section svencoop windows
pev 4
base 0x0
takedamage 11
use 46
@end
@section esf windows @section esf windows
pev 4 pev 4
@ -1749,42 +1757,3 @@
weapon_usedecrement 89 weapon_usedecrement 89
@end @end
; Sven-Coop has no linux binaries. This makes disassembly much harder.
; These offsets were contributed by ts2do
@section SvenCoop windows
pev 4
base 0x0
spawn 0
precache 1
keyvalue 2
objectcaps 5
takedamage 11
addpoints 20
addpointstoteam 21
addplayeritem 22
removeplayeritem 23
giveammo 24
oncontrols 32
isalive 34
isbspmodel 35
reflectgauss 36
hastarget 37
isinworld 38
isplayer 39
isnetclient 40
teamid 42
getnexttarget 43
think 44
touch 45
use 46
blocked 47
respawn 48
center 51
eyeposition 52
earposition 53
bodytarget 54
illumination 55
fvisible 56
@end

80
installer/installer/AMXInstaller.cfg
View File

@ -1,40 +1,40 @@
-$A8 -$A8
-$B- -$B-
-$C+ -$C+
-$D+ -$D+
-$E- -$E-
-$F- -$F-
-$G+ -$G+
-$H+ -$H+
-$I+ -$I+
-$J- -$J-
-$K- -$K-
-$L+ -$L+
-$M- -$M-
-$N+ -$N+
-$O+ -$O+
-$P+ -$P+
-$Q- -$Q-
-$R- -$R-
-$S- -$S-
-$T- -$T-
-$U- -$U-
-$V+ -$V+
-$W- -$W-
-$X+ -$X+
-$YD -$YD
-$Z1 -$Z1
-GD -GD
-cg -cg
-AWinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; -AWinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
-H+ -H+
-W+ -W+
-M -M
-$M16384,1048576 -$M16384,1048576
-K$00400000 -K$00400000
-LE"c:\program files (x86)\delphi7se\Projects\Bpl" -LE"c:\program files\borland\delphi7\Projects\Bpl"
-LN"c:\program files (x86)\delphi7se\Projects\Bpl" -LN"c:\program files\borland\delphi7\Projects\Bpl"
-DmadExcept -DmadExcept
-w-UNSAFE_TYPE -w-UNSAFE_TYPE
-w-UNSAFE_CODE -w-UNSAFE_CODE
-w-UNSAFE_CAST -w-UNSAFE_CAST

274
installer/installer/AMXInstaller.dof
View File

@ -1,135 +1,139 @@
[FileVersion] [FileVersion]
Version=7.0 Version=7.0
[Compiler] [Compiler]
A=8 A=8
B=0 B=0
C=1 C=1
D=1 D=1
E=0 E=0
F=0 F=0
G=1 G=1
H=1 H=1
I=1 I=1
J=0 J=0
K=0 K=0
L=1 L=1
M=0 M=0
N=1 N=1
O=1 O=1
P=1 P=1
Q=0 Q=0
R=0 R=0
S=0 S=0
T=0 T=0
U=0 U=0
V=1 V=1
W=0 W=0
X=1 X=1
Y=1 Y=1
Z=1 Z=1
ShowHints=1 ShowHints=1
ShowWarnings=1 ShowWarnings=1
UnitAliases=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; UnitAliases=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
NamespacePrefix= NamespacePrefix=
SymbolDeprecated=1 SymbolDeprecated=1
SymbolLibrary=1 SymbolLibrary=1
SymbolPlatform=1 SymbolPlatform=1
UnitLibrary=1 UnitLibrary=1
UnitPlatform=1 UnitPlatform=1
UnitDeprecated=1 UnitDeprecated=1
HResultCompat=1 HResultCompat=1
HidingMember=1 HidingMember=1
HiddenVirtual=1 HiddenVirtual=1
Garbage=1 Garbage=1
BoundsError=1 BoundsError=1
ZeroNilCompat=1 ZeroNilCompat=1
StringConstTruncated=1 StringConstTruncated=1
ForLoopVarVarPar=1 ForLoopVarVarPar=1
TypedConstVarPar=1 TypedConstVarPar=1
AsgToTypedConst=1 AsgToTypedConst=1
CaseLabelRange=1 CaseLabelRange=1
ForVariable=1 ForVariable=1
ConstructingAbstract=1 ConstructingAbstract=1
ComparisonFalse=1 ComparisonFalse=1
ComparisonTrue=1 ComparisonTrue=1
ComparingSignedUnsigned=1 ComparingSignedUnsigned=1
CombiningSignedUnsigned=1 CombiningSignedUnsigned=1
UnsupportedConstruct=1 UnsupportedConstruct=1
FileOpen=1 FileOpen=1
FileOpenUnitSrc=1 FileOpenUnitSrc=1
BadGlobalSymbol=1 BadGlobalSymbol=1
DuplicateConstructorDestructor=1 DuplicateConstructorDestructor=1
InvalidDirective=1 InvalidDirective=1
PackageNoLink=1 PackageNoLink=1
PackageThreadVar=1 PackageThreadVar=1
ImplicitImport=1 ImplicitImport=1
HPPEMITIgnored=1 HPPEMITIgnored=1
NoRetVal=1 NoRetVal=1
UseBeforeDef=1 UseBeforeDef=1
ForLoopVarUndef=1 ForLoopVarUndef=1
UnitNameMismatch=1 UnitNameMismatch=1
NoCFGFileFound=1 NoCFGFileFound=1
MessageDirective=1 MessageDirective=1
ImplicitVariants=1 ImplicitVariants=1
UnicodeToLocale=1 UnicodeToLocale=1
LocaleToUnicode=1 LocaleToUnicode=1
ImagebaseMultiple=1 ImagebaseMultiple=1
SuspiciousTypecast=1 SuspiciousTypecast=1
PrivatePropAccessor=1 PrivatePropAccessor=1
UnsafeType=0 UnsafeType=0
UnsafeCode=0 UnsafeCode=0
UnsafeCast=0 UnsafeCast=0
[Linker] [Linker]
MapFile=3 MapFile=3
OutputObjs=0 OutputObjs=0
ConsoleApp=1 ConsoleApp=1
DebugInfo=0 DebugInfo=0
RemoteSymbols=0 RemoteSymbols=0
MinStackSize=16384 MinStackSize=16384
MaxStackSize=1048576 MaxStackSize=1048576
ImageBase=4194304 ImageBase=4194304
ExeDescription= ExeDescription=
[Directories] [Directories]
OutputDir= OutputDir=
UnitOutputDir= UnitOutputDir=
PackageDLLOutputDir= PackageDLLOutputDir=
PackageDCPOutputDir= PackageDCPOutputDir=
SearchPath= SearchPath=
Packages=vcl;rtl;vclx;vclie;xmlrtl;inetdbbde;inet;inetdbxpress;VclSmp;dbrtl;dbexpress;vcldb;dsnap;dbxcds;inetdb;bdertl;vcldbx;adortl;teeui;teedb;tee;ibxpress;visualclx;visualdbclx;vclactnband;vclshlctrls;IntrawebDB_50_70;Intraweb_50_70;Rave50CLX;Rave50VCL;dclOffice2k;JvStdCtrlsD7R;JvAppFrmD7R;JvCoreD7R;JvBandsD7R;JvBDED7R;JvDBD7R;JvDlgsD7R;JvCmpD7R;JvCryptD7R;JvCtrlsD7R;JvCustomD7R;JvDockingD7R;JvDotNetCtrlsD7R;JvEDID7R;qrpt;JvGlobusD7R;JvHMID7R;JvInspectorD7R;JvInterpreterD7R;JvJansD7R;JvManagedThreadsD7R;JvMMD7R;JvNetD7R;JvPageCompsD7R;JvPluginD7R;JvPrintPreviewD7R;JvSystemD7R;JvTimeFrameworkD7R;JvUIBD7R;JvValidatorsD7R;JvWizardD7R;JvXPCtrlsD7R;DelphiX_for7;Indy70;DJcl;tb2k_d7;FlatStyle_D5;scited7;mxFlatPack_D7;mbXPLib Packages=vcl;rtl;vclx;vclie;xmlrtl;inetdbbde;inet;inetdbxpress;VclSmp;dbrtl;dbexpress;vcldb;dsnap;dbxcds;inetdb;bdertl;vcldbx;adortl;teeui;teedb;tee;ibxpress;visualclx;visualdbclx;vclactnband;vclshlctrls;IntrawebDB_50_70;Intraweb_50_70;Rave50CLX;Rave50VCL;dclOffice2k;JvStdCtrlsD7R;JvAppFrmD7R;JvCoreD7R;JvBandsD7R;JvBDED7R;JvDBD7R;JvDlgsD7R;JvCmpD7R;JvCryptD7R;JvCtrlsD7R;JvCustomD7R;JvDockingD7R;JvDotNetCtrlsD7R;JvEDID7R;qrpt;JvGlobusD7R;JvHMID7R;JvInspectorD7R;JvInterpreterD7R;JvJansD7R;JvManagedThreadsD7R;JvMMD7R;JvNetD7R;JvPageCompsD7R;JvPluginD7R;JvPrintPreviewD7R;JvSystemD7R;JvTimeFrameworkD7R;JvUIBD7R;JvValidatorsD7R;JvWizardD7R;JvXPCtrlsD7R;DelphiX_for7;Indy70;DJcl;tb2k_d7;FlatStyle_D5;scited7;mxFlatPack_D7;mbXPLib
Conditionals=madExcept Conditionals=madExcept
DebugSourceDirs= DebugSourceDirs=
UsePackages=0 UsePackages=0
[Parameters] [Parameters]
RunParams=-debug RunParams=-debug
HostApplication= HostApplication=
Launcher= Launcher=
UseLauncher=0 UseLauncher=0
DebugCWD= DebugCWD=
[Version Info] [Language]
IncludeVerInfo=0 ActiveLang=
AutoIncBuild=0 ProjectLang=
MajorVer=1 RootDir=
MinorVer=0 [Version Info]
Release=0 IncludeVerInfo=0
Build=0 AutoIncBuild=0
Debug=0 MajorVer=1
PreRelease=0 MinorVer=0
Special=0 Release=0
Private=0 Build=0
DLL=0 Debug=0
Locale=1031 PreRelease=0
CodePage=1252 Special=0
[Version Info Keys] Private=0
CompanyName= DLL=0
FileDescription= Locale=1031
FileVersion=1.0.0.0 CodePage=1252
InternalName= [Version Info Keys]
LegalCopyright= CompanyName=
LegalTrademarks= FileDescription=
OriginalFilename= FileVersion=1.0.0.0
ProductName= InternalName=
ProductVersion=1.0.0.0 LegalCopyright=
Comments= LegalTrademarks=
[HistoryLists\hlUnitAliases] OriginalFilename=
Count=1 ProductName=
Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; ProductVersion=1.0.0.0
Comments=
[HistoryLists\hlUnitAliases]
Count=1
Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;

BIN
installer/installer/AMXInstaller.exe
View File

Binary file not shown.

41
installer/installer/UnitInstall.pas
View File

@ -6,7 +6,7 @@ uses SysUtils, Classes, Windows, Graphics, Forms, ShellAPI, Controls, Messages,
TlHelp32, IdFTPCommon, ComCtrls, Dialogs, JclFileUtils; TlHelp32, IdFTPCommon, ComCtrls, Dialogs, JclFileUtils;
type TMod = (modNone, modCS, modDoD, modTFC, modNS, modTS, modESF); type TMod = (modNone, modCS, modDoD, modTFC, modNS, modTS, modESF);
type TOS = (osWindows, osLinux, osMac{, osLinux64}); type TOS = (osWindows, osLinux32{, osLinux64});
procedure AddStatus(Text: String; Color: TColor; ShowTime: Boolean = True); procedure AddStatus(Text: String; Color: TColor; ShowTime: Boolean = True);
procedure AddDone(Additional: String = ''); procedure AddDone(Additional: String = '');
@ -222,7 +222,7 @@ begin
if ExtractFileExt(eFile) = '.so' then if ExtractFileExt(eFile) = '.so' then
Result := True; Result := True;
end; end;
osLinux: begin osLinux32: begin
if ExtractFileExt(eFile) = '.dll' then if ExtractFileExt(eFile) = '.dll' then
Result := True; Result := True;
if ExtractFileExt(eFile) = '.exe' then if ExtractFileExt(eFile) = '.exe' then
@ -231,14 +231,6 @@ begin
if Pos('_amd64', ExtractFileName(eFile)) <> 0 then if Pos('_amd64', ExtractFileName(eFile)) <> 0 then
Result := True; Result := True;
end; end;
osMac: begin
if ExtractFileExt(eFile) = '.dll' then
Result := True;
if ExtractFileExt(eFile) = '.exe' then
Result := True;
if ExtractFileExt(eFile) = '.so' then
Result := True;
end;
{osLinux64: begin {osLinux64: begin
if ExtractFileExt(eFile) = '.dll' then if ExtractFileExt(eFile) = '.dll' then
Result := True; Result := True;
@ -391,8 +383,7 @@ begin
//if OS = osLinux64 then //if OS = osLinux64 then
// eStr.Add('gamedll_linux "addons/metamod/dlls/metamod_amd64.so"') // eStr.Add('gamedll_linux "addons/metamod/dlls/metamod_amd64.so"')
//else //else
eStr.Add('gamedll_linux "addons/metamod/dlls/metamod.so"'); eStr.Add('gamedll_linux "addons/metamod/dlls/metamod_i386.so"');
eStr.Add('gamedll_linux "addons/metamod/dlls/metamod.dylib"');
FileSetAttr(ePath + 'liblist.gam', 0); FileSetAttr(ePath + 'liblist.gam', 0);
eStr.SaveToFile(ePath + 'liblist.gam'); eStr.SaveToFile(ePath + 'liblist.gam');
FileSetAttr(ePath + 'liblist.gam', faReadOnly); // important for listen servers FileSetAttr(ePath + 'liblist.gam', faReadOnly); // important for listen servers
@ -525,15 +516,13 @@ begin
{ metamod } { metamod }
AddStatus('Copying Metamod...', clBlack); AddStatus('Copying Metamod...', clBlack);
FileCopy(ePath + 'addons\amxmodx\dlls\metamod.dll', ePath + '\addons\metamod\dlls\metamod.dll', CopyConfig, False); FileCopy(ePath + 'addons\amxmodx\dlls\metamod.dll', ePath + '\addons\metamod\dlls\metamod.dll', CopyConfig, False);
FileCopy(ePath + '\addons\amxmodx\dlls\metamod.so', ePath + '\addons\metamod\dlls\metamod.so', CopyConfig, False); FileCopy(ePath + '\addons\amxmodx\dlls\metamod_i386.so', ePath + '\addons\metamod\dlls\metamod_i386.so', CopyConfig, False);
FileCopy(ePath + '\addons\amxmodx\dlls\metamod.dylib', ePath + '\addons\metamod\dlls\metamod.dylib', CopyConfig, False);
FileCopy(ePath + '\addons\amxmodx\dlls\metamod_amd64.so', ePath + '\addons\metamod\dlls\metamod_amd64.so', CopyConfig, False); FileCopy(ePath + '\addons\amxmodx\dlls\metamod_amd64.so', ePath + '\addons\metamod\dlls\metamod_amd64.so', CopyConfig, False);
try try
if FileExists(ePath + '\addons\amxmodx\dlls\metamod.dll') then DeleteFile(PChar(ePath + '\addons\amxmodx\dlls\metamod.dll')); if FileExists(ePath + '\addons\amxmodx\dlls\metamod.dll') then DeleteFile(PChar(ePath + '\addons\amxmodx\dlls\metamod.dll'));
if FileExists(ePath + '\addons\amxmodx\dlls\metamod_amd64.so') then DeleteFile(PChar(ePath + '\addons\amxmodx\dlls\metamod_amd64.so')); if FileExists(ePath + '\addons\amxmodx\dlls\metamod_amd64.so') then DeleteFile(PChar(ePath + '\addons\amxmodx\dlls\metamod_amd64.so'));
if FileExists(ePath + '\addons\amxmodx\dlls\metamod.so') then DeleteFile(PChar(ePath + '\addons\amxmodx\dlls\metamod.so')); if FileExists(ePath + '\addons\amxmodx\dlls\metamod_i386.so') then DeleteFile(PChar(ePath + '\addons\amxmodx\dlls\metamod_i386.so'));
if FileExists(ePath + '\addons\amxmodx\dlls\metamod.dylib') then DeleteFile(PChar(ePath + '\addons\amxmodx\dlls\metamod.dylib'));
finally finally
UpdatePluginsIni := True; UpdatePluginsIni := True;
eStr := TStringList.Create; eStr := TStringList.Create;
@ -544,14 +533,10 @@ begin
if (Pos('addons\amxmodx\dlls\amxmodx_mm.dll', eStr.Text) <> 0) then if (Pos('addons\amxmodx\dlls\amxmodx_mm.dll', eStr.Text) <> 0) then
UpdatePluginsIni := False; UpdatePluginsIni := False;
end end
else if OS = osLinux then begin else if OS = osLinux32 then begin
if (Pos('addons/amxmodx/dlls/amxmodx_mm_i386.so', eStr.Text) <> 0) then if (Pos('addons/amxmodx/dlls/amxmodx_mm_i386.so', eStr.Text) <> 0) then
UpdatePluginsIni := False; UpdatePluginsIni := False;
end end
else if OS = osMac then begin
if (Pos('addons/amxmodx/dlls/amxmodx_mm.dylib', eStr.Text) <> 0) then
UpdatePluginsIni := False;
end
else begin else begin
if (Pos('addons/amxmodx/dlls/amxmodx_mm_amd64.so', eStr.Text) <> 0) then if (Pos('addons/amxmodx/dlls/amxmodx_mm_amd64.so', eStr.Text) <> 0) then
UpdatePluginsIni := False; UpdatePluginsIni := False;
@ -570,18 +555,12 @@ begin
eStr.Add('; Enable this instead for binary logging'); eStr.Add('; Enable this instead for binary logging');
eStr.Add('; win32 addons\amxmodx\dlls\amxmodx_bl_mm.dll'); eStr.Add('; win32 addons\amxmodx\dlls\amxmodx_bl_mm.dll');
end end
else if OS = osLinux then begin else if OS = osLinux32 then begin
eStr.Add(''); eStr.Add('');
eStr.Add('linux addons/amxmodx/dlls/amxmodx_mm_i386.so'); eStr.Add('linux addons/amxmodx/dlls/amxmodx_mm_i386.so');
eStr.Add('; Enable this instead for binary logging'); eStr.Add('; Enable this instead for binary logging');
eStr.Add('; linux addons/amxmodx/dlls/amxmodx_bl_mm_i386.so'); eStr.Add('; linux addons/amxmodx/dlls/amxmodx_bl_mm_i386.so');
end end
else if OS = osMac then begin
eStr.Add('');
eStr.Add('osx addons/amxmodx/dlls/amxmodx_mm.dylib');
eStr.Add('; Enable this instead for binary logging');
eStr.Add('; osx addons/amxmodx/dlls/amxmodx_bl_mm.dylib');
end
else begin else begin
eStr.Add(''); eStr.Add('');
eStr.Add('linux addons/amxmodx/dlls/amxmodx_mm_amd64.so'); eStr.Add('linux addons/amxmodx/dlls/amxmodx_mm_amd64.so');
@ -731,10 +710,10 @@ begin
end; end;
if frmMain.optWindows.Checked then if frmMain.optWindows.Checked then
eStr.Add('gamedll "addons\metamod\dlls\metamod.dll"') eStr.Add('gamedll "addons\metamod\dlls\metamod.dll"')
else if frmMain.optLinux.Checked then else if frmMain.optLinux32.Checked then
eStr.Add('gamedll_linux "addons/metamod/dlls/metamod.so"') eStr.Add('gamedll_linux "addons/metamod/dlls/metamod_i386.so"')
else else
eStr.Add('gamedll_osx "addons/metamod/dlls/metamod.dylib"'); eStr.Add('gamedll_linux "addons/metamod/dlls/metamod_amd64.so"');
FileSetAttr(ExtractFilePath(Application.ExeName) + 'temp\liblist.gam', 0); FileSetAttr(ExtractFilePath(Application.ExeName) + 'temp\liblist.gam', 0);
eStr.SaveToFile(ExtractFilePath(Application.ExeName) + 'temp\liblist.gam'); eStr.SaveToFile(ExtractFilePath(Application.ExeName) + 'temp\liblist.gam');
end; end;

13570
installer/installer/UnitfrmMain.dfm
View File

File diff suppressed because it is too large Load Diff

15
installer/installer/UnitfrmMain.pas
View File

@ -107,10 +107,10 @@ type
lblStep3: TLabel; lblStep3: TLabel;
pnlOS: TPanel; pnlOS: TPanel;
optWindows: TFlatRadioButton; optWindows: TFlatRadioButton;
optLinux: TFlatRadioButton; optLinux32: TFlatRadioButton;
lblStep5: TLabel; lblStep5: TLabel;
lblFTP: TLabel; lblFTP: TLabel;
optMac: TFlatRadioButton; optLinux64: TFlatRadioButton;
procedure jvwStepsCancelButtonClick(Sender: TObject); procedure jvwStepsCancelButtonClick(Sender: TObject);
procedure cmdCancelClick(Sender: TObject); procedure cmdCancelClick(Sender: TObject);
procedure cmdNextClick(Sender: TObject); procedure cmdNextClick(Sender: TObject);
@ -149,7 +149,7 @@ var
frmMain: TfrmMain; frmMain: TfrmMain;
gMultiAccount: Boolean; gMultiAccount: Boolean;
const VERSION = '1.8.2'; const VERSION = '1.8.0';
implementation implementation
@ -249,8 +249,7 @@ begin
trvDirectories.Enabled := False; trvDirectories.Enabled := False;
cmdConnect.Enabled := False; cmdConnect.Enabled := False;
optWindows.Enabled := False; optWindows.Enabled := False;
optLinux.Enabled := False; optLinux32.Enabled := False;
optMac.Enabled := False;
//optLinux64.Enabled := False; //optLinux64.Enabled := False;
cboGameAddon.Enabled := False; cboGameAddon.Enabled := False;
// preinstall... // preinstall...
@ -282,10 +281,8 @@ begin
if optWindows.Checked then if optWindows.Checked then
eOS := osWindows eOS := osWindows
else if optLinux.Checked then else //if optLinux32.Checked then
eOS := osLinux eOS := osLinux32;
else
eOS := osMac;
//else //else
// eOS := osLinux64; // eOS := osLinux64;