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

Synced hamdata.ini

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

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

@ -1147,14 +1147,6 @@
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
@ -1757,3 +1749,42 @@
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\borland\delphi7\Projects\Bpl" -LE"c:\program files (x86)\delphi7se\Projects\Bpl"
-LN"c:\program files\borland\delphi7\Projects\Bpl" -LN"c:\program files (x86)\delphi7se\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,139 +1,135 @@
[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=
[Language] [Version Info]
ActiveLang= IncludeVerInfo=0
ProjectLang= AutoIncBuild=0
RootDir= MajorVer=1
[Version Info] MinorVer=0
IncludeVerInfo=0 Release=0
AutoIncBuild=0 Build=0
MajorVer=1 Debug=0
MinorVer=0 PreRelease=0
Release=0 Special=0
Build=0 Private=0
Debug=0 DLL=0
PreRelease=0 Locale=1031
Special=0 CodePage=1252
Private=0 [Version Info Keys]
DLL=0 CompanyName=
Locale=1031 FileDescription=
CodePage=1252 FileVersion=1.0.0.0
[Version Info Keys] InternalName=
CompanyName= LegalCopyright=
FileDescription= LegalTrademarks=
FileVersion=1.0.0.0 OriginalFilename=
InternalName= ProductName=
LegalCopyright= ProductVersion=1.0.0.0
LegalTrademarks= Comments=
OriginalFilename= [HistoryLists\hlUnitAliases]
ProductName= Count=1
ProductVersion=1.0.0.0 Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
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, osLinux32{, osLinux64}); type TOS = (osWindows, osLinux, osMac{, 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;
osLinux32: begin osLinux: 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,6 +231,14 @@ 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;
@ -383,7 +391,8 @@ 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_i386.so"'); eStr.Add('gamedll_linux "addons/metamod/dlls/metamod.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
@ -516,13 +525,15 @@ 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_i386.so', ePath + '\addons\metamod\dlls\metamod_i386.so', CopyConfig, False); FileCopy(ePath + '\addons\amxmodx\dlls\metamod.so', ePath + '\addons\metamod\dlls\metamod.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_i386.so') then DeleteFile(PChar(ePath + '\addons\amxmodx\dlls\metamod_i386.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.dylib') then DeleteFile(PChar(ePath + '\addons\amxmodx\dlls\metamod.dylib'));
finally finally
UpdatePluginsIni := True; UpdatePluginsIni := True;
eStr := TStringList.Create; eStr := TStringList.Create;
@ -533,10 +544,14 @@ 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 = osLinux32 then begin else if OS = osLinux 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;
@ -555,12 +570,18 @@ 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 = osLinux32 then begin else if OS = osLinux 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');
@ -710,10 +731,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.optLinux32.Checked then else if frmMain.optLinux.Checked then
eStr.Add('gamedll_linux "addons/metamod/dlls/metamod_i386.so"') eStr.Add('gamedll_linux "addons/metamod/dlls/metamod.so"')
else else
eStr.Add('gamedll_linux "addons/metamod/dlls/metamod_amd64.so"'); eStr.Add('gamedll_osx "addons/metamod/dlls/metamod.dylib"');
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;
optLinux32: TFlatRadioButton; optLinux: TFlatRadioButton;
lblStep5: TLabel; lblStep5: TLabel;
lblFTP: TLabel; lblFTP: TLabel;
optLinux64: TFlatRadioButton; optMac: 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.0'; const VERSION = '1.8.2';
implementation implementation
@ -249,7 +249,8 @@ begin
trvDirectories.Enabled := False; trvDirectories.Enabled := False;
cmdConnect.Enabled := False; cmdConnect.Enabled := False;
optWindows.Enabled := False; optWindows.Enabled := False;
optLinux32.Enabled := False; optLinux.Enabled := False;
optMac.Enabled := False;
//optLinux64.Enabled := False; //optLinux64.Enabled := False;
cboGameAddon.Enabled := False; cboGameAddon.Enabled := False;
// preinstall... // preinstall...
@ -281,8 +282,10 @@ begin
if optWindows.Checked then if optWindows.Checked then
eOS := osWindows eOS := osWindows
else //if optLinux32.Checked then else if optLinux.Checked then
eOS := osLinux32; eOS := osLinux
else
eOS := osMac;
//else //else
// eOS := osLinux64; // eOS := osLinux64;