Backing these changes, less menu crashes and (coming soon) usable options menu

This commit is contained in:
Marco Cawthorne 2017-09-29 01:05:40 -05:00
parent 076c2bf09e
commit c48199140f
12 changed files with 352 additions and 135 deletions

252
Source/FreeCS-CE.prj Executable file → Normal file
View file

@ -1,143 +1,133 @@
<project version="Crimson Editor 3.60"> <project version="Crimson Editor 3.60">
<category name="Client" expanded="yes"> <category name="Client" expanded="no">
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Client\Defs.h" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Client\Defs.h" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Client\Draw.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Client\Draw.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Client\Entities.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Client\Entities.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Client\Event.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Client\Event.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Client\HUD.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Client\HUD.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Client\HUDCrosshair.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Client\HUDCrosshair.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Client\HUDOrbituaries.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Client\HUDOrbituaries.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Client\HUDScope.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Client\HUDScope.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Client\HUDWeaponSelect.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Client\HUDWeaponSelect.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Client\Init.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Client\Init.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Client\Nightvision.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Client\Nightvision.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Client\Player.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Client\Player.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Client\progs.src" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Client\progs.src" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Client\Sound.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Client\Sound.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Client\VGUI.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Client\VGUI.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Client\VGUI.h" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Client\VGUI.h" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Client\VGUIBuyMenu.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Client\VGUIBuyMenu.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Client\VGUIMOTD.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Client\VGUIMOTD.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Client\VGUIObjects.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Client\VGUIObjects.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Client\VGUIRadio.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Client\VGUIRadio.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Client\VGUIScoreboard.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Client\VGUIScoreboard.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Client\VGUISpectator.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Client\VGUISpectator.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Client\VGUITeamSelect.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Client\VGUITeamSelect.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Client\View.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Client\View.c" />
</category> </category>
<category name="Server" expanded="yes"> <category name="Server" expanded="yes">
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\AmbientSound.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Server\AmbientSound.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\Ammo.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Server\Ammo.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\ArmouryEntity.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Server\ArmouryEntity.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\Client.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Server\Client.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\Damage.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Server\Damage.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\Defs.h" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Server\Defs.h" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\EntHostage.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Server\EntHostage.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\Entities.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Server\Entities.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\EnvObjects.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Server\EnvObjects.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\Footsteps.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Server\Footsteps.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\FuncBombTarget.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Server\FuncBombTarget.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\FuncBreakable.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Server\FuncBreakable.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\FuncButton.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Server\FuncButton.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\FuncBuyZone.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Server\FuncBuyZone.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\FuncDoor.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Server\FuncDoor.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\FuncDoorRotating.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Server\FuncDoorRotating.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\FuncEscapeZone.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Server\FuncEscapeZone.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\FuncHostageRescue.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Server\FuncHostageRescue.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\FuncLadder.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Server\FuncLadder.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\FuncPushable.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Server\FuncPushable.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\FuncVIPSafetyZone.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Server\FuncVIPSafetyZone.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\Input.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Server\Input.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\Light.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Server\Light.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\Main.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Server\Main.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\Money.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Server\Money.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\PhysicsMove.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Server\PhysicsMove.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\Player.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Server\Player.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\progs.src" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Server\progs.src" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\Rules.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Server\Rules.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\Spawn.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Server\Spawn.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\Timer.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Server\Timer.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\TraceAttack.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Server\TraceAttack.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\Triggers.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Server\Triggers.c" />
</category> </category>
<category name="Menu" expanded="yes"> <category name="Menu" expanded="yes">
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Menu\Defs.h" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Menu\Defs.h" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Menu\Draw.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Menu\Draw.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Menu\Header.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Menu\Header.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Menu\Init.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Menu\Init.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Menu\Input.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Menu\Input.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Menu\MenuMain.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Menu\MenuConfiguration.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Menu\MenuMultiplayer.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Menu\MenuMain.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Menu\Objects.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Menu\MenuMultiplayer.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Menu\progs.src" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Menu\Objects.c" />
<localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Menu\progs.src" />
</category> </category>
<category name="Shared" expanded="yes"> <category name="Shared" expanded="no">
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Shared\Animations.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Shared\Animations.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Shared\BaseMelee.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Shared\BaseMelee.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Shared\Effects.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Shared\Effects.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Shared\Equipment.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Shared\Equipment.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Shared\Radio.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Shared\Radio.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Shared\WeaponAK47.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Shared\WeaponAK47.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Shared\WeaponAUG.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Shared\WeaponAUG.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Shared\WeaponAWP.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Shared\WeaponAWP.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Shared\WeaponBase.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Shared\WeaponBase.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Shared\WeaponC4Bomb.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Shared\WeaponC4Bomb.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Shared\WeaponDeagle.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Shared\WeaponDeagle.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Shared\WeaponElites.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Shared\WeaponElites.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Shared\WeaponFiveSeven.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Shared\WeaponFiveSeven.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Shared\WeaponFlashbang.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Shared\WeaponFlashbang.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Shared\WeaponG3SG1.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Shared\WeaponG3SG1.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Shared\WeaponGlock18.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Shared\WeaponGlock18.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Shared\WeaponHEGrenade.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Shared\WeaponHEGrenade.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Shared\WeaponKnife.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Shared\WeaponKnife.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Shared\WeaponM3.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Shared\WeaponM3.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Shared\WeaponM4A1.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Shared\WeaponM4A1.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Shared\WeaponMac10.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Shared\WeaponMac10.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Shared\WeaponMP5.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Shared\WeaponMP5.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Shared\WeaponP228.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Shared\WeaponP228.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Shared\WeaponP90.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Shared\WeaponP90.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Shared\WeaponPara.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Shared\WeaponPara.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Shared\Weapons.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Shared\Weapons.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Shared\WeaponScout.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Shared\WeaponScout.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Shared\WeaponSG550.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Shared\WeaponSG550.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Shared\WeaponSG552.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Shared\WeaponSG552.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Shared\WeaponSmokeGrenade.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Shared\WeaponSmokeGrenade.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Shared\WeaponTMP.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Shared\WeaponTMP.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Shared\WeaponUMP45.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Shared\WeaponUMP45.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Shared\WeaponUSP45.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Shared\WeaponUSP45.c" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Shared\WeaponXM1014.c" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Shared\WeaponXM1014.c" />
</category> </category>
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Builtins.h" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Builtins.h" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Globals.h" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Globals.h" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Math.h" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Math.h" />
</project> </project>
<workspace version="Crimson Editor 3.60"> <workspace version="Crimson Editor 3.60">
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\AmbientSound.c" linenum="42" placement="0:1:-1:-1:-4:-23:0:0:848:465" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Client\Event.c" linenum="29" placement="0:1:-1:-1:-4:-23:66:66:838:288" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\Ammo.c" linenum="1" placement="0:1:-1:-1:-4:-23:22:22:874:491" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Server\Damage.c" linenum="133" placement="0:1:-1:-1:-4:-23:88:88:936:546" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\ArmouryEntity.c" linenum="1" placement="0:1:-1:-1:-4:-23:44:44:896:513" /> <localfile path="C:\Users\eukara\Dropbox\good.txt" linenum="1" placement="0:1:-1:-1:-4:-23:66:66:914:524" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\Client.c" linenum="1" placement="0:1:-1:-1:-4:-23:66:66:918:535" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Menu\MenuMultiplayer.c" linenum="133" placement="0:1:-1:-1:-4:-23:88:88:936:546" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\EntHostage.c" linenum="1" placement="0:1:-1:-1:-4:-23:88:88:940:557" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Menu\Objects.c" linenum="20" placement="0:1:-1:-1:-4:-23:110:110:958:568" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Shared\WeaponAWP.c" linenum="39" placement="0:1:-1:-1:-4:-23:132:132:984:601" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Menu\Draw.c" linenum="13" placement="0:1:-1:-1:-4:-23:132:132:980:590" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Builtins.h" linenum="1" placement="0:1:-1:-1:-4:-23:154:154:1006:623" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Menu\MenuMain.c" linenum="43" placement="0:1:-1:-1:-4:-23:154:154:1002:612" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Globals.h" linenum="178" placement="0:1:-1:-1:-4:-23:176:176:1028:645" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Menu\MenuConfiguration.c" linenum="38" placement="0:1:-1:-1:-4:-23:176:176:1024:634" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Math.h" linenum="1" placement="0:1:-1:-1:-4:-23:198:198:1050:667" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\freecs\menu.dat.en.po" linenum="38" placement="0:1:-1:-1:-4:-23:0:0:848:458" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\TraceAttack.c" linenum="39" placement="0:1:-1:-1:-4:-23:220:220:1072:689" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Server\Footsteps.c" linenum="1" placement="0:1:-1:-1:-4:-23:22:22:870:480" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Shared\WeaponDeagle.c" linenum="23" placement="0:1:-1:-1:-4:-23:0:0:852:469" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Server\Main.c" linenum="133" placement="0:1:-1:-1:-4:-23:44:44:892:502" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Shared\WeaponElites.c" linenum="24" placement="0:1:-1:-1:-4:-23:22:22:874:491" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Server\Defs.h" linenum="167" placement="0:1:-1:-1:-4:-23:66:66:914:524" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Shared\WeaponM3.c" linenum="31" placement="0:1:-1:-1:-4:-23:44:44:896:513" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Builtins.h" linenum="1712" placement="0:1:-1:-1:-4:-23:88:88:936:546" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\PhysicsMove.c" linenum="17" placement="0:1:-1:-1:-4:-23:66:66:918:535" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Menu\progs.src" linenum="14" placement="0:1:-1:-1:-4:-23:110:110:958:568" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\Player.c" linenum="33" placement="0:1:-1:-1:-4:-23:88:88:940:557" /> <localfile path="C:\Tools\Cygwin\home\eukara\FreeCS\Source\Menu\Init.c" linenum="35" placement="2:3:-1:-1:-4:-23:132:132:980:590" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\Rules.c" linenum="20" placement="0:1:-1:-1:-4:-23:110:110:962:579" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\Money.c" linenum="16" placement="0:1:-1:-1:-4:-23:132:132:984:601" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\Main.c" linenum="16" placement="0:1:-1:-1:-4:-23:154:154:1006:623" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\Light.c" linenum="19" placement="0:1:-1:-1:-4:-23:176:176:1028:645" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\Input.c" linenum="15" placement="0:1:-1:-1:-4:-23:198:198:1050:667" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\FuncVIPSafetyZone.c" linenum="14" placement="0:1:-1:-1:-4:-23:220:220:1072:689" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\FuncPushable.c" linenum="54" placement="0:1:-1:-1:-4:-23:0:0:852:469" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\FuncDoorRotating.c" linenum="181" placement="0:1:-1:-1:-4:-23:22:22:874:491" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\FuncDoor.c" linenum="211" placement="0:1:-1:-1:-4:-23:44:44:896:513" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Server\progs.src" linenum="43" placement="0:1:-1:-1:-4:-23:66:66:918:535" />
<localfile path="C:\Cygwin\home\eukara\Projects\FreeCS\Source\Client\progs.src" linenum="40" placement="2:3:-1:-1:-4:-23:88:88:940:557" />
</workspace> </workspace>

View file

@ -18,6 +18,8 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#define VERSION "0.1a"
#define KEY_UNKNOWN -1 #define KEY_UNKNOWN -1
#define KEY_GAME 0 #define KEY_GAME 0
#define KEY_MENU 2 #define KEY_MENU 2
@ -58,9 +60,14 @@ int iMapCount;
var float FONT_MENU; var float FONT_MENU;
#define MENU_COUNT 5 #define MENU_COUNT 10
enum { enum {
MENU_MAIN, MENU_MAIN,
MENU_CONFIGURATION,
MENU_CONFIGURATION_AUDIO,
MENU_CONFIGURATION_VIDEO,
MENU_CONFIGURATION_PLAYER,
MENU_CONFIGURATION_CONTROLS,
MENU_MULTIPLAYER, MENU_MULTIPLAYER,
MENU_MULTIPLAYER_CREATE, MENU_MULTIPLAYER_CREATE,
MENU_MULTIPLAYER_OPTIONS, MENU_MULTIPLAYER_OPTIONS,

2
Source/Menu/Draw.c Executable file → Normal file
View file

@ -61,4 +61,6 @@ void m_draw( vector vScreenSize ) {
m_drawback(); m_drawback();
fcsMain[ iMenu ].vMenu(); fcsMain[ iMenu ].vMenu();
Header_Draw(); Header_Draw();
drawstring( '16 16', sprintf( "FreeCS Version %s\n", VERSION ), '8 8', '1 1 1', 1.0f, 0 );
} }

5
Source/Menu/Header.c Executable file → Normal file
View file

@ -20,6 +20,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
fcsMenu fcsMain[ MENU_COUNT ] = { fcsMenu fcsMain[ MENU_COUNT ] = {
{ Menu_Main, -1 }, { Menu_Main, -1 },
{ Menu_Configuration, HEAD_CONFIG },
{ Menu_Configuration_Audio, HEAD_AUDIO },
{ Menu_Configuration_Video, HEAD_VIDEO },
{ Menu_Configuration_Player, HEAD_CUSTOMIZE },
{ Menu_Configuration_Controls, HEAD_CONTROLS },
{ Menu_Multiplayer, HEAD_MULTI }, { Menu_Multiplayer, HEAD_MULTI },
{ Menu_Multiplayer_Create, HEAD_CREATEGAME }, { Menu_Multiplayer_Create, HEAD_CREATEGAME },
{ Menu_Multiplayer_Create, HEAD_ADVOPTIONS }, { Menu_Multiplayer_Create, HEAD_ADVOPTIONS },

View file

@ -25,10 +25,13 @@ m_init
Precaches and loading for the menu system Precaches and loading for the menu system
================= =================
*/ */
void Menu_Configuration_Init( void );
void m_init( void ) { void m_init( void ) {
precache_pic( "gfx/shell/splash" ); precache_pic( "gfx/shell/splash" );
precache_pic( "gfx/shell/btns_main" ); precache_pic( "gfx/shell/btns_main" );
Menu_Configuration_Init();
// Index all the maps... TODO: Filter out /valve/ to avoid useless junk from being cached. // Index all the maps... TODO: Filter out /valve/ to avoid useless junk from being cached.
searchhandle shMaps = search_begin( "maps/*.bsp", TRUE, TRUE ); searchhandle shMaps = search_begin( "maps/*.bsp", TRUE, TRUE );
iMapCount = search_getsize( shMaps ); iMapCount = search_getsize( shMaps );

204
Source/Menu/MenuConfiguration.c Executable file
View file

@ -0,0 +1,204 @@
/*
FreeCS Project
Copyright (C) 2016, 2017 Marco "eukara" Hladik
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.
*/
/*
=================
Menu_Configuration_Init
Initializes external control scheme file, etc.
=================
*/
int iActCount;
string *strActBind;
string *strActDescr;
void Menu_Configuration_Init( void ) {
int iCount = 0;
string sTemp;
filestream fileActList = fopen( "gfx/shell/kb_act.lst", FILE_READ );
// Count the valid entries.
if ( fileActList >= 0 ) {
while ( ( sTemp = fgets( fileActList ) ) ) {
if ( tokenize_console( sTemp ) == 2 ) {
iActCount++;
}
}
} else {
error( "Cannot parse gfx/shell/kb_act.lst!" );
}
// Reset filestream position after allocating the strings
strActBind = memalloc( sizeof( string ) * iActCount );
strActDescr = memalloc( sizeof( string ) * iActCount );
fseek( fileActList, 0 );
// Parse the bindings in
while ( ( sTemp = fgets( fileActList ) ) ) {
// Tokenize and just parse this stuff in
if ( tokenize_console( sTemp ) == 2 ) {
strActBind[ iCount ] = argv( 0 );
strActDescr[ iCount ] = argv( 1 );
//print( sprintf( "%s %s\n", strActBind[ iCount ], strActDescr[ iCount ] ) );
iCount++;
}
}
fclose( fileActList );
}
/*
=================
Menu_Configuration_ButtonOK
=================
*/
void Menu_Configuration_ButtonOK( void ) {
iMenu = MENU_CONFIGURATION;
}
/*
=================
Menu_Configuration_ButtonCancel
=================
*/
void Menu_Configuration_ButtonCancel( void ) {
iMenu = MENU_CONFIGURATION;
}
/*
=================
Menu_Configuration_Video
=================
*/
void Menu_Configuration_Video( void ) {
Object_Button( '32 148', BTN_OK, Menu_Configuration_ButtonOK, fButtonAlpha[0] );
Object_Button( '32 180', BTN_CANCEL, Menu_Configuration_ButtonCancel, fButtonAlpha[1] );
}
/*
=================
Menu_Configuration_Audio
=================
*/
void Menu_Configuration_Audio( void ) {
Object_Button( '32 148', BTN_OK, Menu_Configuration_ButtonOK, fButtonAlpha[0] );
Object_Button( '32 180', BTN_CANCEL, Menu_Configuration_ButtonCancel, fButtonAlpha[1] );
}
/*
=================
Menu_Configuration_Player
=================
*/
void Menu_Configuration_Player( void ) {
Object_Button( '32 148', BTN_OK, Menu_Configuration_ButtonOK, fButtonAlpha[0] );
Object_Button( '32 180', BTN_CANCEL, Menu_Configuration_ButtonCancel, fButtonAlpha[1] );
}
/*
=================
Menu_Configuration_Controls
=================
*/
void Menu_Configuration_Controls( void ) {
static float fActClickTime;
void Controls_DisplayAct( vector vPosition, int i, __inout int iSelected ) {
float fItemAlpha = 1.0f;
vPosition += vMenuOffset;
if ( Menu_InputCheckMouse( [ vPosition_x, vPosition_y ], [ 397, 8 ] ) == TRUE ) {
if ( fMouseClick == TRUE ) {
if ( iSelected != i ) {
iSelected = i;
fInputKeyCode = 0;
fMouseClick = FALSE;
fActClickTime = time + 0.2;
} else {
// change bind
iSelected = -2;
fInputKeyCode = 0;
fMouseClick = FALSE;
}
}
} else {
fItemAlpha = 0.8;
}
if ( iSelected == i ) {
drawfill( [ vPosition_x, vPosition_y - 1 ], [ 397, 10 ], '1 1 1', 0.5, 2 );
drawstring( [vPosition_x + 8, vPosition_y], strActBind[ i ], '8 8 0', '1 1 1', 1.0f, FALSE );
drawstring( [vPosition_x + 128, vPosition_y], strActDescr[ i ], '8 8 0', '1 1 1', 1.0f, FALSE );
} else {
drawstring( [vPosition_x + 8, vPosition_y], strActBind[ i ], '8 8 0', '1 1 1', fItemAlpha, FALSE );
drawstring( [vPosition_x + 128, vPosition_y], strActDescr[ i ], '8 8 0', '1 1 1', fItemAlpha, FALSE );
}
}
static int iSelectedAct = -1;
static int iScrollAct;
Object_Button( '32 148', BTN_OK, Menu_Configuration_ButtonOK, fButtonAlpha[0] );
Object_Button( '32 180', BTN_CANCEL, Menu_Configuration_ButtonCancel, fButtonAlpha[1] );
Object_Frame( '196 140', '404 308' );
Object_Scrollbar( '604 140', 308, iScrollAct );
Object_Label( '208 124', _("Keybind"), '8 8' );
Object_Label( '328 124', _("Description"), '8 8' );
Menu_SetClipArea( '196 141', '404 306' );
vector vListPos = '200 145';
vListPos_y -= fabs( ( ( iActCount - 8 ) * 10 ) * ( iScrollAct / 308 ) );
for ( int i = 0; i < iActCount; i++ ) {
Controls_DisplayAct( vListPos, i, iSelectedAct );
vListPos_y += 10;
}
Menu_ResetClipArea();
}
/*
=================
Menu_Configuration
First config screen
=================
*/
void Menu_Configuration( void ) {
static void Configuration_ButtonAudio( void ) {
iMenu = MENU_CONFIGURATION_AUDIO;
}
static void Configuration_ButtonVideo( void ) {
iMenu = MENU_CONFIGURATION_VIDEO;
}
static void Configuration_ButtonCustomize( void ) {
iMenu = MENU_CONFIGURATION_PLAYER;
}
static void Configuration_ButtonControls( void ) {
iMenu = MENU_CONFIGURATION_CONTROLS;
}
static void Configuration_ButtonDone( void ) {
iMenu = MENU_MAIN;
}
Object_Button( '32 148', BTN_AUDIO, Configuration_ButtonAudio, fButtonAlpha[0] );
Object_Button( '32 180', BTN_VIDEO, Configuration_ButtonVideo, fButtonAlpha[1] );
Object_Button( '32 212', BTN_CUSTOMIZE, Configuration_ButtonCustomize, fButtonAlpha[2] );
Object_Button( '32 244', BTN_CONTROLS, Configuration_ButtonControls, fButtonAlpha[3] );
Object_Button( '32 276', BTN_DONE, Configuration_ButtonDone, fButtonAlpha[4] );
}

5
Source/Menu/MenuMain.c Executable file → Normal file
View file

@ -29,6 +29,9 @@ void Menu_Main( void ) {
static void Main_ButtonConsole( void ) { static void Main_ButtonConsole( void ) {
localcmd( "toggleconsole\n" ); localcmd( "toggleconsole\n" );
} }
static void Main_ButtonConfiguration( void ) {
iMenu = MENU_CONFIGURATION;
}
static void Main_ButtonMultiplayer( void ) { static void Main_ButtonMultiplayer( void ) {
iMenu = MENU_MULTIPLAYER; iMenu = MENU_MULTIPLAYER;
} }
@ -37,7 +40,7 @@ void Menu_Main( void ) {
} }
Object_Button( '72 188', BTN_CONSOLE, Main_ButtonConsole, fButtonAlpha[0] ); Object_Button( '72 188', BTN_CONSOLE, Main_ButtonConsole, fButtonAlpha[0] );
Object_Button( '72 272', BTN_CONFIG, __NULL__, fButtonAlpha[1] ); Object_Button( '72 272', BTN_CONFIG, Main_ButtonConfiguration, fButtonAlpha[1] );
Object_Button( '72 328', BTN_MULTIPLAYER, Main_ButtonMultiplayer, fButtonAlpha[2] ); Object_Button( '72 328', BTN_MULTIPLAYER, Main_ButtonMultiplayer, fButtonAlpha[2] );
Object_Button( '72 356', BTN_CUSTOMGAME, __NULL__, fButtonAlpha[3] ); Object_Button( '72 356', BTN_CUSTOMGAME, __NULL__, fButtonAlpha[3] );

2
Source/Menu/MenuMultiplayer.c Executable file → Normal file
View file

@ -123,7 +123,7 @@ void Menu_Multiplayer( void ) {
localcmd( "com_protocolname FTE-Quake\n" ); localcmd( "com_protocolname FTE-Quake\n" );
//clear the filter //clear the filter
resethostcachemasks(); resethostcachemasks();
//sethostcachemaskstring( 0, gethostcacheindexforkey( "gamedir" ), "freecs", SLIST_TEST_EQUAL ); sethostcachemaskstring( 0, gethostcacheindexforkey( "gamedir" ), "freecs", SLIST_TEST_EQUAL );
sethostcachesort( gethostcacheindexforkey( "ping" ), FALSE ); sethostcachesort( gethostcacheindexforkey( "ping" ), FALSE );
refreshhostcache(); refreshhostcache();
resorthostcache(); resorthostcache();

View file

@ -116,7 +116,9 @@ void Object_Button( vector vPosition, int iButtonID, void() vFunction, __inout f
fAlpha = 1.0f; fAlpha = 1.0f;
if ( fMouseClick == TRUE ) { if ( fMouseClick == TRUE ) {
vFunction(); if ( vFunction != __NULL__ ) {
vFunction();
}
localcmd( "play ../media/launch_select2.wav\n" ); localcmd( "play ../media/launch_select2.wav\n" );
fMouseClick = FALSE; fMouseClick = FALSE;
} }

1
Source/Menu/progs.src Executable file → Normal file
View file

@ -11,6 +11,7 @@ Init.c
Input.c Input.c
Objects.c Objects.c
MenuMain.c MenuMain.c
MenuConfiguration.c
MenuMultiplayer.c MenuMultiplayer.c
Header.c Header.c
Draw.c Draw.c

0
Source/Shared/WeaponG3SG1.c Executable file → Normal file
View file

Binary file not shown.