diff --git a/classdump-tf2.txt b/classdump-tf2.txt index 7d2b9583..bbb28778 100755 --- a/classdump-tf2.txt +++ b/classdump-tf2.txt @@ -1,20 +1,20 @@ [178] CTETFParticleEffect [177] CTETFExplosion [176] CTETFBlood -[314] CTFTankBoss +[315] CTFTankBoss [182] CTFBaseBoss [0] CBossAlpha -[352] CZombie +[353] CZombie [83] CMerasmusDancer [82] CMerasmus [73] CHeadlessHatman [48] CEyeballBoss -[333] CTFWeaponSapper -[324] CTFWeaponBuilder +[334] CTFWeaponSapper +[325] CTFWeaponBuilder [0] C_TFWeaponBuilder -[316] CTFTeam -[315] CTFTauntProp -[262] CTFProjectile_Rocket +[317] CTFTeam +[316] CTFTauntProp +[263] CTFProjectile_Rocket [256] CTFProjectile_Flare [254] CTFProjectile_EnergyBall [257] CTFProjectile_GrapplingHook @@ -22,7 +22,7 @@ [251] CTFProjectile_Arrow [248] CTFPlayerResource [246] CTFPlayer -[281] CTFRagdoll +[282] CTFRagdoll [164] CTEPlayerAnimEvent [239] CTFPasstimeLogic [93] CPasstimeBall @@ -33,7 +33,7 @@ [180] CTFAmmoPack [89] CObjectTeleporter [88] CObjectSentrygun -[263] CTFProjectile_SentryRocket +[264] CTFProjectile_SentryRocket [87] CObjectSapper [85] CObjectCartDispenser [86] CObjectDispenser @@ -50,12 +50,12 @@ [0] CBotNPC [110] CRagdollPropAttached [109] CRagdollProp -[355] NextBotCombatCharacter -[345] CWaterBullet +[356] NextBotCombatCharacter +[346] CWaterBullet [59] CFuncMonitor -[351] CWorld -[346] CWaterLODControl -[343] CVGuiScreen +[352] CWorld +[347] CWaterLODControl +[344] CVGuiScreen [0] CPropJeep [0] CPropVehicleChoreoGeneric [179] CTEWorldDecal @@ -109,12 +109,12 @@ [122] CSteamJet [91] CParticlePerformanceMonitor [118] CSpotlightEnd -[353] DustTrail +[354] DustTrail [50] CFireTrail -[360] SporeTrail -[359] SporeExplosion -[357] RocketTrail -[358] SmokeTrail +[361] SporeTrail +[360] SporeExplosion +[358] RocketTrail +[359] SmokeTrail [116] CSmokeStack [115] CSlideshowDisplay [114] CShadowControl @@ -134,9 +134,9 @@ [97] CPhysicsProp [95] CPhysBox [92] CParticleSystem -[356] ParticleSmokeGrenade +[357] ParticleSmokeGrenade [90] CParticleFire -[354] MovieExplosion +[355] MovieExplosion [81] CMaterialModifyControl [79] CLightGlow [77] CInfoOverlayAccessor @@ -182,61 +182,61 @@ [1] CBaseAnimating [76] CInfoLightingRelative [0] CAI_BaseNPC -[349] CWeaponIFMSteadyCam -[348] CWeaponIFMBaseCamera -[347] CWeaponIFMBase -[339] CTFWearableRazorback -[336] CTFWearableDemoShield -[338] CTFWearableLevelableItem -[335] CTFWearableCampaignItem -[340] CTFWearableRobotArm -[285] CTFRobotArm -[342] CTFWrench -[277] CTFProjectile_ThrowableBreadMonster -[278] CTFProjectile_ThrowableBrick -[279] CTFProjectile_ThrowableRepel -[276] CTFProjectile_Throwable -[317] CTFThrowable -[313] CTFSyringeGun +[350] CWeaponIFMSteadyCam +[349] CWeaponIFMBaseCamera +[348] CWeaponIFMBase +[340] CTFWearableRazorback +[337] CTFWearableDemoShield +[339] CTFWearableLevelableItem +[336] CTFWearableCampaignItem +[341] CTFWearableRobotArm +[286] CTFRobotArm +[343] CTFWrench +[278] CTFProjectile_ThrowableBreadMonster +[279] CTFProjectile_ThrowableBrick +[280] CTFProjectile_ThrowableRepel +[277] CTFProjectile_Throwable +[318] CTFThrowable +[314] CTFSyringeGun [224] CTFKatana -[312] CTFSword +[313] CTFSword [117] CSniperDot -[306] CTFSniperRifleClassic -[307] CTFSniperRifleDecap -[305] CTFSniperRifle +[307] CTFSniperRifleClassic +[308] CTFSniperRifleDecap +[306] CTFSniperRifle [196] CTFChargedSMG -[304] CTFSMG -[303] CTFSlap -[302] CTFShovel -[301] CTFShotgunBuildingRescue +[305] CTFSMG +[304] CTFSlap +[303] CTFShovel +[302] CTFShotgunBuildingRescue [240] CTFPEPBrawlerBlaster -[308] CTFSodaPopper -[299] CTFShotgun_Revenge -[295] CTFScatterGun -[298] CTFShotgun_Pyro -[297] CTFShotgun_HWG -[300] CTFShotgun_Soldier -[296] CTFShotgun -[294] CTFRocketPack +[309] CTFSodaPopper +[300] CTFShotgun_Revenge +[296] CTFScatterGun +[299] CTFShotgun_Pyro +[298] CTFShotgun_HWG +[301] CTFShotgun_Soldier +[297] CTFShotgun +[295] CTFRocketPack [200] CTFCrossbow -[293] CTFRocketLauncher_Mortar -[291] CTFRocketLauncher_AirStrike -[292] CTFRocketLauncher_DirectHit -[290] CTFRocketLauncher -[284] CTFRevolver +[294] CTFRocketLauncher_Mortar +[292] CTFRocketLauncher_AirStrike +[293] CTFRocketLauncher_DirectHit +[291] CTFRocketLauncher +[285] CTFRevolver [201] CTFDRGPomson -[282] CTFRaygun +[283] CTFRaygun [245] CTFPistol_ScoutSecondary [244] CTFPistol_ScoutPrimary [243] CTFPistol_Scout [242] CTFPistol [241] CTFPipebombLauncher -[330] CTFWeaponPDA_Spy -[329] CTFWeaponPDA_Engineer_Destroy -[328] CTFWeaponPDA_Engineer_Build -[332] CTFWeaponPDAExpansion_Teleporter -[331] CTFWeaponPDAExpansion_Dispenser -[327] CTFWeaponPDA +[331] CTFWeaponPDA_Spy +[330] CTFWeaponPDA_Engineer_Destroy +[329] CTFWeaponPDA_Engineer_Build +[333] CTFWeaponPDAExpansion_Teleporter +[332] CTFWeaponPDAExpansion_Dispenser +[328] CTFWeaponPDA [94] CPasstimeGun [238] CTFParticleCannon [237] CTFParachute_Secondary @@ -244,7 +244,8 @@ [235] CTFParachute [233] CTFMinigun [230] CTFMedigunShield -[350] CWeaponMedigun +[351] CWeaponMedigun +[262] CTFProjectile_MechanicalArmOrb [229] CTFMechanicalArm [228] CTFLunchBox_Drink [227] CTFLunchBox @@ -260,7 +261,7 @@ [197] CTFCleaver [223] CTFJarMilk [221] CTFJar -[326] CTFWeaponInvis +[327] CTFWeaponInvis [216] CTFGrenadePipebombProjectile [195] CTFCannon [215] CTFGrenadeLauncher @@ -271,49 +272,49 @@ [207] CTFFlameThrower [204] CTFFists [203] CTFFireAxe -[325] CTFWeaponFlameBall +[326] CTFWeaponFlameBall [199] CTFCompoundBow [198] CTFClub [194] CTFBuffItem -[310] CTFStickBomb +[311] CTFStickBomb [193] CTFBreakableSign [191] CTFBottle [192] CTFBreakableMelee [189] CTFBonesaw [181] CTFBall_Ornament -[311] CTFStunBall +[312] CTFStunBall [187] CTFBat_Giftwrap [188] CTFBat_Wood [186] CTFBat_Fish [185] CTFBat [184] CTFBaseRocket -[323] CTFWeaponBaseMerasmusGrenade -[322] CTFWeaponBaseMelee -[321] CTFWeaponBaseGun -[320] CTFWeaponBaseGrenadeProj -[319] CTFWeaponBase -[318] CTFViewModel +[324] CTFWeaponBaseMerasmusGrenade +[323] CTFWeaponBaseMelee +[322] CTFWeaponBaseGun +[321] CTFWeaponBaseGrenadeProj +[320] CTFWeaponBase +[319] CTFViewModel [111] CRobotDispenser -[286] CTFRobotDestruction_Robot -[283] CTFReviveMarker -[280] CTFPumpkinBomb +[287] CTFRobotDestruction_Robot +[284] CTFReviveMarker +[281] CTFPumpkinBomb [255] CTFProjectile_EnergyRing [252] CTFProjectile_BallOfFire [183] CTFBaseProjectile [249] CTFPointManager [11] CBaseObjectUpgrade [80] CMannVsMachineStats -[289] CTFRobotDestructionLogic -[287] CTFRobotDestruction_RobotGroup -[288] CTFRobotDestruction_RobotSpawn +[290] CTFRobotDestructionLogic +[288] CTFRobotDestruction_RobotGroup +[289] CTFRobotDestruction_RobotSpawn [247] CTFPlayerDestructionLogic [101] CPlayerDestructionDispenser [232] CTFMinigameLogic [218] CTFHalloweenMinigame_FallingPlatforms [217] CTFHalloweenMinigame [231] CTFMiniGame -[341] CTFWearableVM -[334] CTFWearable +[342] CTFWearableVM +[335] CTFWearable [250] CTFPowerupBottle [220] CTFItem [71] CHalloweenSoulPack @@ -322,20 +323,20 @@ [210] CTFGameRulesProxy [205] CTFFlameManager [202] CTFDroppedWeapon -[266] CTFProjectile_SpellKartBats -[267] CTFProjectile_SpellKartOrb +[267] CTFProjectile_SpellKartBats +[268] CTFProjectile_SpellKartOrb [219] CTFHellZap -[268] CTFProjectile_SpellLightningOrb -[275] CTFProjectile_SpellTransposeTeleport -[269] CTFProjectile_SpellMeteorShower -[272] CTFProjectile_SpellSpawnBoss -[270] CTFProjectile_SpellMirv -[271] CTFProjectile_SpellPumpkin -[273] CTFProjectile_SpellSpawnHorde -[274] CTFProjectile_SpellSpawnZombie -[264] CTFProjectile_SpellBats -[265] CTFProjectile_SpellFireball -[309] CTFSpellBook +[269] CTFProjectile_SpellLightningOrb +[276] CTFProjectile_SpellTransposeTeleport +[270] CTFProjectile_SpellMeteorShower +[273] CTFProjectile_SpellSpawnBoss +[271] CTFProjectile_SpellMirv +[272] CTFProjectile_SpellPumpkin +[274] CTFProjectile_SpellSpawnHorde +[275] CTFProjectile_SpellSpawnZombie +[265] CTFProjectile_SpellBats +[266] CTFProjectile_SpellFireball +[310] CTFSpellBook [74] CHightower_TeleportVortex [159] CTeleportVortex [69] CHalloweenGiftPickup @@ -355,7 +356,7 @@ [75] CInfoLadderDismount [58] CFuncLadder [40] CEnvDetailController -[337] CTFWearableItem +[338] CTFWearableItem [35] CEconWearable [3] CBaseAttributableItem [34] CEconEntity @@ -365,4 +366,4 @@ [12] CBaseParticleEntity [9] CBaseGrenade [5] CBaseCombatWeapon -[344] CVoteController +[345] CVoteController \ No newline at end of file diff --git a/full-class-table.json b/full-class-table.json index aa52301e..9670ec2a 100755 --- a/full-class-table.json +++ b/full-class-table.json @@ -1 +1 @@ -{"CTETFParticleEffect":true,"CTETFExplosion":true,"CTETFBlood":true,"CTFTankBoss":true,"CTFBaseBoss":true,"CBossAlpha":true,"CZombie":true,"CMerasmusDancer":true,"CMerasmus":true,"CHeadlessHatman":true,"CEyeballBoss":true,"CTFWeaponSapper":true,"CTFWeaponBuilder":true,"C_TFWeaponBuilder":true,"CTFTeam":true,"CTFTauntProp":true,"CTFProjectile_Rocket":true,"CTFProjectile_Flare":true,"CTFProjectile_EnergyBall":true,"CTFProjectile_GrapplingHook":true,"CTFProjectile_HealingBolt":true,"CTFProjectile_Arrow":true,"CTFPlayerResource":true,"CTFPlayer":true,"CTFRagdoll":true,"CTEPlayerAnimEvent":true,"CTFPasstimeLogic":true,"CPasstimeBall":true,"CTFObjectiveResource":true,"CTFGlow":true,"CTEFireBullets":true,"CTFBuffBanner":true,"CTFAmmoPack":true,"CObjectTeleporter":true,"CObjectSentrygun":true,"CTFProjectile_SentryRocket":true,"CObjectSapper":true,"CObjectCartDispenser":true,"CObjectDispenser":true,"CMonsterResource":true,"CFuncRespawnRoomVisualizer":true,"CFuncRespawnRoom":true,"CFuncPasstimeGoal":true,"CFuncForceField":true,"CCaptureZone":true,"CCurrencyPack":true,"CBaseObject":true,"CTFBotHintEngineerNest":true,"CBotNPCMinion":true,"CBotNPC":true,"CRagdollPropAttached":true,"CRagdollProp":true,"NextBotCombatCharacter":true,"CWaterBullet":true,"CFuncMonitor":true,"CWorld":true,"CWaterLODControl":true,"CVGuiScreen":true,"CPropJeep":true,"CPropVehicleChoreoGeneric":true,"CTEWorldDecal":true,"CTESpriteSpray":true,"CTESprite":true,"CTESparks":true,"CTESmoke":true,"CTEShowLine":true,"CTEProjectedDecal":true,"CTEPlayerDecal":true,"CTEPhysicsProp":true,"CTEParticleSystem":true,"CTEMuzzleFlash":true,"CTELargeFunnel":true,"CTEKillPlayerAttachments":true,"CTEImpact":true,"CTEGlowSprite":true,"CTEShatterSurface":true,"CTEFootprintDecal":true,"CTEFizz":true,"CTEExplosion":true,"CTEEnergySplash":true,"CTEEffectDispatch":true,"CTEDynamicLight":true,"CTEDecal":true,"CTEClientProjectile":true,"CTEBubbleTrail":true,"CTEBubbles":true,"CTEBSPDecal":true,"CTEBreakModel":true,"CTEBloodStream":true,"CTEBloodSprite":true,"CTEBeamSpline":true,"CTEBeamRingPoint":true,"CTEBeamRing":true,"CTEBeamPoints":true,"CTEBeamLaser":true,"CTEBeamFollow":true,"CTEBeamEnts":true,"CTEBeamEntPoint":true,"CTEBaseBeam":true,"CTEArmorRicochet":true,"CTEMetalSparks":true,"CTest_ProxyToggle_Networkable":true,"CTestTraceline":true,"CTesla":true,"CTeamTrainWatcher":true,"CBaseTeamObjectiveResource":true,"CTeam":true,"CSun":true,"CSteamJet":true,"CParticlePerformanceMonitor":true,"CSpotlightEnd":true,"DustTrail":true,"CFireTrail":true,"SporeTrail":true,"SporeExplosion":true,"RocketTrail":true,"SmokeTrail":true,"CSmokeStack":true,"CSlideshowDisplay":true,"CShadowControl":true,"CSceneEntity":true,"CRopeKeyframe":true,"CRagdollManager":true,"CPropVehicleDriveable":true,"CPhysicsPropMultiplayer":true,"CPhysBoxMultiplayer":true,"CBasePropDoor":true,"CDynamicProp":true,"CPointCommentaryNode":true,"CPointCamera":true,"CPlayerResource":true,"CPlasma":true,"CPhysMagnet":true,"CPhysicsProp":true,"CPhysBox":true,"CParticleSystem":true,"ParticleSmokeGrenade":true,"CParticleFire":true,"MovieExplosion":true,"CMaterialModifyControl":true,"CLightGlow":true,"CInfoOverlayAccessor":true,"CTEGaussExplosion":true,"CFuncTrackTrain":true,"CFuncSmokeVolume":true,"CFuncRotating":true,"CFuncReflectiveGlass":true,"CFuncOccluder":true,"CFunc_LOD":true,"CTEDust":true,"CFunc_Dust":true,"CFuncConveyor":true,"CBreakableSurface":true,"CFuncAreaPortalWindow":true,"CFish":true,"CEntityFlame":true,"CFireSmoke":true,"CEnvTonemapController":true,"CEnvScreenEffect":true,"CEnvScreenOverlay":true,"CEnvProjectedTexture":true,"CEnvParticleScript":true,"CFogController":true,"CEntityParticleTrail":true,"CEntityDissolve":true,"CEnvQuadraticBeam":true,"CEmbers":true,"CEnvWind":true,"CPrecipitation":true,"CDynamicLight":true,"CColorCorrectionVolume":true,"CColorCorrection":true,"CBreakableProp":true,"CBaseTempEntity":true,"CBasePlayer":true,"CBaseFlex":true,"CBaseEntity":true,"CBaseDoor":true,"CBaseCombatCharacter":true,"CBaseAnimatingOverlay":true,"CBoneFollower":true,"CBaseAnimating":true,"CInfoLightingRelative":true,"CAI_BaseNPC":true,"CWeaponIFMSteadyCam":true,"CWeaponIFMBaseCamera":true,"CWeaponIFMBase":true,"CTFWearableLevelableItem":true,"CTFWearableDemoShield":true,"CTFWearableRobotArm":true,"CTFRobotArm":true,"CTFWrench":true,"CTFProjectile_ThrowableBreadMonster":true,"CTFProjectile_ThrowableBrick":true,"CTFProjectile_ThrowableRepel":true,"CTFProjectile_Throwable":true,"CTFThrowable":true,"CTFSyringeGun":true,"CTFKatana":true,"CTFSword":true,"CSniperDot":true,"CTFSniperRifleClassic":true,"CTFSniperRifleDecap":true,"CTFSniperRifle":true,"CTFChargedSMG":true,"CTFSMG":true,"CTFShovel":true,"CTFShotgunBuildingRescue":true,"CTFPEPBrawlerBlaster":true,"CTFSodaPopper":true,"CTFShotgun_Revenge":true,"CTFScatterGun":true,"CTFShotgun_Pyro":true,"CTFShotgun_HWG":true,"CTFShotgun_Soldier":true,"CTFShotgun":true,"CTFCrossbow":true,"CTFRocketLauncher_Mortar":true,"CTFRocketLauncher_AirStrike":true,"CTFRocketLauncher_DirectHit":true,"CTFRocketLauncher":true,"CTFRevolver":true,"CTFDRGPomson":true,"CTFRaygun":true,"CTFPistol_ScoutSecondary":true,"CTFPistol_ScoutPrimary":true,"CTFPistol_Scout":true,"CTFPistol":true,"CTFPipebombLauncher":true,"CTFWeaponPDA_Spy":true,"CTFWeaponPDA_Engineer_Destroy":true,"CTFWeaponPDA_Engineer_Build":true,"CTFWeaponPDAExpansion_Teleporter":true,"CTFWeaponPDAExpansion_Dispenser":true,"CTFWeaponPDA":true,"CPasstimeGun":true,"CTFParticleCannon":true,"CTFParachute_Secondary":true,"CTFParachute_Primary":true,"CTFParachute":true,"CTFMinigun":true,"CTFMedigunShield":true,"CWeaponMedigun":true,"CTFMechanicalArm":true,"CTFLunchBox_Drink":true,"CTFLunchBox":true,"CLaserDot":true,"CTFLaserPointer":true,"CTFKnife":true,"CTFProjectile_Cleaver":true,"CTFProjectile_JarMilk":true,"CTFProjectile_Jar":true,"CTFCleaver":true,"CTFJarMilk":true,"CTFJar":true,"CTFWeaponInvis":true,"CTFGrenadePipebombProjectile":true,"CTFCannon":true,"CTFGrenadeLauncher":true,"CTFGrapplingHook":true,"CTFFlareGun_Revenge":true,"CTFFlareGun":true,"CTFFlameRocket":true,"CTFFlameThrower":true,"CTFFists":true,"CTFFireAxe":true,"CTFCompoundBow":true,"CTFClub":true,"CTFBuffItem":true,"CTFStickBomb":true,"CTFBottle":true,"CTFBonesaw":true,"CTFBall_Ornament":true,"CTFStunBall":true,"CTFBat_Giftwrap":true,"CTFBat_Wood":true,"CTFBat_Fish":true,"CTFBat":true,"CTFBaseRocket":true,"CTFWeaponBaseMerasmusGrenade":true,"CTFWeaponBaseMelee":true,"CTFWeaponBaseGun":true,"CTFWeaponBaseGrenadeProj":true,"CTFWeaponBase":true,"CTFViewModel":true,"CRobotDispenser":true,"CTFRobotDestruction_Robot":true,"CTFReviveMarker":true,"CTFPumpkinBomb":true,"CTFProjectile_EnergyRing":true,"CTFBaseProjectile":true,"CBaseObjectUpgrade":true,"CMannVsMachineStats":true,"CTFRobotDestructionLogic":true,"CTFRobotDestruction_RobotGroup":true,"CTFRobotDestruction_RobotSpawn":true,"CTFPlayerDestructionLogic":true,"CPlayerDestructionDispenser":true,"CTFMinigameLogic":true,"CTFHalloweenMinigame_FallingPlatforms":true,"CTFHalloweenMinigame":true,"CTFMiniGame":true,"CTFWearableVM":true,"CTFWearable":true,"CTFPowerupBottle":true,"CTFItem":true,"CHalloweenSoulPack":true,"CTFGenericBomb":true,"CBonusRoundLogic":true,"CTFGameRulesProxy":true,"CTFDroppedWeapon":true,"CTFProjectile_SpellKartBats":true,"CTFProjectile_SpellKartOrb":true,"CTFHellZap":true,"CTFProjectile_SpellLightningOrb":true,"CTFProjectile_SpellTransposeTeleport":true,"CTFProjectile_SpellMeteorShower":true,"CTFProjectile_SpellSpawnBoss":true,"CTFProjectile_SpellMirv":true,"CTFProjectile_SpellPumpkin":true,"CTFProjectile_SpellSpawnHorde":true,"CTFProjectile_SpellSpawnZombie":true,"CTFProjectile_SpellBats":true,"CTFProjectile_SpellFireball":true,"CTFSpellBook":true,"CHightower_TeleportVortex":true,"CTeleportVortex":true,"CHalloweenGiftPickup":true,"CBonusDuckPickup":true,"CHalloweenPickup":true,"CCaptureFlagReturnIcon":true,"CCaptureFlag":true,"CBonusPack":true,"CHandleTest":true,"CTeamRoundTimer":true,"CTeamplayRoundBasedRulesProxy":true,"CSpriteTrail":true,"CSpriteOriented":true,"CSprite":true,"CPoseController":true,"CGameRulesProxy":true,"CInfoLadderDismount":true,"CFuncLadder":true,"CEnvDetailController":true,"CTFWearableItem":true,"CEconWearable":true,"CBaseAttributableItem":true,"CEconEntity":true,"CBeam":true,"CBaseViewModel":true,"CBaseProjectile":true,"CBaseParticleEntity":true,"CBaseGrenade":true,"CBaseCombatWeapon":true,"CVoteController":true,"CTEHL2MPFireBullets":true,"CHL2MPRagdoll":true,"CHL2MP_Player":true,"CWeaponCitizenSuitcase":true,"CWeaponCitizenPackage":true,"CWeaponAlyxGun":true,"CWeaponCubemap":true,"CWeaponGaussGun":true,"CWeaponAnnabelle":true,"CFlaregun":true,"CWeaponBugBait":true,"CWeaponBinoculars":true,"CWeaponCycler":true,"CCrossbowBolt":true,"CPropVehiclePrisonerPod":true,"CPropCrane":true,"CPropCannon":true,"CPropAirboat":true,"CFlare":true,"CTEConcussiveExplosion":true,"CNPC_Strider":true,"CScriptIntro":true,"CRotorWashEmitter":true,"CPropCombineBall":true,"CPlasmaBeamNode":true,"CNPC_RollerMine":true,"CNPC_Manhack":true,"CNPC_CombineGunship":true,"CNPC_AntlionGuard":true,"CInfoTeleporterCountdown":true,"CMortarShell":true,"CEnvStarfield":true,"CEnvHeadcrabCanister":true,"CAlyxEmpEffect":true,"CCorpse":true,"CCitadelEnergyCore":true,"CHL2_Player":true,"CBaseHLBludgeonWeapon":true,"CHLSelectFireMachineGun":true,"CHLMachineGun":true,"CBaseHelicopter":true,"CNPC_Barney":true,"CNPC_Barnacle":true,"AR2Explosion":true,"CTEAntlionDust":true,"CVortigauntEffectDispel":true,"CVortigauntChargeToken":true,"CNPC_Vortigaunt":true,"CPredictedViewModel":true,"CWeaponStunStick":true,"CWeaponSMG1":true,"CWeapon_SLAM":true,"CWeaponShotgun":true,"CWeaponRPG":true,"CWeaponPistol":true,"CWeaponPhysCannon":true,"CHL2MPMachineGun":true,"CBaseHL2MPCombatWeapon":true,"CBaseHL2MPBludgeonWeapon":true,"CWeaponHL2MPBase":true,"CWeaponFrag":true,"CWeaponCrowbar":true,"CWeaponCrossbow":true,"CWeaponAR2":true,"CWeapon357":true,"CHL2MPGameRulesProxy":true,"CHalfLife2Proxy":true,"CBaseHLCombatWeapon":true,"CTFVehicle":true,"CTFBaseDMPowerup":true,"CWeaponSpawner":true,"CTFUmbrella":true,"CTFTranq":true,"CTFSMG_Primary":true,"CTFRevolver_Secondary":true,"CTFNailgun":true,"CTFHunterRifle":true,"CTFHeavyArtillery":true,"CTFHammerfists":true,"CTFCrowbar":true,"CTFChainsaw":true,"CTEPlantBomb":true,"CTERadioIcon":true,"CPlantedC4":true,"CCSTeam":true,"CCSPlayerResource":true,"CCSPlayer":true,"CCSRagdoll":true,"CHostage":true,"CWeaponXM1014":true,"CWeaponUSP":true,"CWeaponUMP45":true,"CWeaponTMP":true,"CSmokeGrenade":true,"CWeaponSG552":true,"CWeaponSG550":true,"CWeaponScout":true,"CWeaponP90":true,"CWeaponP228":true,"CWeaponMP5Navy":true,"CWeaponMAC10":true,"CWeaponM4A1":true,"CWeaponM3":true,"CWeaponM249":true,"CKnife":true,"CHEGrenade":true,"CWeaponGlock":true,"CWeaponGalil":true,"CWeaponG3SG1":true,"CFlashbang":true,"CWeaponFiveSeven":true,"CWeaponFamas":true,"CWeaponElite":true,"CDEagle":true,"CWeaponCSBaseGun":true,"CWeaponCSBase":true,"CC4":true,"CBaseCSGrenade":true,"CWeaponAWP":true,"CWeaponAug":true,"CAK47":true,"CFootstepControl":true,"CCSGameRulesProxy":true,"CBaseCSGrenadeProjectile":true,"CSDKTeam_Deathmatch":true,"CSDKTeam_Red":true,"CSDKTeam_Blue":true,"CSDKTeam_Unassigned":true,"CSDKTeam":true,"CSDKPlayerResource":true,"CSDKRagdoll":true,"CSDKPlayer":true,"CSparkler":true,"CRatRaceWaypoint":true,"CBriefcaseCaptureZone":true,"CBriefcase":true,"CWeaponSDKBase":true,"CWeaponMP5K":true,"CWeaponMossberg":true,"CWeaponM1911":true,"CWeaponM16":true,"CWeaponGrenade":true,"CWeaponFAL":true,"CWeaponBrawl":true,"CWeaponBeretta":true,"CBaseSDKGrenade":true,"CAkimboM1911":true,"CAkimboBeretta":true,"CAkimboBase":true,"CWeaponSDKMelee":true,"CSDKGameRulesProxy":true,"CBaseGrenadeProjectile":true,"CDAViewModel":true,"CTFWearableRazorback":true,"CTFWearableCampaignItem":true,"CTFSlap":true,"CTFRocketPack":true,"CTFGasManager":true,"CTFProjectile_JarGas":true,"CTFJarGas":true,"CTFWeaponFlameBall":true,"CTFBreakableSign":true,"CTFBreakableMelee":true,"CTFProjectile_BallOfFire":true,"CTFPointManager":true,"CTFFlameManager":true} \ No newline at end of file +{"CTETFParticleEffect":true,"CTETFExplosion":true,"CTETFBlood":true,"CTFTankBoss":true,"CTFBaseBoss":true,"CBossAlpha":true,"CZombie":true,"CMerasmusDancer":true,"CMerasmus":true,"CHeadlessHatman":true,"CEyeballBoss":true,"CTFWeaponSapper":true,"CTFWeaponBuilder":true,"C_TFWeaponBuilder":true,"CTFTeam":true,"CTFTauntProp":true,"CTFProjectile_Rocket":true,"CTFProjectile_Flare":true,"CTFProjectile_EnergyBall":true,"CTFProjectile_GrapplingHook":true,"CTFProjectile_HealingBolt":true,"CTFProjectile_Arrow":true,"CTFPlayerResource":true,"CTFPlayer":true,"CTFRagdoll":true,"CTEPlayerAnimEvent":true,"CTFPasstimeLogic":true,"CPasstimeBall":true,"CTFObjectiveResource":true,"CTFGlow":true,"CTEFireBullets":true,"CTFBuffBanner":true,"CTFAmmoPack":true,"CObjectTeleporter":true,"CObjectSentrygun":true,"CTFProjectile_SentryRocket":true,"CObjectSapper":true,"CObjectCartDispenser":true,"CObjectDispenser":true,"CMonsterResource":true,"CFuncRespawnRoomVisualizer":true,"CFuncRespawnRoom":true,"CFuncPasstimeGoal":true,"CFuncForceField":true,"CCaptureZone":true,"CCurrencyPack":true,"CBaseObject":true,"CTFBotHintEngineerNest":true,"CBotNPCMinion":true,"CBotNPC":true,"CRagdollPropAttached":true,"CRagdollProp":true,"NextBotCombatCharacter":true,"CWaterBullet":true,"CFuncMonitor":true,"CWorld":true,"CWaterLODControl":true,"CVGuiScreen":true,"CPropJeep":true,"CPropVehicleChoreoGeneric":true,"CTEWorldDecal":true,"CTESpriteSpray":true,"CTESprite":true,"CTESparks":true,"CTESmoke":true,"CTEShowLine":true,"CTEProjectedDecal":true,"CTEPlayerDecal":true,"CTEPhysicsProp":true,"CTEParticleSystem":true,"CTEMuzzleFlash":true,"CTELargeFunnel":true,"CTEKillPlayerAttachments":true,"CTEImpact":true,"CTEGlowSprite":true,"CTEShatterSurface":true,"CTEFootprintDecal":true,"CTEFizz":true,"CTEExplosion":true,"CTEEnergySplash":true,"CTEEffectDispatch":true,"CTEDynamicLight":true,"CTEDecal":true,"CTEClientProjectile":true,"CTEBubbleTrail":true,"CTEBubbles":true,"CTEBSPDecal":true,"CTEBreakModel":true,"CTEBloodStream":true,"CTEBloodSprite":true,"CTEBeamSpline":true,"CTEBeamRingPoint":true,"CTEBeamRing":true,"CTEBeamPoints":true,"CTEBeamLaser":true,"CTEBeamFollow":true,"CTEBeamEnts":true,"CTEBeamEntPoint":true,"CTEBaseBeam":true,"CTEArmorRicochet":true,"CTEMetalSparks":true,"CTest_ProxyToggle_Networkable":true,"CTestTraceline":true,"CTesla":true,"CTeamTrainWatcher":true,"CBaseTeamObjectiveResource":true,"CTeam":true,"CSun":true,"CSteamJet":true,"CParticlePerformanceMonitor":true,"CSpotlightEnd":true,"DustTrail":true,"CFireTrail":true,"SporeTrail":true,"SporeExplosion":true,"RocketTrail":true,"SmokeTrail":true,"CSmokeStack":true,"CSlideshowDisplay":true,"CShadowControl":true,"CSceneEntity":true,"CRopeKeyframe":true,"CRagdollManager":true,"CPropVehicleDriveable":true,"CPhysicsPropMultiplayer":true,"CPhysBoxMultiplayer":true,"CBasePropDoor":true,"CDynamicProp":true,"CPointCommentaryNode":true,"CPointCamera":true,"CPlayerResource":true,"CPlasma":true,"CPhysMagnet":true,"CPhysicsProp":true,"CPhysBox":true,"CParticleSystem":true,"ParticleSmokeGrenade":true,"CParticleFire":true,"MovieExplosion":true,"CMaterialModifyControl":true,"CLightGlow":true,"CInfoOverlayAccessor":true,"CTEGaussExplosion":true,"CFuncTrackTrain":true,"CFuncSmokeVolume":true,"CFuncRotating":true,"CFuncReflectiveGlass":true,"CFuncOccluder":true,"CFunc_LOD":true,"CTEDust":true,"CFunc_Dust":true,"CFuncConveyor":true,"CBreakableSurface":true,"CFuncAreaPortalWindow":true,"CFish":true,"CEntityFlame":true,"CFireSmoke":true,"CEnvTonemapController":true,"CEnvScreenEffect":true,"CEnvScreenOverlay":true,"CEnvProjectedTexture":true,"CEnvParticleScript":true,"CFogController":true,"CEntityParticleTrail":true,"CEntityDissolve":true,"CEnvQuadraticBeam":true,"CEmbers":true,"CEnvWind":true,"CPrecipitation":true,"CDynamicLight":true,"CColorCorrectionVolume":true,"CColorCorrection":true,"CBreakableProp":true,"CBaseTempEntity":true,"CBasePlayer":true,"CBaseFlex":true,"CBaseEntity":true,"CBaseDoor":true,"CBaseCombatCharacter":true,"CBaseAnimatingOverlay":true,"CBoneFollower":true,"CBaseAnimating":true,"CInfoLightingRelative":true,"CAI_BaseNPC":true,"CWeaponIFMSteadyCam":true,"CWeaponIFMBaseCamera":true,"CWeaponIFMBase":true,"CTFWearableLevelableItem":true,"CTFWearableDemoShield":true,"CTFWearableRobotArm":true,"CTFRobotArm":true,"CTFWrench":true,"CTFProjectile_ThrowableBreadMonster":true,"CTFProjectile_ThrowableBrick":true,"CTFProjectile_ThrowableRepel":true,"CTFProjectile_Throwable":true,"CTFThrowable":true,"CTFSyringeGun":true,"CTFKatana":true,"CTFSword":true,"CSniperDot":true,"CTFSniperRifleClassic":true,"CTFSniperRifleDecap":true,"CTFSniperRifle":true,"CTFChargedSMG":true,"CTFSMG":true,"CTFShovel":true,"CTFShotgunBuildingRescue":true,"CTFPEPBrawlerBlaster":true,"CTFSodaPopper":true,"CTFShotgun_Revenge":true,"CTFScatterGun":true,"CTFShotgun_Pyro":true,"CTFShotgun_HWG":true,"CTFShotgun_Soldier":true,"CTFShotgun":true,"CTFCrossbow":true,"CTFRocketLauncher_Mortar":true,"CTFRocketLauncher_AirStrike":true,"CTFRocketLauncher_DirectHit":true,"CTFRocketLauncher":true,"CTFRevolver":true,"CTFDRGPomson":true,"CTFRaygun":true,"CTFPistol_ScoutSecondary":true,"CTFPistol_ScoutPrimary":true,"CTFPistol_Scout":true,"CTFPistol":true,"CTFPipebombLauncher":true,"CTFWeaponPDA_Spy":true,"CTFWeaponPDA_Engineer_Destroy":true,"CTFWeaponPDA_Engineer_Build":true,"CTFWeaponPDAExpansion_Teleporter":true,"CTFWeaponPDAExpansion_Dispenser":true,"CTFWeaponPDA":true,"CPasstimeGun":true,"CTFParticleCannon":true,"CTFParachute_Secondary":true,"CTFParachute_Primary":true,"CTFParachute":true,"CTFMinigun":true,"CTFMedigunShield":true,"CWeaponMedigun":true,"CTFProjectile_MechanicalArmOrb":true,"CTFMechanicalArm":true,"CTFLunchBox_Drink":true,"CTFLunchBox":true,"CLaserDot":true,"CTFLaserPointer":true,"CTFKnife":true,"CTFProjectile_Cleaver":true,"CTFProjectile_JarMilk":true,"CTFProjectile_Jar":true,"CTFCleaver":true,"CTFJarMilk":true,"CTFJar":true,"CTFWeaponInvis":true,"CTFGrenadePipebombProjectile":true,"CTFCannon":true,"CTFGrenadeLauncher":true,"CTFGrapplingHook":true,"CTFFlareGun_Revenge":true,"CTFFlareGun":true,"CTFFlameRocket":true,"CTFFlameThrower":true,"CTFFists":true,"CTFFireAxe":true,"CTFCompoundBow":true,"CTFClub":true,"CTFBuffItem":true,"CTFStickBomb":true,"CTFBottle":true,"CTFBonesaw":true,"CTFBall_Ornament":true,"CTFStunBall":true,"CTFBat_Giftwrap":true,"CTFBat_Wood":true,"CTFBat_Fish":true,"CTFBat":true,"CTFBaseRocket":true,"CTFWeaponBaseMerasmusGrenade":true,"CTFWeaponBaseMelee":true,"CTFWeaponBaseGun":true,"CTFWeaponBaseGrenadeProj":true,"CTFWeaponBase":true,"CTFViewModel":true,"CRobotDispenser":true,"CTFRobotDestruction_Robot":true,"CTFReviveMarker":true,"CTFPumpkinBomb":true,"CTFProjectile_EnergyRing":true,"CTFBaseProjectile":true,"CBaseObjectUpgrade":true,"CMannVsMachineStats":true,"CTFRobotDestructionLogic":true,"CTFRobotDestruction_RobotGroup":true,"CTFRobotDestruction_RobotSpawn":true,"CTFPlayerDestructionLogic":true,"CPlayerDestructionDispenser":true,"CTFMinigameLogic":true,"CTFHalloweenMinigame_FallingPlatforms":true,"CTFHalloweenMinigame":true,"CTFMiniGame":true,"CTFWearableVM":true,"CTFWearable":true,"CTFPowerupBottle":true,"CTFItem":true,"CHalloweenSoulPack":true,"CTFGenericBomb":true,"CBonusRoundLogic":true,"CTFGameRulesProxy":true,"CTFDroppedWeapon":true,"CTFProjectile_SpellKartBats":true,"CTFProjectile_SpellKartOrb":true,"CTFHellZap":true,"CTFProjectile_SpellLightningOrb":true,"CTFProjectile_SpellTransposeTeleport":true,"CTFProjectile_SpellMeteorShower":true,"CTFProjectile_SpellSpawnBoss":true,"CTFProjectile_SpellMirv":true,"CTFProjectile_SpellPumpkin":true,"CTFProjectile_SpellSpawnHorde":true,"CTFProjectile_SpellSpawnZombie":true,"CTFProjectile_SpellBats":true,"CTFProjectile_SpellFireball":true,"CTFSpellBook":true,"CHightower_TeleportVortex":true,"CTeleportVortex":true,"CHalloweenGiftPickup":true,"CBonusDuckPickup":true,"CHalloweenPickup":true,"CCaptureFlagReturnIcon":true,"CCaptureFlag":true,"CBonusPack":true,"CHandleTest":true,"CTeamRoundTimer":true,"CTeamplayRoundBasedRulesProxy":true,"CSpriteTrail":true,"CSpriteOriented":true,"CSprite":true,"CPoseController":true,"CGameRulesProxy":true,"CInfoLadderDismount":true,"CFuncLadder":true,"CEnvDetailController":true,"CTFWearableItem":true,"CEconWearable":true,"CBaseAttributableItem":true,"CEconEntity":true,"CBeam":true,"CBaseViewModel":true,"CBaseProjectile":true,"CBaseParticleEntity":true,"CBaseGrenade":true,"CBaseCombatWeapon":true,"CVoteController":true,"CTEHL2MPFireBullets":true,"CHL2MPRagdoll":true,"CHL2MP_Player":true,"CWeaponCitizenSuitcase":true,"CWeaponCitizenPackage":true,"CWeaponAlyxGun":true,"CWeaponCubemap":true,"CWeaponGaussGun":true,"CWeaponAnnabelle":true,"CFlaregun":true,"CWeaponBugBait":true,"CWeaponBinoculars":true,"CWeaponCycler":true,"CCrossbowBolt":true,"CPropVehiclePrisonerPod":true,"CPropCrane":true,"CPropCannon":true,"CPropAirboat":true,"CFlare":true,"CTEConcussiveExplosion":true,"CNPC_Strider":true,"CScriptIntro":true,"CRotorWashEmitter":true,"CPropCombineBall":true,"CPlasmaBeamNode":true,"CNPC_RollerMine":true,"CNPC_Manhack":true,"CNPC_CombineGunship":true,"CNPC_AntlionGuard":true,"CInfoTeleporterCountdown":true,"CMortarShell":true,"CEnvStarfield":true,"CEnvHeadcrabCanister":true,"CAlyxEmpEffect":true,"CCorpse":true,"CCitadelEnergyCore":true,"CHL2_Player":true,"CBaseHLBludgeonWeapon":true,"CHLSelectFireMachineGun":true,"CHLMachineGun":true,"CBaseHelicopter":true,"CNPC_Barney":true,"CNPC_Barnacle":true,"AR2Explosion":true,"CTEAntlionDust":true,"CVortigauntEffectDispel":true,"CVortigauntChargeToken":true,"CNPC_Vortigaunt":true,"CPredictedViewModel":true,"CWeaponStunStick":true,"CWeaponSMG1":true,"CWeapon_SLAM":true,"CWeaponShotgun":true,"CWeaponRPG":true,"CWeaponPistol":true,"CWeaponPhysCannon":true,"CHL2MPMachineGun":true,"CBaseHL2MPCombatWeapon":true,"CBaseHL2MPBludgeonWeapon":true,"CWeaponHL2MPBase":true,"CWeaponFrag":true,"CWeaponCrowbar":true,"CWeaponCrossbow":true,"CWeaponAR2":true,"CWeapon357":true,"CHL2MPGameRulesProxy":true,"CHalfLife2Proxy":true,"CBaseHLCombatWeapon":true,"CTFVehicle":true,"CTFBaseDMPowerup":true,"CWeaponSpawner":true,"CTFUmbrella":true,"CTFTranq":true,"CTFSMG_Primary":true,"CTFRevolver_Secondary":true,"CTFNailgun":true,"CTFHunterRifle":true,"CTFHeavyArtillery":true,"CTFHammerfists":true,"CTFCrowbar":true,"CTFChainsaw":true,"CTEPlantBomb":true,"CTERadioIcon":true,"CPlantedC4":true,"CCSTeam":true,"CCSPlayerResource":true,"CCSPlayer":true,"CCSRagdoll":true,"CHostage":true,"CWeaponXM1014":true,"CWeaponUSP":true,"CWeaponUMP45":true,"CWeaponTMP":true,"CSmokeGrenade":true,"CWeaponSG552":true,"CWeaponSG550":true,"CWeaponScout":true,"CWeaponP90":true,"CWeaponP228":true,"CWeaponMP5Navy":true,"CWeaponMAC10":true,"CWeaponM4A1":true,"CWeaponM3":true,"CWeaponM249":true,"CKnife":true,"CHEGrenade":true,"CWeaponGlock":true,"CWeaponGalil":true,"CWeaponG3SG1":true,"CFlashbang":true,"CWeaponFiveSeven":true,"CWeaponFamas":true,"CWeaponElite":true,"CDEagle":true,"CWeaponCSBaseGun":true,"CWeaponCSBase":true,"CC4":true,"CBaseCSGrenade":true,"CWeaponAWP":true,"CWeaponAug":true,"CAK47":true,"CFootstepControl":true,"CCSGameRulesProxy":true,"CBaseCSGrenadeProjectile":true,"CSDKTeam_Deathmatch":true,"CSDKTeam_Red":true,"CSDKTeam_Blue":true,"CSDKTeam_Unassigned":true,"CSDKTeam":true,"CSDKPlayerResource":true,"CSDKRagdoll":true,"CSDKPlayer":true,"CSparkler":true,"CRatRaceWaypoint":true,"CBriefcaseCaptureZone":true,"CBriefcase":true,"CWeaponSDKBase":true,"CWeaponMP5K":true,"CWeaponMossberg":true,"CWeaponM1911":true,"CWeaponM16":true,"CWeaponGrenade":true,"CWeaponFAL":true,"CWeaponBrawl":true,"CWeaponBeretta":true,"CBaseSDKGrenade":true,"CAkimboM1911":true,"CAkimboBeretta":true,"CAkimboBase":true,"CWeaponSDKMelee":true,"CSDKGameRulesProxy":true,"CBaseGrenadeProjectile":true,"CDAViewModel":true,"CTFWearableRazorback":true,"CTFWearableCampaignItem":true,"CTFSlap":true,"CTFRocketPack":true,"CTFGasManager":true,"CTFProjectile_JarGas":true,"CTFJarGas":true,"CTFWeaponFlameBall":true,"CTFBreakableSign":true,"CTFBreakableMelee":true,"CTFProjectile_BallOfFire":true,"CTFPointManager":true,"CTFFlameManager":true} \ No newline at end of file diff --git a/generate-class-headers.js b/generate-class-headers.js index 71191ab0..479a3ade 100755 --- a/generate-class-headers.js +++ b/generate-class-headers.js @@ -70,8 +70,8 @@ header_constexpr += ` #endif /* $mod_CONSTEXPR_AUTOGEN_HPP */`; -fs.writeFileSync("src/classinfo/" + modname + ".gen.hpp", header.replace(/\$mod/g, modname)); -fs.writeFileSync("src/classinfo/" + modname + "_constexpr.gen.hpp", header_constexpr.replace(/\$mod/g, modname)); +fs.writeFileSync("include/classinfo/" + modname + ".gen.hpp", header.replace(/\$mod/g, modname)); +fs.writeFileSync("include/classinfo/" + modname + "_constexpr.gen.hpp", header_constexpr.replace(/\$mod/g, modname)); console.log(classes); diff --git a/include/classinfo/tf2.gen.hpp b/include/classinfo/tf2.gen.hpp index f66ba19c..1d458d08 100755 --- a/include/classinfo/tf2.gen.hpp +++ b/include/classinfo/tf2.gen.hpp @@ -15,20 +15,20 @@ public: int CTETFParticleEffect{ 178 }; int CTETFExplosion{ 177 }; int CTETFBlood{ 176 }; - int CTFTankBoss{ 314 }; + int CTFTankBoss{ 315 }; int CTFBaseBoss{ 182 }; int CBossAlpha{ 0 }; - int CZombie{ 352 }; + int CZombie{ 353 }; int CMerasmusDancer{ 83 }; int CMerasmus{ 82 }; int CHeadlessHatman{ 73 }; int CEyeballBoss{ 48 }; - int CTFWeaponSapper{ 333 }; - int CTFWeaponBuilder{ 324 }; + int CTFWeaponSapper{ 334 }; + int CTFWeaponBuilder{ 325 }; int C_TFWeaponBuilder{ 0 }; - int CTFTeam{ 316 }; - int CTFTauntProp{ 315 }; - int CTFProjectile_Rocket{ 262 }; + int CTFTeam{ 317 }; + int CTFTauntProp{ 316 }; + int CTFProjectile_Rocket{ 263 }; int CTFProjectile_Flare{ 256 }; int CTFProjectile_EnergyBall{ 254 }; int CTFProjectile_GrapplingHook{ 257 }; @@ -36,7 +36,7 @@ public: int CTFProjectile_Arrow{ 251 }; int CTFPlayerResource{ 248 }; int CTFPlayer{ 246 }; - int CTFRagdoll{ 281 }; + int CTFRagdoll{ 282 }; int CTEPlayerAnimEvent{ 164 }; int CTFPasstimeLogic{ 239 }; int CPasstimeBall{ 93 }; @@ -47,7 +47,7 @@ public: int CTFAmmoPack{ 180 }; int CObjectTeleporter{ 89 }; int CObjectSentrygun{ 88 }; - int CTFProjectile_SentryRocket{ 263 }; + int CTFProjectile_SentryRocket{ 264 }; int CObjectSapper{ 87 }; int CObjectCartDispenser{ 85 }; int CObjectDispenser{ 86 }; @@ -64,12 +64,12 @@ public: int CBotNPC{ 0 }; int CRagdollPropAttached{ 110 }; int CRagdollProp{ 109 }; - int NextBotCombatCharacter{ 355 }; - int CWaterBullet{ 345 }; + int NextBotCombatCharacter{ 356 }; + int CWaterBullet{ 346 }; int CFuncMonitor{ 59 }; - int CWorld{ 351 }; - int CWaterLODControl{ 346 }; - int CVGuiScreen{ 343 }; + int CWorld{ 352 }; + int CWaterLODControl{ 347 }; + int CVGuiScreen{ 344 }; int CPropJeep{ 0 }; int CPropVehicleChoreoGeneric{ 0 }; int CTEWorldDecal{ 179 }; @@ -123,12 +123,12 @@ public: int CSteamJet{ 122 }; int CParticlePerformanceMonitor{ 91 }; int CSpotlightEnd{ 118 }; - int DustTrail{ 353 }; + int DustTrail{ 354 }; int CFireTrail{ 50 }; - int SporeTrail{ 360 }; - int SporeExplosion{ 359 }; - int RocketTrail{ 357 }; - int SmokeTrail{ 358 }; + int SporeTrail{ 361 }; + int SporeExplosion{ 360 }; + int RocketTrail{ 358 }; + int SmokeTrail{ 359 }; int CSmokeStack{ 116 }; int CSlideshowDisplay{ 115 }; int CShadowControl{ 114 }; @@ -148,9 +148,9 @@ public: int CPhysicsProp{ 97 }; int CPhysBox{ 95 }; int CParticleSystem{ 92 }; - int ParticleSmokeGrenade{ 356 }; + int ParticleSmokeGrenade{ 357 }; int CParticleFire{ 90 }; - int MovieExplosion{ 354 }; + int MovieExplosion{ 355 }; int CMaterialModifyControl{ 81 }; int CLightGlow{ 79 }; int CInfoOverlayAccessor{ 77 }; @@ -196,57 +196,57 @@ public: int CBaseAnimating{ 1 }; int CInfoLightingRelative{ 76 }; int CAI_BaseNPC{ 0 }; - int CWeaponIFMSteadyCam{ 349 }; - int CWeaponIFMBaseCamera{ 348 }; - int CWeaponIFMBase{ 347 }; - int CTFWearableLevelableItem{ 338 }; - int CTFWearableDemoShield{ 336 }; - int CTFWearableRobotArm{ 340 }; - int CTFRobotArm{ 285 }; - int CTFWrench{ 342 }; - int CTFProjectile_ThrowableBreadMonster{ 277 }; - int CTFProjectile_ThrowableBrick{ 278 }; - int CTFProjectile_ThrowableRepel{ 279 }; - int CTFProjectile_Throwable{ 276 }; - int CTFThrowable{ 317 }; - int CTFSyringeGun{ 313 }; + int CWeaponIFMSteadyCam{ 350 }; + int CWeaponIFMBaseCamera{ 349 }; + int CWeaponIFMBase{ 348 }; + int CTFWearableLevelableItem{ 339 }; + int CTFWearableDemoShield{ 337 }; + int CTFWearableRobotArm{ 341 }; + int CTFRobotArm{ 286 }; + int CTFWrench{ 343 }; + int CTFProjectile_ThrowableBreadMonster{ 278 }; + int CTFProjectile_ThrowableBrick{ 279 }; + int CTFProjectile_ThrowableRepel{ 280 }; + int CTFProjectile_Throwable{ 277 }; + int CTFThrowable{ 318 }; + int CTFSyringeGun{ 314 }; int CTFKatana{ 224 }; - int CTFSword{ 312 }; + int CTFSword{ 313 }; int CSniperDot{ 117 }; - int CTFSniperRifleClassic{ 306 }; - int CTFSniperRifleDecap{ 307 }; - int CTFSniperRifle{ 305 }; + int CTFSniperRifleClassic{ 307 }; + int CTFSniperRifleDecap{ 308 }; + int CTFSniperRifle{ 306 }; int CTFChargedSMG{ 196 }; - int CTFSMG{ 304 }; - int CTFShovel{ 302 }; - int CTFShotgunBuildingRescue{ 301 }; + int CTFSMG{ 305 }; + int CTFShovel{ 303 }; + int CTFShotgunBuildingRescue{ 302 }; int CTFPEPBrawlerBlaster{ 240 }; - int CTFSodaPopper{ 308 }; - int CTFShotgun_Revenge{ 299 }; - int CTFScatterGun{ 295 }; - int CTFShotgun_Pyro{ 298 }; - int CTFShotgun_HWG{ 297 }; - int CTFShotgun_Soldier{ 300 }; - int CTFShotgun{ 296 }; + int CTFSodaPopper{ 309 }; + int CTFShotgun_Revenge{ 300 }; + int CTFScatterGun{ 296 }; + int CTFShotgun_Pyro{ 299 }; + int CTFShotgun_HWG{ 298 }; + int CTFShotgun_Soldier{ 301 }; + int CTFShotgun{ 297 }; int CTFCrossbow{ 200 }; - int CTFRocketLauncher_Mortar{ 293 }; - int CTFRocketLauncher_AirStrike{ 291 }; - int CTFRocketLauncher_DirectHit{ 292 }; - int CTFRocketLauncher{ 290 }; - int CTFRevolver{ 284 }; + int CTFRocketLauncher_Mortar{ 294 }; + int CTFRocketLauncher_AirStrike{ 292 }; + int CTFRocketLauncher_DirectHit{ 293 }; + int CTFRocketLauncher{ 291 }; + int CTFRevolver{ 285 }; int CTFDRGPomson{ 201 }; - int CTFRaygun{ 282 }; + int CTFRaygun{ 283 }; int CTFPistol_ScoutSecondary{ 245 }; int CTFPistol_ScoutPrimary{ 244 }; int CTFPistol_Scout{ 243 }; int CTFPistol{ 242 }; int CTFPipebombLauncher{ 241 }; - int CTFWeaponPDA_Spy{ 330 }; - int CTFWeaponPDA_Engineer_Destroy{ 329 }; - int CTFWeaponPDA_Engineer_Build{ 328 }; - int CTFWeaponPDAExpansion_Teleporter{ 332 }; - int CTFWeaponPDAExpansion_Dispenser{ 331 }; - int CTFWeaponPDA{ 327 }; + int CTFWeaponPDA_Spy{ 331 }; + int CTFWeaponPDA_Engineer_Destroy{ 330 }; + int CTFWeaponPDA_Engineer_Build{ 329 }; + int CTFWeaponPDAExpansion_Teleporter{ 333 }; + int CTFWeaponPDAExpansion_Dispenser{ 332 }; + int CTFWeaponPDA{ 328 }; int CPasstimeGun{ 94 }; int CTFParticleCannon{ 238 }; int CTFParachute_Secondary{ 237 }; @@ -254,7 +254,8 @@ public: int CTFParachute{ 235 }; int CTFMinigun{ 233 }; int CTFMedigunShield{ 230 }; - int CWeaponMedigun{ 350 }; + int CWeaponMedigun{ 351 }; + int CTFProjectile_MechanicalArmOrb{ 262 }; int CTFMechanicalArm{ 229 }; int CTFLunchBox_Drink{ 228 }; int CTFLunchBox{ 227 }; @@ -267,7 +268,7 @@ public: int CTFCleaver{ 197 }; int CTFJarMilk{ 223 }; int CTFJar{ 221 }; - int CTFWeaponInvis{ 326 }; + int CTFWeaponInvis{ 327 }; int CTFGrenadePipebombProjectile{ 216 }; int CTFCannon{ 195 }; int CTFGrenadeLauncher{ 215 }; @@ -281,41 +282,41 @@ public: int CTFCompoundBow{ 199 }; int CTFClub{ 198 }; int CTFBuffItem{ 194 }; - int CTFStickBomb{ 310 }; + int CTFStickBomb{ 311 }; int CTFBottle{ 191 }; int CTFBonesaw{ 189 }; int CTFBall_Ornament{ 181 }; - int CTFStunBall{ 311 }; + int CTFStunBall{ 312 }; int CTFBat_Giftwrap{ 187 }; int CTFBat_Wood{ 188 }; int CTFBat_Fish{ 186 }; int CTFBat{ 185 }; int CTFBaseRocket{ 184 }; - int CTFWeaponBaseMerasmusGrenade{ 323 }; - int CTFWeaponBaseMelee{ 322 }; - int CTFWeaponBaseGun{ 321 }; - int CTFWeaponBaseGrenadeProj{ 320 }; - int CTFWeaponBase{ 319 }; - int CTFViewModel{ 318 }; + int CTFWeaponBaseMerasmusGrenade{ 324 }; + int CTFWeaponBaseMelee{ 323 }; + int CTFWeaponBaseGun{ 322 }; + int CTFWeaponBaseGrenadeProj{ 321 }; + int CTFWeaponBase{ 320 }; + int CTFViewModel{ 319 }; int CRobotDispenser{ 111 }; - int CTFRobotDestruction_Robot{ 286 }; - int CTFReviveMarker{ 283 }; - int CTFPumpkinBomb{ 280 }; + int CTFRobotDestruction_Robot{ 287 }; + int CTFReviveMarker{ 284 }; + int CTFPumpkinBomb{ 281 }; int CTFProjectile_EnergyRing{ 255 }; int CTFBaseProjectile{ 183 }; int CBaseObjectUpgrade{ 11 }; int CMannVsMachineStats{ 80 }; - int CTFRobotDestructionLogic{ 289 }; - int CTFRobotDestruction_RobotGroup{ 287 }; - int CTFRobotDestruction_RobotSpawn{ 288 }; + int CTFRobotDestructionLogic{ 290 }; + int CTFRobotDestruction_RobotGroup{ 288 }; + int CTFRobotDestruction_RobotSpawn{ 289 }; int CTFPlayerDestructionLogic{ 247 }; int CPlayerDestructionDispenser{ 101 }; int CTFMinigameLogic{ 232 }; int CTFHalloweenMinigame_FallingPlatforms{ 218 }; int CTFHalloweenMinigame{ 217 }; int CTFMiniGame{ 231 }; - int CTFWearableVM{ 341 }; - int CTFWearable{ 334 }; + int CTFWearableVM{ 342 }; + int CTFWearable{ 335 }; int CTFPowerupBottle{ 250 }; int CTFItem{ 220 }; int CHalloweenSoulPack{ 71 }; @@ -323,20 +324,20 @@ public: int CBonusRoundLogic{ 23 }; int CTFGameRulesProxy{ 210 }; int CTFDroppedWeapon{ 202 }; - int CTFProjectile_SpellKartBats{ 266 }; - int CTFProjectile_SpellKartOrb{ 267 }; + int CTFProjectile_SpellKartBats{ 267 }; + int CTFProjectile_SpellKartOrb{ 268 }; int CTFHellZap{ 219 }; - int CTFProjectile_SpellLightningOrb{ 268 }; - int CTFProjectile_SpellTransposeTeleport{ 275 }; - int CTFProjectile_SpellMeteorShower{ 269 }; - int CTFProjectile_SpellSpawnBoss{ 272 }; - int CTFProjectile_SpellMirv{ 270 }; - int CTFProjectile_SpellPumpkin{ 271 }; - int CTFProjectile_SpellSpawnHorde{ 273 }; - int CTFProjectile_SpellSpawnZombie{ 274 }; - int CTFProjectile_SpellBats{ 264 }; - int CTFProjectile_SpellFireball{ 265 }; - int CTFSpellBook{ 309 }; + int CTFProjectile_SpellLightningOrb{ 269 }; + int CTFProjectile_SpellTransposeTeleport{ 276 }; + int CTFProjectile_SpellMeteorShower{ 270 }; + int CTFProjectile_SpellSpawnBoss{ 273 }; + int CTFProjectile_SpellMirv{ 271 }; + int CTFProjectile_SpellPumpkin{ 272 }; + int CTFProjectile_SpellSpawnHorde{ 274 }; + int CTFProjectile_SpellSpawnZombie{ 275 }; + int CTFProjectile_SpellBats{ 265 }; + int CTFProjectile_SpellFireball{ 266 }; + int CTFSpellBook{ 310 }; int CHightower_TeleportVortex{ 74 }; int CTeleportVortex{ 159 }; int CHalloweenGiftPickup{ 69 }; @@ -356,7 +357,7 @@ public: int CInfoLadderDismount{ 75 }; int CFuncLadder{ 58 }; int CEnvDetailController{ 40 }; - int CTFWearableItem{ 337 }; + int CTFWearableItem{ 338 }; int CEconWearable{ 35 }; int CBaseAttributableItem{ 3 }; int CEconEntity{ 34 }; @@ -366,7 +367,7 @@ public: int CBaseParticleEntity{ 12 }; int CBaseGrenade{ 9 }; int CBaseCombatWeapon{ 5 }; - int CVoteController{ 344 }; + int CVoteController{ 345 }; int CTEHL2MPFireBullets{ 0 }; int CHL2MPRagdoll{ 0 }; int CHL2MP_Player{ 0 }; @@ -520,14 +521,14 @@ public: int CSDKGameRulesProxy{ 0 }; int CBaseGrenadeProjectile{ 0 }; int CDAViewModel{ 0 }; - int CTFWearableRazorback{ 339 }; - int CTFWearableCampaignItem{ 335 }; - int CTFSlap{ 303 }; - int CTFRocketPack{ 294 }; + int CTFWearableRazorback{ 340 }; + int CTFWearableCampaignItem{ 336 }; + int CTFSlap{ 304 }; + int CTFRocketPack{ 295 }; int CTFGasManager{ 211 }; int CTFProjectile_JarGas{ 260 }; int CTFJarGas{ 222 }; - int CTFWeaponFlameBall{ 325 }; + int CTFWeaponFlameBall{ 326 }; int CTFBreakableSign{ 193 }; int CTFBreakableMelee{ 192 }; int CTFProjectile_BallOfFire{ 252 }; diff --git a/include/classinfo/tf2_constexpr.gen.hpp b/include/classinfo/tf2_constexpr.gen.hpp index 9c43bd8c..8be2ba35 100755 --- a/include/classinfo/tf2_constexpr.gen.hpp +++ b/include/classinfo/tf2_constexpr.gen.hpp @@ -15,20 +15,20 @@ public: static constexpr int CTETFParticleEffect = 178; static constexpr int CTETFExplosion = 177; static constexpr int CTETFBlood = 176; - static constexpr int CTFTankBoss = 314; + static constexpr int CTFTankBoss = 315; static constexpr int CTFBaseBoss = 182; static constexpr int CBossAlpha = 0; - static constexpr int CZombie = 352; + static constexpr int CZombie = 353; static constexpr int CMerasmusDancer = 83; static constexpr int CMerasmus = 82; static constexpr int CHeadlessHatman = 73; static constexpr int CEyeballBoss = 48; - static constexpr int CTFWeaponSapper = 333; - static constexpr int CTFWeaponBuilder = 324; + static constexpr int CTFWeaponSapper = 334; + static constexpr int CTFWeaponBuilder = 325; static constexpr int C_TFWeaponBuilder = 0; - static constexpr int CTFTeam = 316; - static constexpr int CTFTauntProp = 315; - static constexpr int CTFProjectile_Rocket = 262; + static constexpr int CTFTeam = 317; + static constexpr int CTFTauntProp = 316; + static constexpr int CTFProjectile_Rocket = 263; static constexpr int CTFProjectile_Flare = 256; static constexpr int CTFProjectile_EnergyBall = 254; static constexpr int CTFProjectile_GrapplingHook = 257; @@ -36,7 +36,7 @@ public: static constexpr int CTFProjectile_Arrow = 251; static constexpr int CTFPlayerResource = 248; static constexpr int CTFPlayer = 246; - static constexpr int CTFRagdoll = 281; + static constexpr int CTFRagdoll = 282; static constexpr int CTEPlayerAnimEvent = 164; static constexpr int CTFPasstimeLogic = 239; static constexpr int CPasstimeBall = 93; @@ -47,7 +47,7 @@ public: static constexpr int CTFAmmoPack = 180; static constexpr int CObjectTeleporter = 89; static constexpr int CObjectSentrygun = 88; - static constexpr int CTFProjectile_SentryRocket = 263; + static constexpr int CTFProjectile_SentryRocket = 264; static constexpr int CObjectSapper = 87; static constexpr int CObjectCartDispenser = 85; static constexpr int CObjectDispenser = 86; @@ -64,12 +64,12 @@ public: static constexpr int CBotNPC = 0; static constexpr int CRagdollPropAttached = 110; static constexpr int CRagdollProp = 109; - static constexpr int NextBotCombatCharacter = 355; - static constexpr int CWaterBullet = 345; + static constexpr int NextBotCombatCharacter = 356; + static constexpr int CWaterBullet = 346; static constexpr int CFuncMonitor = 59; - static constexpr int CWorld = 351; - static constexpr int CWaterLODControl = 346; - static constexpr int CVGuiScreen = 343; + static constexpr int CWorld = 352; + static constexpr int CWaterLODControl = 347; + static constexpr int CVGuiScreen = 344; static constexpr int CPropJeep = 0; static constexpr int CPropVehicleChoreoGeneric = 0; static constexpr int CTEWorldDecal = 179; @@ -123,12 +123,12 @@ public: static constexpr int CSteamJet = 122; static constexpr int CParticlePerformanceMonitor = 91; static constexpr int CSpotlightEnd = 118; - static constexpr int DustTrail = 353; + static constexpr int DustTrail = 354; static constexpr int CFireTrail = 50; - static constexpr int SporeTrail = 360; - static constexpr int SporeExplosion = 359; - static constexpr int RocketTrail = 357; - static constexpr int SmokeTrail = 358; + static constexpr int SporeTrail = 361; + static constexpr int SporeExplosion = 360; + static constexpr int RocketTrail = 358; + static constexpr int SmokeTrail = 359; static constexpr int CSmokeStack = 116; static constexpr int CSlideshowDisplay = 115; static constexpr int CShadowControl = 114; @@ -148,9 +148,9 @@ public: static constexpr int CPhysicsProp = 97; static constexpr int CPhysBox = 95; static constexpr int CParticleSystem = 92; - static constexpr int ParticleSmokeGrenade = 356; + static constexpr int ParticleSmokeGrenade = 357; static constexpr int CParticleFire = 90; - static constexpr int MovieExplosion = 354; + static constexpr int MovieExplosion = 355; static constexpr int CMaterialModifyControl = 81; static constexpr int CLightGlow = 79; static constexpr int CInfoOverlayAccessor = 77; @@ -196,57 +196,57 @@ public: static constexpr int CBaseAnimating = 1; static constexpr int CInfoLightingRelative = 76; static constexpr int CAI_BaseNPC = 0; - static constexpr int CWeaponIFMSteadyCam = 349; - static constexpr int CWeaponIFMBaseCamera = 348; - static constexpr int CWeaponIFMBase = 347; - static constexpr int CTFWearableLevelableItem = 338; - static constexpr int CTFWearableDemoShield = 336; - static constexpr int CTFWearableRobotArm = 340; - static constexpr int CTFRobotArm = 285; - static constexpr int CTFWrench = 342; - static constexpr int CTFProjectile_ThrowableBreadMonster = 277; - static constexpr int CTFProjectile_ThrowableBrick = 278; - static constexpr int CTFProjectile_ThrowableRepel = 279; - static constexpr int CTFProjectile_Throwable = 276; - static constexpr int CTFThrowable = 317; - static constexpr int CTFSyringeGun = 313; + static constexpr int CWeaponIFMSteadyCam = 350; + static constexpr int CWeaponIFMBaseCamera = 349; + static constexpr int CWeaponIFMBase = 348; + static constexpr int CTFWearableLevelableItem = 339; + static constexpr int CTFWearableDemoShield = 337; + static constexpr int CTFWearableRobotArm = 341; + static constexpr int CTFRobotArm = 286; + static constexpr int CTFWrench = 343; + static constexpr int CTFProjectile_ThrowableBreadMonster = 278; + static constexpr int CTFProjectile_ThrowableBrick = 279; + static constexpr int CTFProjectile_ThrowableRepel = 280; + static constexpr int CTFProjectile_Throwable = 277; + static constexpr int CTFThrowable = 318; + static constexpr int CTFSyringeGun = 314; static constexpr int CTFKatana = 224; - static constexpr int CTFSword = 312; + static constexpr int CTFSword = 313; static constexpr int CSniperDot = 117; - static constexpr int CTFSniperRifleClassic = 306; - static constexpr int CTFSniperRifleDecap = 307; - static constexpr int CTFSniperRifle = 305; + static constexpr int CTFSniperRifleClassic = 307; + static constexpr int CTFSniperRifleDecap = 308; + static constexpr int CTFSniperRifle = 306; static constexpr int CTFChargedSMG = 196; - static constexpr int CTFSMG = 304; - static constexpr int CTFShovel = 302; - static constexpr int CTFShotgunBuildingRescue = 301; + static constexpr int CTFSMG = 305; + static constexpr int CTFShovel = 303; + static constexpr int CTFShotgunBuildingRescue = 302; static constexpr int CTFPEPBrawlerBlaster = 240; - static constexpr int CTFSodaPopper = 308; - static constexpr int CTFShotgun_Revenge = 299; - static constexpr int CTFScatterGun = 295; - static constexpr int CTFShotgun_Pyro = 298; - static constexpr int CTFShotgun_HWG = 297; - static constexpr int CTFShotgun_Soldier = 300; - static constexpr int CTFShotgun = 296; + static constexpr int CTFSodaPopper = 309; + static constexpr int CTFShotgun_Revenge = 300; + static constexpr int CTFScatterGun = 296; + static constexpr int CTFShotgun_Pyro = 299; + static constexpr int CTFShotgun_HWG = 298; + static constexpr int CTFShotgun_Soldier = 301; + static constexpr int CTFShotgun = 297; static constexpr int CTFCrossbow = 200; - static constexpr int CTFRocketLauncher_Mortar = 293; - static constexpr int CTFRocketLauncher_AirStrike = 291; - static constexpr int CTFRocketLauncher_DirectHit = 292; - static constexpr int CTFRocketLauncher = 290; - static constexpr int CTFRevolver = 284; + static constexpr int CTFRocketLauncher_Mortar = 294; + static constexpr int CTFRocketLauncher_AirStrike = 292; + static constexpr int CTFRocketLauncher_DirectHit = 293; + static constexpr int CTFRocketLauncher = 291; + static constexpr int CTFRevolver = 285; static constexpr int CTFDRGPomson = 201; - static constexpr int CTFRaygun = 282; + static constexpr int CTFRaygun = 283; static constexpr int CTFPistol_ScoutSecondary = 245; static constexpr int CTFPistol_ScoutPrimary = 244; static constexpr int CTFPistol_Scout = 243; static constexpr int CTFPistol = 242; static constexpr int CTFPipebombLauncher = 241; - static constexpr int CTFWeaponPDA_Spy = 330; - static constexpr int CTFWeaponPDA_Engineer_Destroy = 329; - static constexpr int CTFWeaponPDA_Engineer_Build = 328; - static constexpr int CTFWeaponPDAExpansion_Teleporter = 332; - static constexpr int CTFWeaponPDAExpansion_Dispenser = 331; - static constexpr int CTFWeaponPDA = 327; + static constexpr int CTFWeaponPDA_Spy = 331; + static constexpr int CTFWeaponPDA_Engineer_Destroy = 330; + static constexpr int CTFWeaponPDA_Engineer_Build = 329; + static constexpr int CTFWeaponPDAExpansion_Teleporter = 333; + static constexpr int CTFWeaponPDAExpansion_Dispenser = 332; + static constexpr int CTFWeaponPDA = 328; static constexpr int CPasstimeGun = 94; static constexpr int CTFParticleCannon = 238; static constexpr int CTFParachute_Secondary = 237; @@ -254,7 +254,8 @@ public: static constexpr int CTFParachute = 235; static constexpr int CTFMinigun = 233; static constexpr int CTFMedigunShield = 230; - static constexpr int CWeaponMedigun = 350; + static constexpr int CWeaponMedigun = 351; + static constexpr int CTFProjectile_MechanicalArmOrb = 262; static constexpr int CTFMechanicalArm = 229; static constexpr int CTFLunchBox_Drink = 228; static constexpr int CTFLunchBox = 227; @@ -267,7 +268,7 @@ public: static constexpr int CTFCleaver = 197; static constexpr int CTFJarMilk = 223; static constexpr int CTFJar = 221; - static constexpr int CTFWeaponInvis = 326; + static constexpr int CTFWeaponInvis = 327; static constexpr int CTFGrenadePipebombProjectile = 216; static constexpr int CTFCannon = 195; static constexpr int CTFGrenadeLauncher = 215; @@ -281,41 +282,41 @@ public: static constexpr int CTFCompoundBow = 199; static constexpr int CTFClub = 198; static constexpr int CTFBuffItem = 194; - static constexpr int CTFStickBomb = 310; + static constexpr int CTFStickBomb = 311; static constexpr int CTFBottle = 191; static constexpr int CTFBonesaw = 189; static constexpr int CTFBall_Ornament = 181; - static constexpr int CTFStunBall = 311; + static constexpr int CTFStunBall = 312; static constexpr int CTFBat_Giftwrap = 187; static constexpr int CTFBat_Wood = 188; static constexpr int CTFBat_Fish = 186; static constexpr int CTFBat = 185; static constexpr int CTFBaseRocket = 184; - static constexpr int CTFWeaponBaseMerasmusGrenade = 323; - static constexpr int CTFWeaponBaseMelee = 322; - static constexpr int CTFWeaponBaseGun = 321; - static constexpr int CTFWeaponBaseGrenadeProj = 320; - static constexpr int CTFWeaponBase = 319; - static constexpr int CTFViewModel = 318; + static constexpr int CTFWeaponBaseMerasmusGrenade = 324; + static constexpr int CTFWeaponBaseMelee = 323; + static constexpr int CTFWeaponBaseGun = 322; + static constexpr int CTFWeaponBaseGrenadeProj = 321; + static constexpr int CTFWeaponBase = 320; + static constexpr int CTFViewModel = 319; static constexpr int CRobotDispenser = 111; - static constexpr int CTFRobotDestruction_Robot = 286; - static constexpr int CTFReviveMarker = 283; - static constexpr int CTFPumpkinBomb = 280; + static constexpr int CTFRobotDestruction_Robot = 287; + static constexpr int CTFReviveMarker = 284; + static constexpr int CTFPumpkinBomb = 281; static constexpr int CTFProjectile_EnergyRing = 255; static constexpr int CTFBaseProjectile = 183; static constexpr int CBaseObjectUpgrade = 11; static constexpr int CMannVsMachineStats = 80; - static constexpr int CTFRobotDestructionLogic = 289; - static constexpr int CTFRobotDestruction_RobotGroup = 287; - static constexpr int CTFRobotDestruction_RobotSpawn = 288; + static constexpr int CTFRobotDestructionLogic = 290; + static constexpr int CTFRobotDestruction_RobotGroup = 288; + static constexpr int CTFRobotDestruction_RobotSpawn = 289; static constexpr int CTFPlayerDestructionLogic = 247; static constexpr int CPlayerDestructionDispenser = 101; static constexpr int CTFMinigameLogic = 232; static constexpr int CTFHalloweenMinigame_FallingPlatforms = 218; static constexpr int CTFHalloweenMinigame = 217; static constexpr int CTFMiniGame = 231; - static constexpr int CTFWearableVM = 341; - static constexpr int CTFWearable = 334; + static constexpr int CTFWearableVM = 342; + static constexpr int CTFWearable = 335; static constexpr int CTFPowerupBottle = 250; static constexpr int CTFItem = 220; static constexpr int CHalloweenSoulPack = 71; @@ -323,20 +324,20 @@ public: static constexpr int CBonusRoundLogic = 23; static constexpr int CTFGameRulesProxy = 210; static constexpr int CTFDroppedWeapon = 202; - static constexpr int CTFProjectile_SpellKartBats = 266; - static constexpr int CTFProjectile_SpellKartOrb = 267; + static constexpr int CTFProjectile_SpellKartBats = 267; + static constexpr int CTFProjectile_SpellKartOrb = 268; static constexpr int CTFHellZap = 219; - static constexpr int CTFProjectile_SpellLightningOrb = 268; - static constexpr int CTFProjectile_SpellTransposeTeleport = 275; - static constexpr int CTFProjectile_SpellMeteorShower = 269; - static constexpr int CTFProjectile_SpellSpawnBoss = 272; - static constexpr int CTFProjectile_SpellMirv = 270; - static constexpr int CTFProjectile_SpellPumpkin = 271; - static constexpr int CTFProjectile_SpellSpawnHorde = 273; - static constexpr int CTFProjectile_SpellSpawnZombie = 274; - static constexpr int CTFProjectile_SpellBats = 264; - static constexpr int CTFProjectile_SpellFireball = 265; - static constexpr int CTFSpellBook = 309; + static constexpr int CTFProjectile_SpellLightningOrb = 269; + static constexpr int CTFProjectile_SpellTransposeTeleport = 276; + static constexpr int CTFProjectile_SpellMeteorShower = 270; + static constexpr int CTFProjectile_SpellSpawnBoss = 273; + static constexpr int CTFProjectile_SpellMirv = 271; + static constexpr int CTFProjectile_SpellPumpkin = 272; + static constexpr int CTFProjectile_SpellSpawnHorde = 274; + static constexpr int CTFProjectile_SpellSpawnZombie = 275; + static constexpr int CTFProjectile_SpellBats = 265; + static constexpr int CTFProjectile_SpellFireball = 266; + static constexpr int CTFSpellBook = 310; static constexpr int CHightower_TeleportVortex = 74; static constexpr int CTeleportVortex = 159; static constexpr int CHalloweenGiftPickup = 69; @@ -356,7 +357,7 @@ public: static constexpr int CInfoLadderDismount = 75; static constexpr int CFuncLadder = 58; static constexpr int CEnvDetailController = 40; - static constexpr int CTFWearableItem = 337; + static constexpr int CTFWearableItem = 338; static constexpr int CEconWearable = 35; static constexpr int CBaseAttributableItem = 3; static constexpr int CEconEntity = 34; @@ -366,7 +367,7 @@ public: static constexpr int CBaseParticleEntity = 12; static constexpr int CBaseGrenade = 9; static constexpr int CBaseCombatWeapon = 5; - static constexpr int CVoteController = 344; + static constexpr int CVoteController = 345; static constexpr int CTEHL2MPFireBullets = 0; static constexpr int CHL2MPRagdoll = 0; static constexpr int CHL2MP_Player = 0; @@ -520,14 +521,14 @@ public: static constexpr int CSDKGameRulesProxy = 0; static constexpr int CBaseGrenadeProjectile = 0; static constexpr int CDAViewModel = 0; - static constexpr int CTFWearableRazorback = 339; - static constexpr int CTFWearableCampaignItem = 335; - static constexpr int CTFSlap = 303; - static constexpr int CTFRocketPack = 294; + static constexpr int CTFWearableRazorback = 340; + static constexpr int CTFWearableCampaignItem = 336; + static constexpr int CTFSlap = 304; + static constexpr int CTFRocketPack = 295; static constexpr int CTFGasManager = 211; static constexpr int CTFProjectile_JarGas = 260; static constexpr int CTFJarGas = 222; - static constexpr int CTFWeaponFlameBall = 325; + static constexpr int CTFWeaponFlameBall = 326; static constexpr int CTFBreakableSign = 193; static constexpr int CTFBreakableMelee = 192; static constexpr int CTFProjectile_BallOfFire = 252; diff --git a/include/hacks/AutoDetonator.hpp b/include/hacks/AutoDetonator.hpp index 172d89ee..6989e523 100755 --- a/include/hacks/AutoDetonator.hpp +++ b/include/hacks/AutoDetonator.hpp @@ -16,9 +16,6 @@ namespace tf { namespace autodetonator { - -extern CatVar enabled; - void CreateMove(); } } diff --git a/include/hacks/AutoReflect.hpp b/include/hacks/AutoReflect.hpp index e7f20517..48653f2d 100755 --- a/include/hacks/AutoReflect.hpp +++ b/include/hacks/AutoReflect.hpp @@ -22,6 +22,7 @@ extern CatVar idle_only; extern CatVar stickies; extern CatVar max_distance; +void Draw(); void CreateMove(); bool ShouldReflect(CachedEntity *ent); bool IsEntStickyBomb(CachedEntity *ent); diff --git a/include/menu/CBaseButton.h b/include/menu/CBaseButton.h deleted file mode 100755 index 08dabf25..00000000 --- a/include/menu/CBaseButton.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * CBaseButton.h - * - * Created on: Jan 26, 2017 - * Author: nullifiedcat - */ - -#ifndef CBASEBUTTON_H_ -#define CBASEBUTTON_H_ - -// #include "../beforecheaders.h" -#include -// #include "../aftercheaders.h" - -#include "menu/CTextLabel.h" - -#define BUTTON_PADDING_W 3 -#define BUTTON_PADDING_H 2 - -class CBaseButton; - -typedef std::function ButtonCallbackFn_t; - -class CBaseButton : public CTextLabel -{ -public: - CBaseButton(std::string name = "unnamed", IWidget *parent = nullptr, - std::string text = "", ButtonCallbackFn_t callback = nullptr); - - virtual void Draw(int x, int y); - virtual void OnMousePress() override; - - void SetCallback(ButtonCallbackFn_t callback); - - ButtonCallbackFn_t m_pCallback; -}; - -#endif /* CBASEBUTTON_H_ */ diff --git a/include/menu/CCTitleBar.h b/include/menu/CCTitleBar.h deleted file mode 100755 index 7be26586..00000000 --- a/include/menu/CCTitleBar.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * TitleBar.h - * - * Created on: Jan 25, 2017 - * Author: nullifiedcat - */ - -#ifndef CCTITLEBAR_H_ -#define CCTITLEBAR_H_ - -#include "menu/CBaseWidget.h" - -#define TITLEBAR_PADDING_W 2 -#define TITLEBAR_PADDING_H 1 - -class CTitleBar : public CBaseWidget -{ -public: - CTitleBar(IWidget *parent, std::string title); - - virtual void Draw(int x, int y); - virtual void Update(); - - std::string m_strTitle; - int m_iDraggingStage; - int m_nLastX; - int m_nLastY; -}; - -#endif /* CCTITLEBAR_H_ */ diff --git a/include/menu/CCVarContainer.h b/include/menu/CCVarContainer.h deleted file mode 100755 index 4187d5d4..00000000 --- a/include/menu/CCVarContainer.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CCVarContainer.h - * - * Created on: Jan 28, 2017 - * Author: nullifiedcat - */ - -#ifndef CCVARCONTAINER_H_ -#define CCVARCONTAINER_H_ - -#include "menu/CBaseContainer.h" - -class CatVar; -class CTextInput; -class CTextLabel; - -class CCVarContainer : public CBaseContainer -{ -public: - CCVarContainer(IWidget *parent, CatVar *var); - - virtual void MoveChildren() override; - virtual void Update() override; - - CTextInput *m_pInput; - IWidget *m_pControl; - CTextLabel *m_pLabel; - - CatVar *m_pVar; -}; - -#endif /* CCVARCONTAINER_H_ */ diff --git a/include/menu/CCheckbox.h b/include/menu/CCheckbox.h deleted file mode 100755 index ea05ef5d..00000000 --- a/include/menu/CCheckbox.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * CCheckbox.h - * - * Created on: Jan 26, 2017 - * Author: nullifiedcat - */ - -#ifndef CCHECKBOX_H_ -#define CCHECKBOX_H_ - -#include "menu/CBaseWidget.h" - -class CCheckbox; - -typedef std::function CheckboxCallbackFn_t; - -class CCheckbox : public CBaseWidget -{ -public: - CCheckbox(std::string name = "unnamed", IWidget *parent = nullptr, - bool checked = false); - - void SetWidth(int width); - inline bool Value() - { - return Props()->GetBool("checked"); - } - inline void SetValue(bool value) - { - Props()->SetBool("checked", value); - } - void SetCallback(CheckboxCallbackFn_t callback); - - virtual void OnMousePress(); - virtual void Draw(int x, int y); - - CheckboxCallbackFn_t m_pCallback; -}; - -#endif /* CCHECKBOX_H_ */ diff --git a/include/menu/CDropdown.h b/include/menu/CDropdown.h deleted file mode 100755 index 5499d8c1..00000000 --- a/include/menu/CDropdown.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * CDropdown.h - * - * Created on: Jan 31, 2017 - * Author: nullifiedcat - */ - -#ifndef CDROPDOWN_H_ -#define CDROPDOWN_H_ - -#include "menu/CBaseButton.h" -#include "menu/CDropdownList.h" - -class CDropdown; - -typedef std::function DropdownCallbackFn_t; - -class CDropdown : public CBaseButton -{ -public: - CDropdown(std::string name = "unnamed", IWidget *parent = nullptr); - ~CDropdown(); - - void AddValue(std::string); - int ValueCount(); - std::string ValueName(int idx); - void SetValue(int value); - void SetValueInternal(int value); - int Value(); - - void ShowList(); - void SetCallback(DropdownCallbackFn_t callback); - - virtual void Draw(int x, int y); - virtual void OnFocusLose(); - - DropdownCallbackFn_t m_pDropdownCallback; - CDropdownList *list; - std::vector m_values; -}; - -#endif /* CDROPDOWN_H_ */ diff --git a/include/menu/CDropdownEntry.h b/include/menu/CDropdownEntry.h deleted file mode 100755 index 06a397a7..00000000 --- a/include/menu/CDropdownEntry.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * CDropdownEntry.h - * - * Created on: Jan 31, 2017 - * Author: nullifiedcat - */ - -#ifndef CDROPDOWNENTRY_H_ -#define CDROPDOWNENTRY_H_ - -#include "menu/CBaseButton.h" -#include "menu/CDropdownList.h" - -class CDropdownEntry : public CBaseButton -{ -public: - CDropdownEntry(std::string name = "unnamed", - CDropdownList *parent = nullptr, std::string text = "unset", - int value = 0); - ~CDropdownEntry(); - - virtual void Draw(int x, int y); -}; - -#endif /* CDROPDOWNENTRY_H_ */ diff --git a/include/menu/CDropdownList.h b/include/menu/CDropdownList.h deleted file mode 100755 index f9b649c4..00000000 --- a/include/menu/CDropdownList.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * CDropdownList.h - * - * Created on: Jan 31, 2017 - * Author: nullifiedcat - */ - -#ifndef CDROPDOWNLIST_H_ -#define CDROPDOWNLIST_H_ - -#include "menu/CBaseContainer.h" - -class CDropdown; -class CDropdownEntry; - -class CDropdownList : public CBaseContainer -{ -public: - CDropdownList(std::string name = "unnamed", CDropdown *menu = nullptr, - int offset = 0); - ~CDropdownList(); - - virtual void Draw(int x, int y); - virtual void MoveChildren(); - inline virtual void SortByZIndex() override{}; - inline virtual bool DoesStealFocus() - { - return false; - } - - void AddEntry(std::string name); - void SetValue(int value); - - CDropdown *m_pMenu; - std::vector m_entries; -}; - -#endif /* CDROPDOWNLIST_H_ */ diff --git a/include/menu/CKeyInput.h b/include/menu/CKeyInput.h deleted file mode 100755 index b02db410..00000000 --- a/include/menu/CKeyInput.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * CKey.h - * - * Created on: Feb 1, 2017 - * Author: nullifiedcat - */ - -#ifndef CKEYINPUT_H_ -#define CKEYINPUT_H_ - -#include "menu/CBaseWidget.h" - -class CKeyInput; - -typedef std::function KeyInputCallbackFn_t; - -class CKeyInput : public CBaseWidget -{ -public: - CKeyInput(std::string name = "unnamed", IWidget *parent = nullptr); - - ButtonCode_t Value(); - void SetValue(int value); - void SetCallback(KeyInputCallbackFn_t callback); - - KeyInputCallbackFn_t m_pCallback; - - virtual void OnKeyPress(ButtonCode_t key, bool repeat) override; - virtual void Draw(int x, int y) override; - virtual void OnMousePress() override; - virtual void OnFocusLose() override; - virtual bool ConsumesKey(ButtonCode_t key) override; -}; - -#endif /* CKEYINPUT_H_ */ diff --git a/include/menu/CMenuContainer.h b/include/menu/CMenuContainer.h deleted file mode 100755 index ac406bcd..00000000 --- a/include/menu/CMenuContainer.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * CMenuContainer.h - * - * Created on: Feb 3, 2017 - * Author: nullifiedcat - */ - -#ifndef CMENUCONTAINER_H_ -#define CMENUCONTAINER_H_ - -#include "menu/CBaseContainer.h" - -class CMenuWindow; - -class CMenuContainer : public CBaseContainer -{ -public: - CMenuContainer(std::string name, CMenuWindow *parent); - - virtual inline void SortByZIndex() override{}; - virtual void MoveChildren() override; - virtual void Draw(int x, int y) override; -}; - -#endif /* CMENUCONTAINER_H_ */ diff --git a/include/menu/CMenuList.h b/include/menu/CMenuList.h deleted file mode 100755 index b95c6bd2..00000000 --- a/include/menu/CMenuList.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * CMenuList.h - * - * Created on: Feb 3, 2017 - * Author: nullifiedcat - */ - -#ifndef CMENULIST_H_ -#define CMENULIST_H_ - -#include "menu/CBaseContainer.h" - -class CMenuWindow; -class CMenuContainer; -class CMenuListEntry; - -class CMenuList : public CBaseContainer -{ -public: - CMenuList(std::string name, CMenuWindow *parent); - - void SelectEntry(std::string id); - void AddEntry(std::string id, std::string name); - - virtual void MoveChildren() override; - - CMenuListEntry *m_pSelected; -}; - -#endif /* CMENULIST_H_ */ diff --git a/include/menu/CMenuListEntry.h b/include/menu/CMenuListEntry.h deleted file mode 100755 index 6457cc9d..00000000 --- a/include/menu/CMenuListEntry.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * CMenuListEntry.h - * - * Created on: Feb 3, 2017 - * Author: nullifiedcat - */ - -#ifndef CMENULISTENTRY_H_ -#define CMENULISTENTRY_H_ - -#include "menu/CBaseButton.h" - -class CMenuList; - -class CMenuListEntry : public CBaseButton -{ -public: - CMenuListEntry(std::string name, CMenuList *parent, std::string entry); - - bool IsSelected(); - - virtual void SetMaxSize(int x, int y) override; - virtual void Draw(int x, int y) override; -}; - -#endif /* CMENULISTENTRY_H_ */ diff --git a/include/menu/CMenuWindow.h b/include/menu/CMenuWindow.h deleted file mode 100755 index 32a32a6f..00000000 --- a/include/menu/CMenuWindow.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * CMenuWindow.h - * - * Created on: Feb 3, 2017 - * Author: nullifiedcat - */ - -#ifndef CMENUWINDOW_H_ -#define CMENUWINDOW_H_ - -#include "menu/CBaseWindow.h" - -class CMenuList; -class CMenuContainer; -class CTitleBar; - -class CMenuWindow : public CBaseWindow -{ -public: - CMenuWindow(std::string name, IWidget *parent); - - void AddElements(); - - void SelectTab(std::string tab); - void AddTab(std::string tab, std::string name); - CMenuContainer *GetTab(std::string tab); - - virtual void MoveChildren() override; - - CMenuList *m_pList; - CTitleBar *m_pTitle; - CMenuContainer *m_pActiveTab; -}; - -#endif /* CMENUWINDOW_H_ */ diff --git a/include/menu/CSlider.h b/include/menu/CSlider.h deleted file mode 100755 index f9b7bec3..00000000 --- a/include/menu/CSlider.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * CSlider.h - * - * Created on: Jan 27, 2017 - * Author: nullifiedcat - */ - -#ifndef CSLIDER_H_ -#define CSLIDER_H_ - -#include "menu/CBaseWidget.h" - -class CSlider; - -typedef std::function SliderCallbackFn_t; - -class CSlider : public CBaseWidget -{ -public: - CSlider(std::string name = "", IWidget *parent = nullptr); - - void Setup(float min, float max); - void SetStep(float step); - float Value(); - void SetValue(float value); - void SetCallback(SliderCallbackFn_t callback); - - virtual void Update(); - virtual void Draw(int x, int y); - - SliderCallbackFn_t m_pCallback; - - int m_nLastX; - bool m_bDragInit; - int m_nSliderPos; -}; - -#endif /* CSLIDER_H_ */ diff --git a/include/menu/CSplitContainer.h b/include/menu/CSplitContainer.h deleted file mode 100755 index 6682e160..00000000 --- a/include/menu/CSplitContainer.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * CSplitContainer.h - * - * Created on: Jan 28, 2017 - * Author: nullifiedcat - */ - -#ifndef CSPLITCONTAINER_H_ -#define CSPLITCONTAINER_H_ - -#include "menu/CBaseContainer.h" - -class CSplitContainer : public CBaseContainer -{ -public: - CSplitContainer(std::string name = "unnamed", IWidget *parent = nullptr); - - virtual void MoveChildren() override; -}; - -#endif /* CSPLITCONTAINER_H_ */ diff --git a/include/menu/CTextInput.h b/include/menu/CTextInput.h deleted file mode 100755 index 07af7422..00000000 --- a/include/menu/CTextInput.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * CTextInput.h - * - * Created on: Jan 26, 2017 - * Author: nullifiedcat - */ - -#ifndef CTEXTINPUT_H_ -#define CTEXTINPUT_H_ - -#include "menu/CBaseWidget.h" - -class CTextInput; - -typedef std::function - TextInputCallbackFn_t; - -class CTextInput : public CBaseWidget -{ -public: - CTextInput(std::string name = "unnamed", IWidget *parent = nullptr); - - virtual void OnKeyPress(ButtonCode_t key, bool repeat); - virtual void Draw(int x, int y); - virtual bool ConsumesKey(ButtonCode_t key); - - void PutChar(char ch); - void SetLength(int newlength); - void SetMaxWidth(int width); - void SetCallback(TextInputCallbackFn_t callback); - std::string Value(); - void SetValue(std::string value); - - TextInputCallbackFn_t m_pCallback; -}; - -#endif /* CTEXTINPUT_H_ */ diff --git a/include/menu/CTooltip.h b/include/menu/CTooltip.h deleted file mode 100755 index e4b82e0d..00000000 --- a/include/menu/CTooltip.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * CTooltip.h - * - * Created on: Jan 28, 2017 - * Author: nullifiedcat - */ - -#ifndef CTOOLTIP_H_ -#define CTOOLTIP_H_ - -#include "menu/CTextLabel.h" - -class CTooltip : public CTextLabel -{ -public: - CTooltip(IWidget *parent = nullptr); - - virtual void Draw(int x, int y); - inline virtual PositionMode GetPositionMode() - { - return PositionMode::FLOATING; - } -}; - -#endif /* CTOOLTIP_H_ */ diff --git a/include/menu/GUI.h b/include/menu/GUI.h index efe95e11..c19e9f88 100755 --- a/include/menu/GUI.h +++ b/include/menu/GUI.h @@ -18,16 +18,15 @@ class CatVar; #include "menu/ncc/Root.hpp" #include "menu/ncc/Menu.hpp" -class CTooltip; class RootWindow; extern CatVar gui_color_r; extern CatVar gui_color_g; extern CatVar gui_color_b; +extern CatVar gui_color_a; extern CatVar gui_visible; extern CatVar gui_draw_bounds; -constexpr bool gui_nullcore = true; int NCGUIColor(); @@ -40,19 +39,12 @@ public: bool Visible(); void Update(); void Setup(); - RootWindow *GetRootWindow(); bool ConsumesKey(ButtonCode_t key); - void ShowTooltip(std::string text); - - CTooltip *m_pTooltip; - RootWindow *m_pRootWindow; - // TODO NullCore tooltip menu::ncc::Root *root_nullcore; int last_scroll_value; - bool m_bShowTooltip; bool m_bConsumeKeys; bool m_bKeysInit; bool m_bPressedState[ButtonCode_t::BUTTON_CODE_COUNT]; diff --git a/include/menu/IWidget.h b/include/menu/IWidget.h index 7eca0f3a..e36076b9 100755 --- a/include/menu/IWidget.h +++ b/include/menu/IWidget.h @@ -8,11 +8,9 @@ #ifndef IWIDGET_H_ #define IWIDGET_H_ -// #include "../beforecheaders.h" #include #include #include -// #include "../aftercheaders.h" #include "../inputsystem/ButtonCode.h" diff --git a/include/menu/RootWindow.h b/include/menu/RootWindow.h deleted file mode 100755 index 9bc52d9d..00000000 --- a/include/menu/RootWindow.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * RootWindow.h - * - * Created on: Jan 25, 2017 - * Author: nullifiedcat - */ - -#ifndef ROOTWINDOW_H_ -#define ROOTWINDOW_H_ -#undef RootWindow - -#include "menu/CBaseWindow.h" - -class RootWindow : public CBaseWindow -{ -public: - RootWindow(); - - void Setup(); - - inline virtual void MoveChildren() override{}; -}; - -#endif /* ROOTWINDOW_H_ */ diff --git a/include/menu/ncc/Background.hpp b/include/menu/ncc/Background.hpp deleted file mode 100755 index aa1ad768..00000000 --- a/include/menu/ncc/Background.hpp +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Background.hpp - * - * Created on: Apr 28, 2017 - * Author: nullifiedcat - */ - -#ifndef BACKGROUND_HPP_ -#define BACKGROUND_HPP_ - -#include "common.hpp" -#include "menu/ncc/Menu.hpp" - -namespace menu -{ -namespace ncc -{ -/* -extern unsigned char _binary_snowflake_start; -extern unsigned char _binary_flame_start; -extern unsigned char _binary_raindrop_start; -extern unsigned char _binary_raindrop2_start; -extern unsigned char _binary_heart_start; - -class Background : public CBaseWidget { -public: - struct Particle { - float x, y; - float vx, vy; - int show_in { 0 }; - bool dead { false }; - Texture* texture { nullptr }; - Particle* next { nullptr }; - Particle* prev { nullptr }; - void Update(float dt); - }; -public: - Background(); - ~Background(); - virtual bool AlwaysVisible() override; - virtual void Draw(int x, int y) override; - virtual void Update() override; - void LoadTextures(); - void MakeParticle(); - void KillParticle(Particle* flake); -public: - // FIXME array or something - bool textures_loaded { false }; - Texture tx_snowflake; - Texture tx_raindrop; - Texture tx_raindrop2; - Texture tx_flame; - Texture tx_heart; - std::chrono::time_point last_update; - Particle* list { nullptr }; - Particle* list_tail { nullptr }; -}; -*/ -} -} - -#endif /* BACKGROUND_HPP_ */ diff --git a/include/menu/ncc/CritIndicator.hpp b/include/menu/ncc/CritIndicator.hpp deleted file mode 100755 index 68d4456f..00000000 --- a/include/menu/ncc/CritIndicator.hpp +++ /dev/null @@ -1,46 +0,0 @@ -/* - * CritIndicator.hpp - * - * Created on: May 13, 2017 - * Author: nullifiedcat - */ - -#ifndef CRITINDICATOR_HPP_ -#define CRITINDICATOR_HPP_ - -#include "menu/ncc/Menu.hpp" -/* -extern unsigned char _binary_crit_1_start; -extern unsigned char _binary_crit_2_start; -extern unsigned char _binary_crit_3_start; -extern unsigned char _binary_crit_4_start; -*/ -namespace menu -{ -namespace ncc -{ -/* -// FIXME temporary.. I need to make a way to save this instead of using convars. -extern CatVar ci_enabled; -extern CatVar ci_x; -extern CatVar ci_y; - -class CritIndicator : public CBaseWidget { -public: - CritIndicator(); - - virtual bool IsVisible() override; - virtual void Draw(int x, int y) override; - virtual bool AlwaysVisible() override; - virtual void Update() override; -public: - Texture crit_normal; - Texture crit_none; - Texture crit_ready; - Texture crit_disabled; -}; -*/ -} -} - -#endif /* CRITINDICATOR_HPP_ */ diff --git a/include/menu/ncc/Logo.hpp b/include/menu/ncc/Logo.hpp deleted file mode 100755 index f1a36f48..00000000 --- a/include/menu/ncc/Logo.hpp +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Logo.hpp - * - * Created on: Apr 28, 2017 - * Author: nullifiedcat - */ - -#ifndef LOGO_HPP_ -#define LOGO_HPP_ - -#include "menu/ncc/Menu.hpp" - -// extern unsigned char _binary_logo_start; - -namespace menu -{ -namespace ncc -{ -/* -class Logo : public CBaseWidget { -public: - Logo(); - virtual bool AlwaysVisible() override; - virtual void Draw(int x, int y) override; - virtual void Update() override; - Texture texture; -}; -*/ -} -} - -#endif /* LOGO_HPP_ */ diff --git a/include/menu/ncc/Menu.hpp b/include/menu/ncc/Menu.hpp index 04109c6c..b7ecf36b 100755 --- a/include/menu/ncc/Menu.hpp +++ b/include/menu/ncc/Menu.hpp @@ -21,12 +21,8 @@ #include "menu/ncc/List.hpp" #include "menu/ncc/PlayerList.hpp" #include "menu/ncc/PlayerListEntry.hpp" -#include "menu/ncc/Radar.hpp" #include "menu/ncc/Root.hpp" #include "menu/ncc/Tooltip.hpp" -#include "menu/ncc/Background.hpp" -#include "menu/ncc/CritIndicator.hpp" -#include "menu/ncc/Logo.hpp" namespace menu { diff --git a/include/menu/ncc/Radar.hpp b/include/menu/ncc/Radar.hpp deleted file mode 100755 index 9ed91d5c..00000000 --- a/include/menu/ncc/Radar.hpp +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Radar.hpp - * - * Created on: Mar 28, 2017 - * Author: nullifiedcat - */ - -#ifndef RADAR_HPP_ -#define RADAR_HPP_ - -#include "../CBaseWidget.h" - -namespace menu -{ -namespace ncc -{ - -class Radar : public CBaseWidget -{ -public: - Radar(); - virtual void Update() override; - virtual std::pair GetSize() override; - // virtual void Draw() override; -}; -} -} - -#endif /* RADAR_HPP_ */ diff --git a/src/classinfo/dummy.gen.hpp b/src/classinfo/dummy.gen.hpp deleted file mode 100755 index 7142ecb5..00000000 --- a/src/classinfo/dummy.gen.hpp +++ /dev/null @@ -1,540 +0,0 @@ -/* - AUTO-GENERATED HEADER - DO NOT MODIFY - NON-CONSTEXPR HEADER FOR $mod -*/ - -#ifndef DUMMY_AUTOGEN_HPP -#define DUMMY_AUTOGEN_HPP - -namespace client_classes { - - class dummy { - public: - int CTETFParticleEffect { 0 }; - int CTETFExplosion { 0 }; - int CTETFBlood { 0 }; - int CTFTankBoss { 0 }; - int CTFBaseBoss { 0 }; - int CBossAlpha { 0 }; - int CZombie { 0 }; - int CMerasmusDancer { 0 }; - int CMerasmus { 0 }; - int CHeadlessHatman { 0 }; - int CEyeballBoss { 0 }; - int CTFWeaponSapper { 0 }; - int CTFWeaponBuilder { 0 }; - int C_TFWeaponBuilder { 0 }; - int CTFTeam { 0 }; - int CTFTauntProp { 0 }; - int CTFProjectile_Rocket { 0 }; - int CTFProjectile_Flare { 0 }; - int CTFProjectile_EnergyBall { 0 }; - int CTFProjectile_GrapplingHook { 0 }; - int CTFProjectile_HealingBolt { 0 }; - int CTFProjectile_Arrow { 0 }; - int CTFPlayerResource { 0 }; - int CTFPlayer { 0 }; - int CTFRagdoll { 0 }; - int CTEPlayerAnimEvent { 0 }; - int CTFPasstimeLogic { 0 }; - int CPasstimeBall { 0 }; - int CTFObjectiveResource { 0 }; - int CTFGlow { 0 }; - int CTEFireBullets { 0 }; - int CTFBuffBanner { 0 }; - int CTFAmmoPack { 0 }; - int CObjectTeleporter { 0 }; - int CObjectSentrygun { 0 }; - int CTFProjectile_SentryRocket { 0 }; - int CObjectSapper { 0 }; - int CObjectCartDispenser { 0 }; - int CObjectDispenser { 0 }; - int CMonsterResource { 0 }; - int CFuncRespawnRoomVisualizer { 0 }; - int CFuncRespawnRoom { 0 }; - int CFuncPasstimeGoal { 0 }; - int CFuncForceField { 0 }; - int CCaptureZone { 0 }; - int CCurrencyPack { 0 }; - int CBaseObject { 0 }; - int CTFBotHintEngineerNest { 0 }; - int CBotNPCMinion { 0 }; - int CBotNPC { 0 }; - int CRagdollPropAttached { 0 }; - int CRagdollProp { 0 }; - int NextBotCombatCharacter { 0 }; - int CWaterBullet { 0 }; - int CFuncMonitor { 0 }; - int CWorld { 0 }; - int CWaterLODControl { 0 }; - int CVGuiScreen { 0 }; - int CPropJeep { 0 }; - int CPropVehicleChoreoGeneric { 0 }; - int CTEWorldDecal { 0 }; - int CTESpriteSpray { 0 }; - int CTESprite { 0 }; - int CTESparks { 0 }; - int CTESmoke { 0 }; - int CTEShowLine { 0 }; - int CTEProjectedDecal { 0 }; - int CTEPlayerDecal { 0 }; - int CTEPhysicsProp { 0 }; - int CTEParticleSystem { 0 }; - int CTEMuzzleFlash { 0 }; - int CTELargeFunnel { 0 }; - int CTEKillPlayerAttachments { 0 }; - int CTEImpact { 0 }; - int CTEGlowSprite { 0 }; - int CTEShatterSurface { 0 }; - int CTEFootprintDecal { 0 }; - int CTEFizz { 0 }; - int CTEExplosion { 0 }; - int CTEEnergySplash { 0 }; - int CTEEffectDispatch { 0 }; - int CTEDynamicLight { 0 }; - int CTEDecal { 0 }; - int CTEClientProjectile { 0 }; - int CTEBubbleTrail { 0 }; - int CTEBubbles { 0 }; - int CTEBSPDecal { 0 }; - int CTEBreakModel { 0 }; - int CTEBloodStream { 0 }; - int CTEBloodSprite { 0 }; - int CTEBeamSpline { 0 }; - int CTEBeamRingPoint { 0 }; - int CTEBeamRing { 0 }; - int CTEBeamPoints { 0 }; - int CTEBeamLaser { 0 }; - int CTEBeamFollow { 0 }; - int CTEBeamEnts { 0 }; - int CTEBeamEntPoint { 0 }; - int CTEBaseBeam { 0 }; - int CTEArmorRicochet { 0 }; - int CTEMetalSparks { 0 }; - int CTest_ProxyToggle_Networkable { 0 }; - int CTestTraceline { 0 }; - int CTesla { 0 }; - int CTeamTrainWatcher { 0 }; - int CBaseTeamObjectiveResource { 0 }; - int CTeam { 0 }; - int CSun { 0 }; - int CSteamJet { 0 }; - int CParticlePerformanceMonitor { 0 }; - int CSpotlightEnd { 0 }; - int DustTrail { 0 }; - int CFireTrail { 0 }; - int SporeTrail { 0 }; - int SporeExplosion { 0 }; - int RocketTrail { 0 }; - int SmokeTrail { 0 }; - int CSmokeStack { 0 }; - int CSlideshowDisplay { 0 }; - int CShadowControl { 0 }; - int CSceneEntity { 0 }; - int CRopeKeyframe { 0 }; - int CRagdollManager { 0 }; - int CPropVehicleDriveable { 0 }; - int CPhysicsPropMultiplayer { 0 }; - int CPhysBoxMultiplayer { 0 }; - int CBasePropDoor { 0 }; - int CDynamicProp { 0 }; - int CPointCommentaryNode { 0 }; - int CPointCamera { 0 }; - int CPlayerResource { 0 }; - int CPlasma { 0 }; - int CPhysMagnet { 0 }; - int CPhysicsProp { 0 }; - int CPhysBox { 0 }; - int CParticleSystem { 0 }; - int ParticleSmokeGrenade { 0 }; - int CParticleFire { 0 }; - int MovieExplosion { 0 }; - int CMaterialModifyControl { 0 }; - int CLightGlow { 0 }; - int CInfoOverlayAccessor { 0 }; - int CTEGaussExplosion { 0 }; - int CFuncTrackTrain { 0 }; - int CFuncSmokeVolume { 0 }; - int CFuncRotating { 0 }; - int CFuncReflectiveGlass { 0 }; - int CFuncOccluder { 0 }; - int CFunc_LOD { 0 }; - int CTEDust { 0 }; - int CFunc_Dust { 0 }; - int CFuncConveyor { 0 }; - int CBreakableSurface { 0 }; - int CFuncAreaPortalWindow { 0 }; - int CFish { 0 }; - int CEntityFlame { 0 }; - int CFireSmoke { 0 }; - int CEnvTonemapController { 0 }; - int CEnvScreenEffect { 0 }; - int CEnvScreenOverlay { 0 }; - int CEnvProjectedTexture { 0 }; - int CEnvParticleScript { 0 }; - int CFogController { 0 }; - int CEntityParticleTrail { 0 }; - int CEntityDissolve { 0 }; - int CEnvQuadraticBeam { 0 }; - int CEmbers { 0 }; - int CEnvWind { 0 }; - int CPrecipitation { 0 }; - int CDynamicLight { 0 }; - int CColorCorrectionVolume { 0 }; - int CColorCorrection { 0 }; - int CBreakableProp { 0 }; - int CBaseTempEntity { 0 }; - int CBasePlayer { 0 }; - int CBaseFlex { 0 }; - int CBaseEntity { 0 }; - int CBaseDoor { 0 }; - int CBaseCombatCharacter { 0 }; - int CBaseAnimatingOverlay { 0 }; - int CBoneFollower { 0 }; - int CBaseAnimating { 0 }; - int CInfoLightingRelative { 0 }; - int CAI_BaseNPC { 0 }; - int CWeaponIFMSteadyCam { 0 }; - int CWeaponIFMBaseCamera { 0 }; - int CWeaponIFMBase { 0 }; - int CTFWearableLevelableItem { 0 }; - int CTFWearableDemoShield { 0 }; - int CTFWearableRobotArm { 0 }; - int CTFRobotArm { 0 }; - int CTFWrench { 0 }; - int CTFProjectile_ThrowableBreadMonster { 0 }; - int CTFProjectile_ThrowableBrick { 0 }; - int CTFProjectile_ThrowableRepel { 0 }; - int CTFProjectile_Throwable { 0 }; - int CTFThrowable { 0 }; - int CTFSyringeGun { 0 }; - int CTFKatana { 0 }; - int CTFSword { 0 }; - int CSniperDot { 0 }; - int CTFSniperRifleClassic { 0 }; - int CTFSniperRifleDecap { 0 }; - int CTFSniperRifle { 0 }; - int CTFChargedSMG { 0 }; - int CTFSMG { 0 }; - int CTFShovel { 0 }; - int CTFShotgunBuildingRescue { 0 }; - int CTFPEPBrawlerBlaster { 0 }; - int CTFSodaPopper { 0 }; - int CTFShotgun_Revenge { 0 }; - int CTFScatterGun { 0 }; - int CTFShotgun_Pyro { 0 }; - int CTFShotgun_HWG { 0 }; - int CTFShotgun_Soldier { 0 }; - int CTFShotgun { 0 }; - int CTFCrossbow { 0 }; - int CTFRocketLauncher_Mortar { 0 }; - int CTFRocketLauncher_AirStrike { 0 }; - int CTFRocketLauncher_DirectHit { 0 }; - int CTFRocketLauncher { 0 }; - int CTFRevolver { 0 }; - int CTFDRGPomson { 0 }; - int CTFRaygun { 0 }; - int CTFPistol_ScoutSecondary { 0 }; - int CTFPistol_ScoutPrimary { 0 }; - int CTFPistol_Scout { 0 }; - int CTFPistol { 0 }; - int CTFPipebombLauncher { 0 }; - int CTFWeaponPDA_Spy { 0 }; - int CTFWeaponPDA_Engineer_Destroy { 0 }; - int CTFWeaponPDA_Engineer_Build { 0 }; - int CTFWeaponPDAExpansion_Teleporter { 0 }; - int CTFWeaponPDAExpansion_Dispenser { 0 }; - int CTFWeaponPDA { 0 }; - int CPasstimeGun { 0 }; - int CTFParticleCannon { 0 }; - int CTFParachute_Secondary { 0 }; - int CTFParachute_Primary { 0 }; - int CTFParachute { 0 }; - int CTFMinigun { 0 }; - int CTFMedigunShield { 0 }; - int CWeaponMedigun { 0 }; - int CTFMechanicalArm { 0 }; - int CTFLunchBox_Drink { 0 }; - int CTFLunchBox { 0 }; - int CLaserDot { 0 }; - int CTFLaserPointer { 0 }; - int CTFKnife { 0 }; - int CTFProjectile_Cleaver { 0 }; - int CTFProjectile_JarMilk { 0 }; - int CTFProjectile_Jar { 0 }; - int CTFCleaver { 0 }; - int CTFJarMilk { 0 }; - int CTFJar { 0 }; - int CTFWeaponInvis { 0 }; - int CTFGrenadePipebombProjectile { 0 }; - int CTFCannon { 0 }; - int CTFGrenadeLauncher { 0 }; - int CTFGrapplingHook { 0 }; - int CTFFlareGun_Revenge { 0 }; - int CTFFlareGun { 0 }; - int CTFFlameRocket { 0 }; - int CTFFlameThrower { 0 }; - int CTFFists { 0 }; - int CTFFireAxe { 0 }; - int CTFCompoundBow { 0 }; - int CTFClub { 0 }; - int CTFBuffItem { 0 }; - int CTFStickBomb { 0 }; - int CTFBottle { 0 }; - int CTFBonesaw { 0 }; - int CTFBall_Ornament { 0 }; - int CTFStunBall { 0 }; - int CTFBat_Giftwrap { 0 }; - int CTFBat_Wood { 0 }; - int CTFBat_Fish { 0 }; - int CTFBat { 0 }; - int CTFBaseRocket { 0 }; - int CTFWeaponBaseMerasmusGrenade { 0 }; - int CTFWeaponBaseMelee { 0 }; - int CTFWeaponBaseGun { 0 }; - int CTFWeaponBaseGrenadeProj { 0 }; - int CTFWeaponBase { 0 }; - int CTFViewModel { 0 }; - int CRobotDispenser { 0 }; - int CTFRobotDestruction_Robot { 0 }; - int CTFReviveMarker { 0 }; - int CTFPumpkinBomb { 0 }; - int CTFProjectile_EnergyRing { 0 }; - int CTFBaseProjectile { 0 }; - int CBaseObjectUpgrade { 0 }; - int CMannVsMachineStats { 0 }; - int CTFRobotDestructionLogic { 0 }; - int CTFRobotDestruction_RobotGroup { 0 }; - int CTFRobotDestruction_RobotSpawn { 0 }; - int CTFPlayerDestructionLogic { 0 }; - int CPlayerDestructionDispenser { 0 }; - int CTFMinigameLogic { 0 }; - int CTFHalloweenMinigame_FallingPlatforms { 0 }; - int CTFHalloweenMinigame { 0 }; - int CTFMiniGame { 0 }; - int CTFWearableVM { 0 }; - int CTFWearable { 0 }; - int CTFPowerupBottle { 0 }; - int CTFItem { 0 }; - int CHalloweenSoulPack { 0 }; - int CTFGenericBomb { 0 }; - int CBonusRoundLogic { 0 }; - int CTFGameRulesProxy { 0 }; - int CTFDroppedWeapon { 0 }; - int CTFProjectile_SpellKartBats { 0 }; - int CTFProjectile_SpellKartOrb { 0 }; - int CTFHellZap { 0 }; - int CTFProjectile_SpellLightningOrb { 0 }; - int CTFProjectile_SpellTransposeTeleport { 0 }; - int CTFProjectile_SpellMeteorShower { 0 }; - int CTFProjectile_SpellSpawnBoss { 0 }; - int CTFProjectile_SpellMirv { 0 }; - int CTFProjectile_SpellPumpkin { 0 }; - int CTFProjectile_SpellSpawnHorde { 0 }; - int CTFProjectile_SpellSpawnZombie { 0 }; - int CTFProjectile_SpellBats { 0 }; - int CTFProjectile_SpellFireball { 0 }; - int CTFSpellBook { 0 }; - int CHightower_TeleportVortex { 0 }; - int CTeleportVortex { 0 }; - int CHalloweenGiftPickup { 0 }; - int CBonusDuckPickup { 0 }; - int CHalloweenPickup { 0 }; - int CCaptureFlagReturnIcon { 0 }; - int CCaptureFlag { 0 }; - int CBonusPack { 0 }; - int CHandleTest { 0 }; - int CTeamRoundTimer { 0 }; - int CTeamplayRoundBasedRulesProxy { 0 }; - int CSpriteTrail { 0 }; - int CSpriteOriented { 0 }; - int CSprite { 0 }; - int CPoseController { 0 }; - int CGameRulesProxy { 0 }; - int CInfoLadderDismount { 0 }; - int CFuncLadder { 0 }; - int CEnvDetailController { 0 }; - int CTFWearableItem { 0 }; - int CEconWearable { 0 }; - int CBaseAttributableItem { 0 }; - int CEconEntity { 0 }; - int CBeam { 0 }; - int CBaseViewModel { 0 }; - int CBaseProjectile { 0 }; - int CBaseParticleEntity { 0 }; - int CBaseGrenade { 0 }; - int CBaseCombatWeapon { 0 }; - int CVoteController { 0 }; - int CTEHL2MPFireBullets { 0 }; - int CHL2MPRagdoll { 0 }; - int CHL2MP_Player { 0 }; - int CWeaponCitizenSuitcase { 0 }; - int CWeaponCitizenPackage { 0 }; - int CWeaponAlyxGun { 0 }; - int CWeaponCubemap { 0 }; - int CWeaponGaussGun { 0 }; - int CWeaponAnnabelle { 0 }; - int CFlaregun { 0 }; - int CWeaponBugBait { 0 }; - int CWeaponBinoculars { 0 }; - int CWeaponCycler { 0 }; - int CCrossbowBolt { 0 }; - int CPropVehiclePrisonerPod { 0 }; - int CPropCrane { 0 }; - int CPropCannon { 0 }; - int CPropAirboat { 0 }; - int CFlare { 0 }; - int CTEConcussiveExplosion { 0 }; - int CNPC_Strider { 0 }; - int CScriptIntro { 0 }; - int CRotorWashEmitter { 0 }; - int CPropCombineBall { 0 }; - int CPlasmaBeamNode { 0 }; - int CNPC_RollerMine { 0 }; - int CNPC_Manhack { 0 }; - int CNPC_CombineGunship { 0 }; - int CNPC_AntlionGuard { 0 }; - int CInfoTeleporterCountdown { 0 }; - int CMortarShell { 0 }; - int CEnvStarfield { 0 }; - int CEnvHeadcrabCanister { 0 }; - int CAlyxEmpEffect { 0 }; - int CCorpse { 0 }; - int CCitadelEnergyCore { 0 }; - int CHL2_Player { 0 }; - int CBaseHLBludgeonWeapon { 0 }; - int CHLSelectFireMachineGun { 0 }; - int CHLMachineGun { 0 }; - int CBaseHelicopter { 0 }; - int CNPC_Barney { 0 }; - int CNPC_Barnacle { 0 }; - int AR2Explosion { 0 }; - int CTEAntlionDust { 0 }; - int CVortigauntEffectDispel { 0 }; - int CVortigauntChargeToken { 0 }; - int CNPC_Vortigaunt { 0 }; - int CPredictedViewModel { 0 }; - int CWeaponStunStick { 0 }; - int CWeaponSMG1 { 0 }; - int CWeapon_SLAM { 0 }; - int CWeaponShotgun { 0 }; - int CWeaponRPG { 0 }; - int CWeaponPistol { 0 }; - int CWeaponPhysCannon { 0 }; - int CHL2MPMachineGun { 0 }; - int CBaseHL2MPCombatWeapon { 0 }; - int CBaseHL2MPBludgeonWeapon { 0 }; - int CWeaponHL2MPBase { 0 }; - int CWeaponFrag { 0 }; - int CWeaponCrowbar { 0 }; - int CWeaponCrossbow { 0 }; - int CWeaponAR2 { 0 }; - int CWeapon357 { 0 }; - int CHL2MPGameRulesProxy { 0 }; - int CHalfLife2Proxy { 0 }; - int CBaseHLCombatWeapon { 0 }; - int CTFVehicle { 0 }; - int CTFBaseDMPowerup { 0 }; - int CWeaponSpawner { 0 }; - int CTFUmbrella { 0 }; - int CTFTranq { 0 }; - int CTFSMG_Primary { 0 }; - int CTFRevolver_Secondary { 0 }; - int CTFNailgun { 0 }; - int CTFHunterRifle { 0 }; - int CTFHeavyArtillery { 0 }; - int CTFHammerfists { 0 }; - int CTFCrowbar { 0 }; - int CTFChainsaw { 0 }; - int CTEPlantBomb { 0 }; - int CTERadioIcon { 0 }; - int CPlantedC4 { 0 }; - int CCSTeam { 0 }; - int CCSPlayerResource { 0 }; - int CCSPlayer { 0 }; - int CCSRagdoll { 0 }; - int CHostage { 0 }; - int CWeaponXM1014 { 0 }; - int CWeaponUSP { 0 }; - int CWeaponUMP45 { 0 }; - int CWeaponTMP { 0 }; - int CSmokeGrenade { 0 }; - int CWeaponSG552 { 0 }; - int CWeaponSG550 { 0 }; - int CWeaponScout { 0 }; - int CWeaponP90 { 0 }; - int CWeaponP228 { 0 }; - int CWeaponMP5Navy { 0 }; - int CWeaponMAC10 { 0 }; - int CWeaponM4A1 { 0 }; - int CWeaponM3 { 0 }; - int CWeaponM249 { 0 }; - int CKnife { 0 }; - int CHEGrenade { 0 }; - int CWeaponGlock { 0 }; - int CWeaponGalil { 0 }; - int CWeaponG3SG1 { 0 }; - int CFlashbang { 0 }; - int CWeaponFiveSeven { 0 }; - int CWeaponFamas { 0 }; - int CWeaponElite { 0 }; - int CDEagle { 0 }; - int CWeaponCSBaseGun { 0 }; - int CWeaponCSBase { 0 }; - int CC4 { 0 }; - int CBaseCSGrenade { 0 }; - int CWeaponAWP { 0 }; - int CWeaponAug { 0 }; - int CAK47 { 0 }; - int CFootstepControl { 0 }; - int CCSGameRulesProxy { 0 }; - int CBaseCSGrenadeProjectile { 0 }; - int CSDKTeam_Deathmatch { 0 }; - int CSDKTeam_Red { 0 }; - int CSDKTeam_Blue { 0 }; - int CSDKTeam_Unassigned { 0 }; - int CSDKTeam { 0 }; - int CSDKPlayerResource { 0 }; - int CSDKRagdoll { 0 }; - int CSDKPlayer { 0 }; - int CSparkler { 0 }; - int CRatRaceWaypoint { 0 }; - int CBriefcaseCaptureZone { 0 }; - int CBriefcase { 0 }; - int CWeaponSDKBase { 0 }; - int CWeaponMP5K { 0 }; - int CWeaponMossberg { 0 }; - int CWeaponM1911 { 0 }; - int CWeaponM16 { 0 }; - int CWeaponGrenade { 0 }; - int CWeaponFAL { 0 }; - int CWeaponBrawl { 0 }; - int CWeaponBeretta { 0 }; - int CBaseSDKGrenade { 0 }; - int CAkimboM1911 { 0 }; - int CAkimboBeretta { 0 }; - int CAkimboBase { 0 }; - int CWeaponSDKMelee { 0 }; - int CSDKGameRulesProxy { 0 }; - int CBaseGrenadeProjectile { 0 }; - int CDAViewModel { 0 }; - int CTFWearableRazorback { 0 }; - int CTFWearableCampaignItem { 0 }; - int CTFSlap { 0 }; - int CTFRocketPack { 0 }; - int CTFGasManager { 0 }; - int CTFProjectile_JarGas { 0 }; - int CTFJarGas { 0 }; - int CTFWeaponFlameBall { 0 }; - int CTFBreakableSign { 0 }; - int CTFBreakableMelee { 0 }; - int CTFProjectile_BallOfFire { 0 }; - int CTFPointManager { 0 }; - int CTFFlameManager { 0 }; - - }; - - extern dummy dummy_list; -} - -#endif /* DUMMY_AUTOGEN_HPP */ \ No newline at end of file diff --git a/src/classinfo/dynamic.gen.hpp b/src/classinfo/dynamic.gen.hpp deleted file mode 100755 index 23b4bf73..00000000 --- a/src/classinfo/dynamic.gen.hpp +++ /dev/null @@ -1,542 +0,0 @@ -/* - AUTO-GENERATED HEADER - DO NOT MODIFY - HEADER FOR UNIVERSAL BUILD -*/ - -#ifndef DYNAMIC_AUTOGEN_HPP -#define DYNAMIC_AUTOGEN_HPP - -namespace client_classes { - - class dynamic { - public: - dynamic(); - void Populate(); - int CTETFParticleEffect { 0 }; - int CTETFExplosion { 0 }; - int CTETFBlood { 0 }; - int CTFTankBoss { 0 }; - int CTFBaseBoss { 0 }; - int CBossAlpha { 0 }; - int CZombie { 0 }; - int CMerasmusDancer { 0 }; - int CMerasmus { 0 }; - int CHeadlessHatman { 0 }; - int CEyeballBoss { 0 }; - int CTFWeaponSapper { 0 }; - int CTFWeaponBuilder { 0 }; - int C_TFWeaponBuilder { 0 }; - int CTFTeam { 0 }; - int CTFTauntProp { 0 }; - int CTFProjectile_Rocket { 0 }; - int CTFProjectile_Flare { 0 }; - int CTFProjectile_EnergyBall { 0 }; - int CTFProjectile_GrapplingHook { 0 }; - int CTFProjectile_HealingBolt { 0 }; - int CTFProjectile_Arrow { 0 }; - int CTFPlayerResource { 0 }; - int CTFPlayer { 0 }; - int CTFRagdoll { 0 }; - int CTEPlayerAnimEvent { 0 }; - int CTFPasstimeLogic { 0 }; - int CPasstimeBall { 0 }; - int CTFObjectiveResource { 0 }; - int CTFGlow { 0 }; - int CTEFireBullets { 0 }; - int CTFBuffBanner { 0 }; - int CTFAmmoPack { 0 }; - int CObjectTeleporter { 0 }; - int CObjectSentrygun { 0 }; - int CTFProjectile_SentryRocket { 0 }; - int CObjectSapper { 0 }; - int CObjectCartDispenser { 0 }; - int CObjectDispenser { 0 }; - int CMonsterResource { 0 }; - int CFuncRespawnRoomVisualizer { 0 }; - int CFuncRespawnRoom { 0 }; - int CFuncPasstimeGoal { 0 }; - int CFuncForceField { 0 }; - int CCaptureZone { 0 }; - int CCurrencyPack { 0 }; - int CBaseObject { 0 }; - int CTFBotHintEngineerNest { 0 }; - int CBotNPCMinion { 0 }; - int CBotNPC { 0 }; - int CRagdollPropAttached { 0 }; - int CRagdollProp { 0 }; - int NextBotCombatCharacter { 0 }; - int CWaterBullet { 0 }; - int CFuncMonitor { 0 }; - int CWorld { 0 }; - int CWaterLODControl { 0 }; - int CVGuiScreen { 0 }; - int CPropJeep { 0 }; - int CPropVehicleChoreoGeneric { 0 }; - int CTEWorldDecal { 0 }; - int CTESpriteSpray { 0 }; - int CTESprite { 0 }; - int CTESparks { 0 }; - int CTESmoke { 0 }; - int CTEShowLine { 0 }; - int CTEProjectedDecal { 0 }; - int CTEPlayerDecal { 0 }; - int CTEPhysicsProp { 0 }; - int CTEParticleSystem { 0 }; - int CTEMuzzleFlash { 0 }; - int CTELargeFunnel { 0 }; - int CTEKillPlayerAttachments { 0 }; - int CTEImpact { 0 }; - int CTEGlowSprite { 0 }; - int CTEShatterSurface { 0 }; - int CTEFootprintDecal { 0 }; - int CTEFizz { 0 }; - int CTEExplosion { 0 }; - int CTEEnergySplash { 0 }; - int CTEEffectDispatch { 0 }; - int CTEDynamicLight { 0 }; - int CTEDecal { 0 }; - int CTEClientProjectile { 0 }; - int CTEBubbleTrail { 0 }; - int CTEBubbles { 0 }; - int CTEBSPDecal { 0 }; - int CTEBreakModel { 0 }; - int CTEBloodStream { 0 }; - int CTEBloodSprite { 0 }; - int CTEBeamSpline { 0 }; - int CTEBeamRingPoint { 0 }; - int CTEBeamRing { 0 }; - int CTEBeamPoints { 0 }; - int CTEBeamLaser { 0 }; - int CTEBeamFollow { 0 }; - int CTEBeamEnts { 0 }; - int CTEBeamEntPoint { 0 }; - int CTEBaseBeam { 0 }; - int CTEArmorRicochet { 0 }; - int CTEMetalSparks { 0 }; - int CTest_ProxyToggle_Networkable { 0 }; - int CTestTraceline { 0 }; - int CTesla { 0 }; - int CTeamTrainWatcher { 0 }; - int CBaseTeamObjectiveResource { 0 }; - int CTeam { 0 }; - int CSun { 0 }; - int CSteamJet { 0 }; - int CParticlePerformanceMonitor { 0 }; - int CSpotlightEnd { 0 }; - int DustTrail { 0 }; - int CFireTrail { 0 }; - int SporeTrail { 0 }; - int SporeExplosion { 0 }; - int RocketTrail { 0 }; - int SmokeTrail { 0 }; - int CSmokeStack { 0 }; - int CSlideshowDisplay { 0 }; - int CShadowControl { 0 }; - int CSceneEntity { 0 }; - int CRopeKeyframe { 0 }; - int CRagdollManager { 0 }; - int CPropVehicleDriveable { 0 }; - int CPhysicsPropMultiplayer { 0 }; - int CPhysBoxMultiplayer { 0 }; - int CBasePropDoor { 0 }; - int CDynamicProp { 0 }; - int CPointCommentaryNode { 0 }; - int CPointCamera { 0 }; - int CPlayerResource { 0 }; - int CPlasma { 0 }; - int CPhysMagnet { 0 }; - int CPhysicsProp { 0 }; - int CPhysBox { 0 }; - int CParticleSystem { 0 }; - int ParticleSmokeGrenade { 0 }; - int CParticleFire { 0 }; - int MovieExplosion { 0 }; - int CMaterialModifyControl { 0 }; - int CLightGlow { 0 }; - int CInfoOverlayAccessor { 0 }; - int CTEGaussExplosion { 0 }; - int CFuncTrackTrain { 0 }; - int CFuncSmokeVolume { 0 }; - int CFuncRotating { 0 }; - int CFuncReflectiveGlass { 0 }; - int CFuncOccluder { 0 }; - int CFunc_LOD { 0 }; - int CTEDust { 0 }; - int CFunc_Dust { 0 }; - int CFuncConveyor { 0 }; - int CBreakableSurface { 0 }; - int CFuncAreaPortalWindow { 0 }; - int CFish { 0 }; - int CEntityFlame { 0 }; - int CFireSmoke { 0 }; - int CEnvTonemapController { 0 }; - int CEnvScreenEffect { 0 }; - int CEnvScreenOverlay { 0 }; - int CEnvProjectedTexture { 0 }; - int CEnvParticleScript { 0 }; - int CFogController { 0 }; - int CEntityParticleTrail { 0 }; - int CEntityDissolve { 0 }; - int CEnvQuadraticBeam { 0 }; - int CEmbers { 0 }; - int CEnvWind { 0 }; - int CPrecipitation { 0 }; - int CDynamicLight { 0 }; - int CColorCorrectionVolume { 0 }; - int CColorCorrection { 0 }; - int CBreakableProp { 0 }; - int CBaseTempEntity { 0 }; - int CBasePlayer { 0 }; - int CBaseFlex { 0 }; - int CBaseEntity { 0 }; - int CBaseDoor { 0 }; - int CBaseCombatCharacter { 0 }; - int CBaseAnimatingOverlay { 0 }; - int CBoneFollower { 0 }; - int CBaseAnimating { 0 }; - int CInfoLightingRelative { 0 }; - int CAI_BaseNPC { 0 }; - int CWeaponIFMSteadyCam { 0 }; - int CWeaponIFMBaseCamera { 0 }; - int CWeaponIFMBase { 0 }; - int CTFWearableLevelableItem { 0 }; - int CTFWearableDemoShield { 0 }; - int CTFWearableRobotArm { 0 }; - int CTFRobotArm { 0 }; - int CTFWrench { 0 }; - int CTFProjectile_ThrowableBreadMonster { 0 }; - int CTFProjectile_ThrowableBrick { 0 }; - int CTFProjectile_ThrowableRepel { 0 }; - int CTFProjectile_Throwable { 0 }; - int CTFThrowable { 0 }; - int CTFSyringeGun { 0 }; - int CTFKatana { 0 }; - int CTFSword { 0 }; - int CSniperDot { 0 }; - int CTFSniperRifleClassic { 0 }; - int CTFSniperRifleDecap { 0 }; - int CTFSniperRifle { 0 }; - int CTFChargedSMG { 0 }; - int CTFSMG { 0 }; - int CTFShovel { 0 }; - int CTFShotgunBuildingRescue { 0 }; - int CTFPEPBrawlerBlaster { 0 }; - int CTFSodaPopper { 0 }; - int CTFShotgun_Revenge { 0 }; - int CTFScatterGun { 0 }; - int CTFShotgun_Pyro { 0 }; - int CTFShotgun_HWG { 0 }; - int CTFShotgun_Soldier { 0 }; - int CTFShotgun { 0 }; - int CTFCrossbow { 0 }; - int CTFRocketLauncher_Mortar { 0 }; - int CTFRocketLauncher_AirStrike { 0 }; - int CTFRocketLauncher_DirectHit { 0 }; - int CTFRocketLauncher { 0 }; - int CTFRevolver { 0 }; - int CTFDRGPomson { 0 }; - int CTFRaygun { 0 }; - int CTFPistol_ScoutSecondary { 0 }; - int CTFPistol_ScoutPrimary { 0 }; - int CTFPistol_Scout { 0 }; - int CTFPistol { 0 }; - int CTFPipebombLauncher { 0 }; - int CTFWeaponPDA_Spy { 0 }; - int CTFWeaponPDA_Engineer_Destroy { 0 }; - int CTFWeaponPDA_Engineer_Build { 0 }; - int CTFWeaponPDAExpansion_Teleporter { 0 }; - int CTFWeaponPDAExpansion_Dispenser { 0 }; - int CTFWeaponPDA { 0 }; - int CPasstimeGun { 0 }; - int CTFParticleCannon { 0 }; - int CTFParachute_Secondary { 0 }; - int CTFParachute_Primary { 0 }; - int CTFParachute { 0 }; - int CTFMinigun { 0 }; - int CTFMedigunShield { 0 }; - int CWeaponMedigun { 0 }; - int CTFMechanicalArm { 0 }; - int CTFLunchBox_Drink { 0 }; - int CTFLunchBox { 0 }; - int CLaserDot { 0 }; - int CTFLaserPointer { 0 }; - int CTFKnife { 0 }; - int CTFProjectile_Cleaver { 0 }; - int CTFProjectile_JarMilk { 0 }; - int CTFProjectile_Jar { 0 }; - int CTFCleaver { 0 }; - int CTFJarMilk { 0 }; - int CTFJar { 0 }; - int CTFWeaponInvis { 0 }; - int CTFGrenadePipebombProjectile { 0 }; - int CTFCannon { 0 }; - int CTFGrenadeLauncher { 0 }; - int CTFGrapplingHook { 0 }; - int CTFFlareGun_Revenge { 0 }; - int CTFFlareGun { 0 }; - int CTFFlameRocket { 0 }; - int CTFFlameThrower { 0 }; - int CTFFists { 0 }; - int CTFFireAxe { 0 }; - int CTFCompoundBow { 0 }; - int CTFClub { 0 }; - int CTFBuffItem { 0 }; - int CTFStickBomb { 0 }; - int CTFBottle { 0 }; - int CTFBonesaw { 0 }; - int CTFBall_Ornament { 0 }; - int CTFStunBall { 0 }; - int CTFBat_Giftwrap { 0 }; - int CTFBat_Wood { 0 }; - int CTFBat_Fish { 0 }; - int CTFBat { 0 }; - int CTFBaseRocket { 0 }; - int CTFWeaponBaseMerasmusGrenade { 0 }; - int CTFWeaponBaseMelee { 0 }; - int CTFWeaponBaseGun { 0 }; - int CTFWeaponBaseGrenadeProj { 0 }; - int CTFWeaponBase { 0 }; - int CTFViewModel { 0 }; - int CRobotDispenser { 0 }; - int CTFRobotDestruction_Robot { 0 }; - int CTFReviveMarker { 0 }; - int CTFPumpkinBomb { 0 }; - int CTFProjectile_EnergyRing { 0 }; - int CTFBaseProjectile { 0 }; - int CBaseObjectUpgrade { 0 }; - int CMannVsMachineStats { 0 }; - int CTFRobotDestructionLogic { 0 }; - int CTFRobotDestruction_RobotGroup { 0 }; - int CTFRobotDestruction_RobotSpawn { 0 }; - int CTFPlayerDestructionLogic { 0 }; - int CPlayerDestructionDispenser { 0 }; - int CTFMinigameLogic { 0 }; - int CTFHalloweenMinigame_FallingPlatforms { 0 }; - int CTFHalloweenMinigame { 0 }; - int CTFMiniGame { 0 }; - int CTFWearableVM { 0 }; - int CTFWearable { 0 }; - int CTFPowerupBottle { 0 }; - int CTFItem { 0 }; - int CHalloweenSoulPack { 0 }; - int CTFGenericBomb { 0 }; - int CBonusRoundLogic { 0 }; - int CTFGameRulesProxy { 0 }; - int CTFDroppedWeapon { 0 }; - int CTFProjectile_SpellKartBats { 0 }; - int CTFProjectile_SpellKartOrb { 0 }; - int CTFHellZap { 0 }; - int CTFProjectile_SpellLightningOrb { 0 }; - int CTFProjectile_SpellTransposeTeleport { 0 }; - int CTFProjectile_SpellMeteorShower { 0 }; - int CTFProjectile_SpellSpawnBoss { 0 }; - int CTFProjectile_SpellMirv { 0 }; - int CTFProjectile_SpellPumpkin { 0 }; - int CTFProjectile_SpellSpawnHorde { 0 }; - int CTFProjectile_SpellSpawnZombie { 0 }; - int CTFProjectile_SpellBats { 0 }; - int CTFProjectile_SpellFireball { 0 }; - int CTFSpellBook { 0 }; - int CHightower_TeleportVortex { 0 }; - int CTeleportVortex { 0 }; - int CHalloweenGiftPickup { 0 }; - int CBonusDuckPickup { 0 }; - int CHalloweenPickup { 0 }; - int CCaptureFlagReturnIcon { 0 }; - int CCaptureFlag { 0 }; - int CBonusPack { 0 }; - int CHandleTest { 0 }; - int CTeamRoundTimer { 0 }; - int CTeamplayRoundBasedRulesProxy { 0 }; - int CSpriteTrail { 0 }; - int CSpriteOriented { 0 }; - int CSprite { 0 }; - int CPoseController { 0 }; - int CGameRulesProxy { 0 }; - int CInfoLadderDismount { 0 }; - int CFuncLadder { 0 }; - int CEnvDetailController { 0 }; - int CTFWearableItem { 0 }; - int CEconWearable { 0 }; - int CBaseAttributableItem { 0 }; - int CEconEntity { 0 }; - int CBeam { 0 }; - int CBaseViewModel { 0 }; - int CBaseProjectile { 0 }; - int CBaseParticleEntity { 0 }; - int CBaseGrenade { 0 }; - int CBaseCombatWeapon { 0 }; - int CVoteController { 0 }; - int CTEHL2MPFireBullets { 0 }; - int CHL2MPRagdoll { 0 }; - int CHL2MP_Player { 0 }; - int CWeaponCitizenSuitcase { 0 }; - int CWeaponCitizenPackage { 0 }; - int CWeaponAlyxGun { 0 }; - int CWeaponCubemap { 0 }; - int CWeaponGaussGun { 0 }; - int CWeaponAnnabelle { 0 }; - int CFlaregun { 0 }; - int CWeaponBugBait { 0 }; - int CWeaponBinoculars { 0 }; - int CWeaponCycler { 0 }; - int CCrossbowBolt { 0 }; - int CPropVehiclePrisonerPod { 0 }; - int CPropCrane { 0 }; - int CPropCannon { 0 }; - int CPropAirboat { 0 }; - int CFlare { 0 }; - int CTEConcussiveExplosion { 0 }; - int CNPC_Strider { 0 }; - int CScriptIntro { 0 }; - int CRotorWashEmitter { 0 }; - int CPropCombineBall { 0 }; - int CPlasmaBeamNode { 0 }; - int CNPC_RollerMine { 0 }; - int CNPC_Manhack { 0 }; - int CNPC_CombineGunship { 0 }; - int CNPC_AntlionGuard { 0 }; - int CInfoTeleporterCountdown { 0 }; - int CMortarShell { 0 }; - int CEnvStarfield { 0 }; - int CEnvHeadcrabCanister { 0 }; - int CAlyxEmpEffect { 0 }; - int CCorpse { 0 }; - int CCitadelEnergyCore { 0 }; - int CHL2_Player { 0 }; - int CBaseHLBludgeonWeapon { 0 }; - int CHLSelectFireMachineGun { 0 }; - int CHLMachineGun { 0 }; - int CBaseHelicopter { 0 }; - int CNPC_Barney { 0 }; - int CNPC_Barnacle { 0 }; - int AR2Explosion { 0 }; - int CTEAntlionDust { 0 }; - int CVortigauntEffectDispel { 0 }; - int CVortigauntChargeToken { 0 }; - int CNPC_Vortigaunt { 0 }; - int CPredictedViewModel { 0 }; - int CWeaponStunStick { 0 }; - int CWeaponSMG1 { 0 }; - int CWeapon_SLAM { 0 }; - int CWeaponShotgun { 0 }; - int CWeaponRPG { 0 }; - int CWeaponPistol { 0 }; - int CWeaponPhysCannon { 0 }; - int CHL2MPMachineGun { 0 }; - int CBaseHL2MPCombatWeapon { 0 }; - int CBaseHL2MPBludgeonWeapon { 0 }; - int CWeaponHL2MPBase { 0 }; - int CWeaponFrag { 0 }; - int CWeaponCrowbar { 0 }; - int CWeaponCrossbow { 0 }; - int CWeaponAR2 { 0 }; - int CWeapon357 { 0 }; - int CHL2MPGameRulesProxy { 0 }; - int CHalfLife2Proxy { 0 }; - int CBaseHLCombatWeapon { 0 }; - int CTFVehicle { 0 }; - int CTFBaseDMPowerup { 0 }; - int CWeaponSpawner { 0 }; - int CTFUmbrella { 0 }; - int CTFTranq { 0 }; - int CTFSMG_Primary { 0 }; - int CTFRevolver_Secondary { 0 }; - int CTFNailgun { 0 }; - int CTFHunterRifle { 0 }; - int CTFHeavyArtillery { 0 }; - int CTFHammerfists { 0 }; - int CTFCrowbar { 0 }; - int CTFChainsaw { 0 }; - int CTEPlantBomb { 0 }; - int CTERadioIcon { 0 }; - int CPlantedC4 { 0 }; - int CCSTeam { 0 }; - int CCSPlayerResource { 0 }; - int CCSPlayer { 0 }; - int CCSRagdoll { 0 }; - int CHostage { 0 }; - int CWeaponXM1014 { 0 }; - int CWeaponUSP { 0 }; - int CWeaponUMP45 { 0 }; - int CWeaponTMP { 0 }; - int CSmokeGrenade { 0 }; - int CWeaponSG552 { 0 }; - int CWeaponSG550 { 0 }; - int CWeaponScout { 0 }; - int CWeaponP90 { 0 }; - int CWeaponP228 { 0 }; - int CWeaponMP5Navy { 0 }; - int CWeaponMAC10 { 0 }; - int CWeaponM4A1 { 0 }; - int CWeaponM3 { 0 }; - int CWeaponM249 { 0 }; - int CKnife { 0 }; - int CHEGrenade { 0 }; - int CWeaponGlock { 0 }; - int CWeaponGalil { 0 }; - int CWeaponG3SG1 { 0 }; - int CFlashbang { 0 }; - int CWeaponFiveSeven { 0 }; - int CWeaponFamas { 0 }; - int CWeaponElite { 0 }; - int CDEagle { 0 }; - int CWeaponCSBaseGun { 0 }; - int CWeaponCSBase { 0 }; - int CC4 { 0 }; - int CBaseCSGrenade { 0 }; - int CWeaponAWP { 0 }; - int CWeaponAug { 0 }; - int CAK47 { 0 }; - int CFootstepControl { 0 }; - int CCSGameRulesProxy { 0 }; - int CBaseCSGrenadeProjectile { 0 }; - int CSDKTeam_Deathmatch { 0 }; - int CSDKTeam_Red { 0 }; - int CSDKTeam_Blue { 0 }; - int CSDKTeam_Unassigned { 0 }; - int CSDKTeam { 0 }; - int CSDKPlayerResource { 0 }; - int CSDKRagdoll { 0 }; - int CSDKPlayer { 0 }; - int CSparkler { 0 }; - int CRatRaceWaypoint { 0 }; - int CBriefcaseCaptureZone { 0 }; - int CBriefcase { 0 }; - int CWeaponSDKBase { 0 }; - int CWeaponMP5K { 0 }; - int CWeaponMossberg { 0 }; - int CWeaponM1911 { 0 }; - int CWeaponM16 { 0 }; - int CWeaponGrenade { 0 }; - int CWeaponFAL { 0 }; - int CWeaponBrawl { 0 }; - int CWeaponBeretta { 0 }; - int CBaseSDKGrenade { 0 }; - int CAkimboM1911 { 0 }; - int CAkimboBeretta { 0 }; - int CAkimboBase { 0 }; - int CWeaponSDKMelee { 0 }; - int CSDKGameRulesProxy { 0 }; - int CBaseGrenadeProjectile { 0 }; - int CDAViewModel { 0 }; - int CTFWearableRazorback { 0 }; - int CTFWearableCampaignItem { 0 }; - int CTFSlap { 0 }; - int CTFRocketPack { 0 }; - int CTFGasManager { 0 }; - int CTFProjectile_JarGas { 0 }; - int CTFJarGas { 0 }; - int CTFWeaponFlameBall { 0 }; - int CTFBreakableSign { 0 }; - int CTFBreakableMelee { 0 }; - int CTFProjectile_BallOfFire { 0 }; - int CTFPointManager { 0 }; - int CTFFlameManager { 0 }; - - }; - - extern dynamic dynamic_list; -} - -#endif /* DYNAMIC_AUTOGEN_HPP */ \ No newline at end of file diff --git a/src/hacks/AutoReflect.cpp b/src/hacks/AutoReflect.cpp index 3ccb0c68..16315005 100755 --- a/src/hacks/AutoReflect.cpp +++ b/src/hacks/AutoReflect.cpp @@ -202,6 +202,7 @@ bool IsEntStickyBomb(CachedEntity *ent) } void Draw() { +#if ENABLE_VISUALS == 1 // Dont draw to screen when reflect is disabled if (!enabled) return; @@ -236,6 +237,7 @@ void Draw() } } } +#endif } } } diff --git a/src/menu/CBaseButton.cpp b/src/menu/CBaseButton.cpp deleted file mode 100755 index e48426b0..00000000 --- a/src/menu/CBaseButton.cpp +++ /dev/null @@ -1,49 +0,0 @@ -/* - * CBaseButton.cpp - * - * Created on: Jan 26, 2017 - * Author: nullifiedcat - */ - -#include "menu/CBaseButton.h" - -#include "common.hpp" -#include "sdk.hpp" - -CBaseButton::CBaseButton(std::string name, IWidget *parent, std::string text, - ButtonCallbackFn_t callback) - : CTextLabel(name, parent, text) -{ - SetPadding(BUTTON_PADDING_W, BUTTON_PADDING_H); - SetText(text); - if (callback) - SetCallback(callback); -} - -void CBaseButton::SetCallback(ButtonCallbackFn_t callback) -{ - m_pCallback = callback; -} - -void CBaseButton::Draw(int x, int y) -{ - int textcolor = NCGUIColor(); - auto size = GetSize(); - if (IsPressed()) - { - draw::DrawRect(x, y, size.first, size.second, NCGUIColor()); - textcolor = colorsint::white; - } - draw::OutlineRect(x, y, size.first, size.second, NCGUIColor()); - draw::String(fonts::MENU, x + Props()->GetInt("padding_x"), - y + Props()->GetInt("padding_y"), textcolor, 1, GetText()); -} - -void CBaseButton::OnMousePress() -{ - CBaseWidget::OnMousePress(); - if (m_pCallback) - { - m_pCallback(this); - } -} diff --git a/src/menu/CBaseWidget.cpp b/src/menu/CBaseWidget.cpp index d602eefd..84868e7d 100755 --- a/src/menu/CBaseWidget.cpp +++ b/src/menu/CBaseWidget.cpp @@ -51,10 +51,6 @@ CBaseWidget::CBaseWidget(std::string name, IWidget *parent) void CBaseWidget::Update() { - if (IsHovered() && IsVisible() && Props()->FindKey("tooltip")) - { - g_pGUI->ShowTooltip(Props()->GetString("tooltip")); - } } std::pair CBaseWidget::AbsolutePosition() diff --git a/src/menu/CCTitleBar.cpp b/src/menu/CCTitleBar.cpp deleted file mode 100755 index 6ea7d30d..00000000 --- a/src/menu/CCTitleBar.cpp +++ /dev/null @@ -1,59 +0,0 @@ -/* - * TitleBar.cpp - * - * Created on: Jan 25, 2017 - * Author: nullifiedcat - */ - -#include "menu/CCTitleBar.h" - -#include "menu/GUI.h" - -#include "common.hpp" -#include "sdk.hpp" - -CTitleBar::CTitleBar(IWidget *parent, std::string title) - : CBaseWidget("titlebar", parent) -{ - m_strTitle = title; - m_iDraggingStage = 0; - m_nLastX = 0; - m_nLastY = 0; - SetPositionMode(ABSOLUTE); -} - -void CTitleBar::Draw(int x, int y) -{ - auto size = GetSize(); - draw::DrawRect(x, y, size.first, size.second, NCGUIColor()); - int l, h; - draw::GetStringLength(fonts::MENU, (char *) m_strTitle.c_str(), l, h); - draw::String(fonts::MENU, x + (size.first - l) / 2, y + TITLEBAR_PADDING_H, - colorsint::white, 1, m_strTitle.c_str()); -} - -void CTitleBar::Update() -{ - auto psize = GetParent()->GetSize(); - int l, h; - draw::GetStringLength(fonts::MENU, (char *) m_strTitle.c_str(), l, h); - SetSize(psize.first, 2 * TITLEBAR_PADDING_H + h); - if (!IsPressed()) - { - m_iDraggingStage = 0; - return; - } - if (m_iDraggingStage == 0) - { - m_iDraggingStage = 1; - } - else - { - int dx = g_pGUI->m_iMouseX - m_nLastX; - int dy = g_pGUI->m_iMouseY - m_nLastY; - auto offset = GetParent()->GetOffset(); - GetParent()->SetOffset(offset.first + dx, offset.second + dy); - } - m_nLastX = g_pGUI->m_iMouseX; - m_nLastY = g_pGUI->m_iMouseY; -} diff --git a/src/menu/CCVarContainer.cpp b/src/menu/CCVarContainer.cpp deleted file mode 100755 index ff4a63d5..00000000 --- a/src/menu/CCVarContainer.cpp +++ /dev/null @@ -1,225 +0,0 @@ -/* - * CCVarContainer.cpp - * - * Created on: Feb 1, 2017 - * Author: nullifiedcat - */ - -#include "menu/CCVarContainer.h" - -#include "menu/CSlider.h" -#include "menu/CTextInput.h" -#include "menu/CTextLabel.h" -#include "menu/CKeyInput.h" -#include "menu/CCheckbox.h" -#include "menu/CDropdown.h" - -#include "common.hpp" -#include "sdk.hpp" - -CCVarContainer::CCVarContainer(IWidget *parent, CatVar *var) - : CBaseContainer("cvc_" + var->name, parent) -{ - m_pVar = var; - m_pInput = 0; - m_pLabel = new CTextLabel(GetName() + "_desc", this, var->desc_short); - m_pControl = 0; - if (var->desc_short.length()) - { - Props()->SetString("tooltip", var->desc_long.c_str()); - } - bool needsinput = false; - switch (var->type) - { - case CatVar_t::CV_SWITCH: - { // Label, Checkbox - CCheckbox *cb = - new CCheckbox(GetName() + "_control", this, var->GetBool()); - cb->SetCallback( - [this](CCheckbox *, bool value) { m_pVar->SetValue(value); }); - m_pControl = cb; - } - break; - case CatVar_t::CV_ENUM: - { // Most difficult thing, dropdown menu - if (!var->enum_type) - { - logging::Info("VAR %s HAS NO ENUM TYPE!! ERROR!!", - var->name.c_str()); - break; - } - CDropdown *dd = new CDropdown(GetName() + "_control", this); - for (int i = var->enum_type->min_value; i <= var->enum_type->max_value; - i++) - { - dd->AddValue(var->enum_type->Name(i)); - } - dd->SetCallback( - [this](CDropdown *, int value) { m_pVar->SetValue(value); }); - dd->Props()->SetInt("offset", var->enum_type->min_value); - m_pControl = dd; - } - break; - case CatVar_t::CV_FLOAT: - { - if (var->restricted) - { - CSlider *sl = new CSlider(GetName() + "_control", this); - sl->Setup(var->min, var->max); - sl->SetValue(var->GetFloat()); - m_pControl = sl; - sl->SetCallback([this](CSlider *, float oldv, float newv) { - m_pVar->SetValue(newv); - }); - } - needsinput = true; - } - break; - case CatVar_t::CV_INT: - { - if (var->restricted) - { - CSlider *sl = new CSlider(GetName() + "_control", this); - sl->Setup(var->min, var->max); - sl->SetStep(1.0f); - sl->SetValue(var->GetInt()); - sl->SetCallback([this](CSlider *, float oldv, float newv) { - m_pVar->SetValue(newv); - }); - m_pControl = sl; - } - needsinput = true; - } - break; - case CatVar_t::CV_KEY: - { - CKeyInput *ki = new CKeyInput(GetName() + "_control", this); - ki->SetCallback( - [this](CKeyInput *, ButtonCode_t key) { m_pVar->SetValue(key); }); - ki->SetSize(60, 18); - m_pControl = ki; - } - break; - case CatVar_t::CV_STRING: - { - needsinput = true; - } - break; - } - - if (needsinput) - { - m_pInput = new CTextInput(GetName() + "_input", this); - m_pInput->SetValue(std::string(var->GetString())); - m_pInput->SetCallback( - [this](CTextInput *, std::string old, std::string newv) { - if (m_pVar->type == CV_STRING) - { - m_pVar->SetValue(newv); - } - else - { - try - { - char *s = strfmt("%.2f", std::stof(newv)); - std::string str(s); - delete[] s; - m_pVar->SetValue(str); - } - catch (...) - { - } - } - }); - } - - if (m_pLabel) - { - AddChild(m_pLabel); - } - if (m_pControl) - { - AddChild(m_pControl); - } - if (m_pInput) - { - m_pInput->SetMaxWidth(10); - AddChild(m_pInput); - } -} - -void CCVarContainer::MoveChildren() -{ - int sy = 0; - for (auto child : m_children) - { - auto s = child->GetSize(); - if (sy < s.second) - sy = s.second; - } - auto max = GetMaxSize(); - SetSize(max.first, sy + 4); - auto labels = m_pLabel->GetSize(); - m_pLabel->SetOffset(2, (sy - labels.second) / 2 + 2); - int x = max.first - 2; - if (m_pInput) - { - auto inputs = m_pInput->GetSize(); - x -= inputs.first + 2; - m_pInput->SetOffset(x + 2, (sy - inputs.second) / 2 + 2); - } - if (m_pControl) - { - auto controls = m_pControl->GetSize(); - m_pControl->SetMaxSize(x - 4 - labels.first, sy - 4); - x -= controls.first + 2; - m_pControl->SetOffset(x + 2, (sy - controls.second) / 2 + 2); - } -} - -void CCVarContainer::Update() -{ - static int updticks = 0; - updticks++; - if (m_pVar && !(updticks % 30)) - { - updticks = 1; - if (m_pInput) - { - if (!m_pInput->IsFocused()) - m_pInput->SetValue(m_pVar->GetString()); - } - if (m_pControl && !m_pControl->IsFocused()) - { - switch (m_pVar->type) - { - case CatVar_t::CV_ENUM: - { - dynamic_cast(m_pControl) - ->SetValue(m_pVar->GetInt()); - } - break; - case CatVar_t::CV_FLOAT: - case CatVar_t::CV_INT: - { - dynamic_cast(m_pControl) - ->SetValue(m_pVar->GetFloat()); - } - break; - case CatVar_t::CV_KEY: - { - dynamic_cast(m_pControl) - ->SetValue(m_pVar->GetInt()); - } - break; - case CatVar_t::CV_SWITCH: - { - dynamic_cast(m_pControl) - ->SetValue(m_pVar->GetBool()); - } - break; - } - } - } - CBaseContainer::Update(); -} diff --git a/src/menu/CCheckbox.cpp b/src/menu/CCheckbox.cpp deleted file mode 100755 index 6d0d5e17..00000000 --- a/src/menu/CCheckbox.cpp +++ /dev/null @@ -1,49 +0,0 @@ -/* - * CCheckbox.cpp - * - * Created on: Jan 26, 2017 - * Author: nullifiedcat - */ - -#include "menu/CCheckbox.h" - -#include "common.hpp" -#include "sdk.hpp" - -CCheckbox::CCheckbox(std::string name, IWidget *parent, bool checked) - : CBaseWidget(name, parent) -{ - SetWidth(16); - SetValue(checked); -} - -void CCheckbox::SetWidth(int width) -{ - Props()->SetInt("width", width); - SetSize(width, width); -} - -void CCheckbox::Draw(int x, int y) -{ - auto size = GetSize(); - draw::OutlineRect(x, y, size.first, size.second, NCGUIColor()); - if (Value()) - { - draw::DrawRect(x + 3, y + 3, size.first - 6, size.second - 6, - NCGUIColor()); - } -} - -void CCheckbox::OnMousePress() -{ - SetValue(!Value()); - if (m_pCallback) - { - m_pCallback(this, Value()); - } -} - -void CCheckbox::SetCallback(CheckboxCallbackFn_t callback) -{ - m_pCallback = callback; -} diff --git a/src/menu/CDropdown.cpp b/src/menu/CDropdown.cpp deleted file mode 100755 index ac908675..00000000 --- a/src/menu/CDropdown.cpp +++ /dev/null @@ -1,97 +0,0 @@ -/* - * CDropdown.cpp - * - * Created on: Jan 31, 2017 - * Author: nullifiedcat - */ - -#include "menu/CDropdown.h" -#include "menu/CDropdownList.h" -#include "menu/RootWindow.h" - -#include "common.hpp" -#include "sdk.hpp" - -CDropdown::CDropdown(std::string name, IWidget *parent) - : CBaseButton(name, parent) -{ - list = new CDropdownList(name + "_list", this); - g_pGUI->GetRootWindow()->AddChild(list); - SetSize(80, 18); - list->SetSize(80, 0); - CBaseButton::SetCallback([this](CBaseButton *) -> void { ShowList(); }); -} - -CDropdown::~CDropdown() -{ - delete list; -} - -void CDropdown::SetCallback(DropdownCallbackFn_t callback) -{ - m_pDropdownCallback = callback; -} - -void CDropdown::AddValue(std::string string) -{ - list->AddEntry(string); - m_values.push_back(string); -} - -std::string CDropdown::ValueName(int idx) -{ - if (idx < 0 || idx >= m_values.size()) - return "unknown"; - return m_values.at(idx); -} - -void CDropdown::Draw(int x, int y) -{ - auto size = GetSize(); - auto ssize = draw::GetStringLength( - fonts::MENU, ValueName(Value() - Props()->GetInt("offset"))); - draw::DrawRect(x, y, size.first, size.second, - colorsint::Transparent(colorsint::black)); - draw::OutlineRect(x, y, size.first, size.second, NCGUIColor()); - draw::String(fonts::MENU, x + (size.first - ssize.first) / 2, - y + (size.second - ssize.second) / 2, NCGUIColor(), 1, - ValueName(Value() - Props()->GetInt("offset"))); - auto asize = draw::GetStringLength(fonts::MENU, ">"); - draw::String(fonts::MENU, x + size.first - asize.first - 2, - y + (size.second - asize.second) / 2, NCGUIColor(), 1, ">"); -} - -void CDropdown::OnFocusLose() -{ - list->Hide(); -} - -void CDropdown::SetValueInternal(int value) -{ - Props()->SetInt("value", value + Props()->GetInt("offset")); - if (m_pDropdownCallback) - m_pDropdownCallback(this, value + Props()->GetInt("offset")); -} - -void CDropdown::SetValue(int value) -{ - Props()->SetInt("value", value); -} - -void CDropdown::ShowList() -{ - auto pos = AbsolutePosition(); - auto size = GetSize(); - list->SetOffset(pos.first + size.first + 3, pos.second); - list->Show(); -} - -int CDropdown::Value() -{ - return Props()->GetInt("value"); -} - -int CDropdown::ValueCount() -{ - return m_values.size(); -} diff --git a/src/menu/CDropdownEntry.cpp b/src/menu/CDropdownEntry.cpp deleted file mode 100755 index 5f241889..00000000 --- a/src/menu/CDropdownEntry.cpp +++ /dev/null @@ -1,37 +0,0 @@ -/* - * CDropdownEntry.cpp - * - * Created on: Jan 31, 2017 - * Author: nullifiedcat - */ - -#include "menu/CDropdownEntry.h" - -#include "common.hpp" -#include "sdk.hpp" - -CDropdownEntry::CDropdownEntry(std::string name, CDropdownList *parent, - std::string text, int value) - : CBaseButton(name, parent, text) -{ - Props()->SetInt("value", value); - SetCallback([this](CBaseButton *) -> void { - CDropdownList *parent = dynamic_cast(GetParent()); - if (!parent) - return; - parent->SetValue(Props()->GetInt("value")); - }); -} - -void CDropdownEntry::Draw(int x, int y) -{ - auto ssize = draw::GetStringLength(fonts::MENU, GetText()); - auto size = GetSize(); - draw::String(fonts::MENU, x + (size.first - ssize.first) / 2, - y + (size.second - ssize.second) / 2, NCGUIColor(), 1, - GetText()); -} - -CDropdownEntry::~CDropdownEntry() -{ -} diff --git a/src/menu/CDropdownList.cpp b/src/menu/CDropdownList.cpp deleted file mode 100755 index 1335ea28..00000000 --- a/src/menu/CDropdownList.cpp +++ /dev/null @@ -1,64 +0,0 @@ -/* - * CDropdownList.cpp - * - * Created on: Jan 31, 2017 - * Author: nullifiedcat - */ - -#include "menu/CDropdownList.h" -#include "menu/CDropdownEntry.h" -#include "menu/CDropdown.h" - -#include "common.hpp" -#include "sdk.hpp" - -CDropdownList::CDropdownList(std::string name, CDropdown *menu, int offset) - : CBaseContainer(name, nullptr) -{ - m_pMenu = menu; - Hide(); - SetZIndex(5); -} - -CDropdownList::~CDropdownList() -{ - for (auto entry : m_entries) - { - delete entry; - } -} - -void CDropdownList::AddEntry(std::string name) -{ - CDropdownEntry *entry = - new CDropdownEntry("entry", this, name, m_entries.size()); - auto size = GetSize(); - entry->SetSize(size.first, 18); - AddChild(entry); - m_entries.push_back(entry); - SetSize(size.first, m_entries.size() * 18); -} - -void CDropdownList::SetValue(int value) -{ - m_pMenu->SetValueInternal(value); - Hide(); -} - -void CDropdownList::Draw(int x, int y) -{ - auto size = GetSize(); - draw::DrawRect(x, y, size.first, size.second, - colorsint::Transparent(colorsint::black, 0.85)); - draw::OutlineRect(x, y, size.first, size.second, NCGUIColor()); - CBaseContainer::Draw(x, y); -} - -void CDropdownList::MoveChildren() -{ - for (int i = 0; i < ChildCount(); i++) - { - auto child = ChildByIndex(i); - child->SetOffset(0, i * 18); - } -} diff --git a/src/menu/CKeyInput.cpp b/src/menu/CKeyInput.cpp deleted file mode 100755 index f14bf5ed..00000000 --- a/src/menu/CKeyInput.cpp +++ /dev/null @@ -1,89 +0,0 @@ -/* - * CKeyInput.cpp - * - * Created on: Feb 1, 2017 - * Author: nullifiedcat - */ - -#include "menu/CKeyInput.h" - -#include "common.hpp" -#include "sdk.hpp" - -CKeyInput::CKeyInput(std::string name, IWidget *parent) - : CBaseWidget(name, parent) -{ - Props()->SetInt("value", 0); - Props()->SetBool("capturing", false); -} - -ButtonCode_t CKeyInput::Value() -{ - return (ButtonCode_t) Props()->GetInt("value"); -} - -void CKeyInput::SetValue(int value) -{ - Props()->SetInt("value", value); -} - -void CKeyInput::Draw(int x, int y) -{ - std::string key = ""; - int color = colorsint::white; - if (Props()->GetBool("capturing")) - { - key = "< PRESS >"; - color = NCGUIColor(); - } - else - { - if (!Value()) - { - if (!IsFocused()) - { - key = "< CLICK >"; - } - } - else - { - key = g_IInputSystem->ButtonCodeToString(Value()); - } - } - auto size = GetSize(); - auto ss = draw::GetStringLength(fonts::MENU, key); - draw::String(fonts::MENU, x + (size.first - ss.first) / 2, - y + (size.second - ss.second) / 2, color, 1, key); -} - -void CKeyInput::SetCallback(KeyInputCallbackFn_t callback) -{ - m_pCallback = callback; -} - -void CKeyInput::OnMousePress() -{ - if (!Props()->GetBool("capturing")) - Props()->SetBool("capturing", true); -} - -void CKeyInput::OnFocusLose() -{ - Props()->SetBool("capturing", false); -} - -bool CKeyInput::ConsumesKey(ButtonCode_t key) -{ - return key != MOUSE_LEFT && Props()->GetBool("capturing"); -} - -void CKeyInput::OnKeyPress(ButtonCode_t key, bool repeat) -{ - if (Props()->GetBool("capturing")) - { - SetValue(key); - if (m_pCallback) - m_pCallback(this, key); - Props()->SetBool("capturing", false); - } -} diff --git a/src/menu/CMenuContainer.cpp b/src/menu/CMenuContainer.cpp deleted file mode 100755 index 85aa8cd5..00000000 --- a/src/menu/CMenuContainer.cpp +++ /dev/null @@ -1,51 +0,0 @@ -/* - * CMenuContainer.cpp - * - * Created on: Feb 3, 2017 - * Author: nullifiedcat - */ - -#include "menu/CMenuContainer.h" -#include "menu/CMenuWindow.h" -#include "menu/CBaseButton.h" - -#include "common.hpp" - -CMenuContainer::CMenuContainer(std::string name, CMenuWindow *parent) - : CBaseContainer(name, parent) -{ -} - -void CMenuContainer::MoveChildren() -{ - int column_size = 350; - int x = 3, y = 2; - int columns = 0; - int my = GetMaxSize().second; - for (int i = 0; i < ChildCount(); i++) - { - auto c = ChildByIndex(i); - if (y + c->GetSize().second >= my) - { - y = 2; - x += column_size + 3; - columns++; - } - c->SetOffset(x, y); - if (!dynamic_cast(c)) - c->SetSize(column_size, -1); - c->SetMaxSize(column_size, -1); - y += c->GetSize().second + 2; - } - Props()->SetInt("columns", columns); -} - -void CMenuContainer::Draw(int x, int y) -{ - CBaseContainer::Draw(x, y); - for (int i = 0; i < Props()->GetInt("columns"); i++) - { - draw::DrawLine(x + (350 + 3) * (i + 1), y, 0, GetMaxSize().second, - NCGUIColor()); - } -} diff --git a/src/menu/CMenuList.cpp b/src/menu/CMenuList.cpp deleted file mode 100755 index 22d14e41..00000000 --- a/src/menu/CMenuList.cpp +++ /dev/null @@ -1,48 +0,0 @@ -/* - * CMenuList.cpp - * - * Created on: Feb 3, 2017 - * Author: nullifiedcat - */ - -#include "menu/CMenuList.h" - -#include "menu/CMenuListEntry.h" -#include "menu/CMenuWindow.h" - -#include "common.hpp" -#include "sdk.hpp" - -CMenuList::CMenuList(std::string name, CMenuWindow *parent) - : CBaseContainer(name, parent) -{ -} - -void CMenuList::AddEntry(std::string id, std::string name) -{ - CMenuListEntry *entry = new CMenuListEntry("entry_" + id, this, id); - entry->SetText(name); - entry->SetCallback([this](CBaseButton *thisptr) { - CMenuWindow *window = - dynamic_cast(thisptr->GetParent()->GetParent()); - window->SelectTab(thisptr->Props()->GetString("entry")); - }); - AddChild(entry); -} - -void CMenuList::SelectEntry(std::string id) -{ - m_pSelected = dynamic_cast(ChildByName("entry_" + id)); -} - -void CMenuList::MoveChildren() -{ - int cc = ChildCount(); - auto ms = GetMaxSize(); - for (int i = 0; i < cc; i++) - { - auto child = ChildByIndex(i); - child->SetMaxSize(ms.first, ms.second / cc); - child->SetOffset(0, (ms.second / cc) * i); - } -} diff --git a/src/menu/CMenuListEntry.cpp b/src/menu/CMenuListEntry.cpp deleted file mode 100755 index 421fb685..00000000 --- a/src/menu/CMenuListEntry.cpp +++ /dev/null @@ -1,54 +0,0 @@ -/* - * CMenuListEntry.cpp - * - * Created on: Feb 3, 2017 - * Author: nullifiedcat - */ - -#include "menu/CMenuListEntry.h" -#include "menu/CMenuList.h" - -#include "common.hpp" -#include "sdk.hpp" - -CMenuListEntry::CMenuListEntry(std::string name, CMenuList *parent, - std::string entry) - : CBaseButton(name, parent, entry) -{ - Props()->SetString("entry", entry.c_str()); -} - -void CMenuListEntry::SetMaxSize(int x, int y) -{ - CBaseWidget::SetMaxSize(x, y); - SetSize(x, y); -} - -bool CMenuListEntry::IsSelected() -{ - return (dynamic_cast(GetParent())->m_pSelected == this); -} - -void CMenuListEntry::Draw(int x, int y) -{ - auto texts = draw::GetStringLength(fonts::MENU_BIG, GetText()); - auto size = GetSize(); - if (IsSelected()) - { - draw::DrawLine(x, y, size.first, 0, NCGUIColor()); - draw::DrawLine(x, y + size.second, size.first, 0, NCGUIColor()); - draw::DrawLine(x, y, 0, size.second, NCGUIColor()); - } - else - { - draw::OutlineRect(x, y, size.first, size.second, NCGUIColor()); - } - if (IsHovered()) - { - draw::DrawRect(x, y, size.first, size.second, - colorsint::Transparent(NCGUIColor(), 0.25)); - } - draw::String(fonts::MENU_BIG, x + (size.first - texts.first) / 2, - y + (size.second - texts.second) / 2, - IsSelected() ? colorsint::white : NCGUIColor(), 1, GetText()); -} diff --git a/src/menu/CMenuWindow.cpp b/src/menu/CMenuWindow.cpp deleted file mode 100755 index 8decff96..00000000 --- a/src/menu/CMenuWindow.cpp +++ /dev/null @@ -1,153 +0,0 @@ -/* - * CMenuWindow.cpp - * - * Created on: Feb 3, 2017 - * Author: nullifiedcat - */ - -#include "menu/CMenuWindow.h" -#include "menu/CMenuList.h" -#include "menu/CTextLabel.h" -#include "menu/CMenuContainer.h" -#include "menu/CCVarContainer.h" -#include "menu/CBaseButton.h" -#include "common.hpp" -#include "sdk.hpp" -#include "menu/CCTitleBar.h" - -CMenuWindow::CMenuWindow(std::string name, IWidget *parent) - : CBaseWindow(name, parent) -{ - m_pList = new CMenuList("list", this); - AddChild(m_pList); - m_pActiveTab = 0; - AddChild(m_pTitle = new CTitleBar(this, "cathook menu")); -} - -#define ADDCVAR(x) tab->AddChild(new CCVarContainer(tab, (x))) -#define ADDLABEL(x) tab->AddChild(new CTextLabel("label", tab, x, true)) -#define ADDCVARS(x) \ - for (auto var : FindCatVars(x)) \ - ADDCVAR(var) - -std::vector FindCatVars(const std::string name) -{ - std::vector result = {}; - for (auto var : CatVarList()) - { - if (var->name.find(name) == 0) - result.push_back(var); - } - return result; -} - -void CMenuWindow::AddElements() -{ - /*AddTab("aimbot", "Aimbot"); - CMenuContainer* tab = GetTab("aimbot"); - for (auto var : FindCatVars("aimbot_")) ADDCVAR(var); - AddTab("esp", "ESP"); - tab = GetTab("esp"); - for (auto var : FindCatVars("esp_")) ADDCVAR(var); - AddTab("triggerbot", "Triggerbot"); - tab = GetTab("triggerbot"); - for (auto var : FindCatVars("triggerbot_")) ADDCVAR(var); - if (TF) { - ADDLABEL("AutoSticky"); - for (auto var : FindCatVars("sticky_")) ADDCVAR(var); - ADDLABEL("AutoReflect"); - for (auto var : FindCatVars("reflect_")) ADDCVAR(var); - } - AddTab("misc", "Misc"); - tab = GetTab("misc"); - ADDCVARS("thirdperson"); - ADDCVARS("log"); - ADDCVARS("no_"); - ADDCVARS("fov"); - ADDCVARS("clean_"); - ADDCVARS("tauntslide"); - ADDCVARS("airstuck"); - ADDCVARS("fast_"); - ADDCVARS("ignore_"); - ADDCVARS("rollspeedhack"); - ADDCVARS("minigun"); - ADDCVARS("disconnect"); - - if (TF) ADDCVAR(&hacks::tf::autoheal::enabled); - if (TF) ADDCVAR(&hacks::tf2::antidisguise::enabled); - if (TF2C) { - - } - - ADDCVAR(&cathook); - - if (TF) { - ADDLABEL("Spy Alert"); - for (auto var : FindCatVars("spyalert_")) ADDCVAR(var); - } - ADDLABEL("Bunnyhop"); - ADDCVARS("bhop"); - AddTab("antiaim", "Anti-Aim"); - tab = GetTab("antiaim"); - for (auto var : FindCatVars("aa_")) ADDCVAR(var); - AddTab("spam", "Spam/Killsay"); - tab = GetTab("spam"); - ADDLABEL("Spam"); - ADDCVARS("spam"); - tab->AddChild(new CBaseButton("spam_reload", tab, "Reload spam", - [this](CBaseButton*) { - hacks::shared::spam::Reload(); - })); - ADDLABEL("Killsay"); - ADDCVARS("killsay"); - tab->AddChild(new CBaseButton("killsay_reload", tab, "Reload killsays", - [this](CBaseButton*) { - hacks::shared::killsay::Reload(); - })); - AddTab("multibox", "Bots"); - tab = GetTab("multibox"); - for (auto var : FindCatVars("ipc_")) ADDCVAR(var); - for (auto var : FindCatVars("fb_")) ADDCVAR(var); - ADDLABEL("Stats window/bot management coming soon!");*/ -} - -CMenuContainer *CMenuWindow::GetTab(std::string tab) -{ - return dynamic_cast(ChildByName("tab_" + tab)); -} - -void CMenuWindow::AddTab(std::string tab, std::string name) -{ - m_pList->AddEntry(tab, name); - CMenuContainer *container = new CMenuContainer("tab_" + tab, this); - if (!m_pActiveTab) - m_pActiveTab = container; - AddChild(container); - container->Hide(); -} - -void CMenuWindow::SelectTab(std::string tab) -{ - if (m_pActiveTab) - m_pActiveTab->Hide(); - m_pActiveTab = GetTab(tab); - m_pList->SelectEntry(tab); - if (m_pActiveTab) - m_pActiveTab->Show(); -} - -void CMenuWindow::MoveChildren() -{ - auto ms = GetMaxSize(); - auto th = m_pTitle->GetSize().second; - SetSize(ms.first, ms.second); - m_pList->SetMaxSize(200, ms.second - th); - m_pList->SetSize(200, ms.second - th); - m_pList->SetOffset(0, th); - if (m_pActiveTab) - { - m_pActiveTab->SetOffset(200, th); - m_pActiveTab->SetMaxSize(ms.first - 200, ms.second - th); - m_pActiveTab->SetSize(ms.first - 200, ms.second - th); - } -} diff --git a/src/menu/CSlider.cpp b/src/menu/CSlider.cpp deleted file mode 100755 index a2c12946..00000000 --- a/src/menu/CSlider.cpp +++ /dev/null @@ -1,107 +0,0 @@ -/* - * CSlider.cpp - * - * Created on: Jan 28, 2017 - * Author: nullifiedcat - */ - -#include "menu/CSlider.h" -#include "common.hpp" -#include "sdk.hpp" - -CSlider::CSlider(std::string name, IWidget *parent) : CBaseWidget(name, parent) -{ - Setup(0.0f, 1.0f); - SetSize(80, 16); - m_nLastX = 0; - m_nSliderPos = 40; - m_bDragInit = false; - m_pCallback = 0; -} - -void CSlider::Setup(float min, float max) -{ - Props()->SetFloat("value_min", min); - Props()->SetFloat("value_max", max); - SetValue((min + max) / 2.0f); -} - -void CSlider::SetStep(float step) -{ - Props()->SetFloat("step", step); -} - -void CSlider::SetCallback(SliderCallbackFn_t callback) -{ - m_pCallback = callback; -} - -void CSlider::SetValue(float value) -{ - float old = Value(); - if (Props()->GetFloat("step")) - { - value -= fmod(value, Props()->GetFloat("step")); - } - Props()->SetFloat("value", value); - if (old != value) - { - if (m_pCallback) - { - m_pCallback(this, old, value); - } - } - m_nSliderPos = (GetSize().first) * - (float) (value - Props()->GetFloat("value_min")) / - (float) (Props()->GetFloat("value_max") - - Props()->GetFloat("value_min")); -} - -float CSlider::Value() -{ - return Props()->GetFloat("value"); -} - -void CSlider::Update() -{ - if (IsPressed()) - { - if (m_bDragInit) - { - int delta = m_nLastX - g_pGUI->m_iMouseX; - if (delta) - { - auto abs = AbsolutePosition(); - auto size = GetSize(); - int mv = g_pGUI->m_iMouseX - abs.first; - if (mv < 0) - mv = 0; - if (mv > size.first) - mv = size.first; - SetValue(((float) mv / (float) size.first) * - (Props()->GetFloat("value_max") - - Props()->GetFloat("value_min")) + - Props()->GetFloat("value_min")); - m_nSliderPos = mv; - } - } - m_nLastX = g_pGUI->m_iMouseX; - m_bDragInit = true; - } - else - m_bDragInit = false; -} - -void CSlider::Draw(int x, int y) -{ - auto size = GetSize(); - draw::DrawRect(x, y, size.first, size.second, - colorsint::Create(0, 0, 0, 200)); - draw::DrawRect(x, y, m_nSliderPos, size.second, NCGUIColor()); - char *s = strfmt("%.2f", Value()); - std::string str(s); - delete[] s; - auto sl = draw::GetStringLength(fonts::MENU, str); - draw::String(fonts::MENU, x + (size.first - sl.first) / 2, - y + (size.second - sl.second) / 2, colorsint::white, 1, str); -} diff --git a/src/menu/CSplitContainer.cpp b/src/menu/CSplitContainer.cpp deleted file mode 100755 index cddd1fa3..00000000 --- a/src/menu/CSplitContainer.cpp +++ /dev/null @@ -1,33 +0,0 @@ -/* - * CSplitContainer.cpp - * - * Created on: Jan 28, 2017 - * Author: nullifiedcat - */ - -#include "menu/CSplitContainer.h" -#include "common.hpp" - -CSplitContainer::CSplitContainer(std::string name, IWidget *parent) - : CBaseContainer(name, parent) -{ -} - -void CSplitContainer::MoveChildren() -{ - auto newsize = std::make_pair(GetMaxSize().first, 0); - auto size = GetSize(); - if (!ChildCount()) - return; - int width = ((size.first - 4) / ChildCount()) - 2; // TODO padding! - for (int i = 0; i < ChildCount(); i++) - { - auto child = ChildByIndex(i); - child->SetOffset(2 + i * width, 2); - child->SetMaxSize(width, -1); - auto csize = child->GetSize(); - if (csize.second + 2 > newsize.second) - newsize.second = csize.second + 2; - } - SetSize(-1, newsize.second); -} diff --git a/src/menu/CTextInput.cpp b/src/menu/CTextInput.cpp deleted file mode 100755 index e9589342..00000000 --- a/src/menu/CTextInput.cpp +++ /dev/null @@ -1,120 +0,0 @@ -/* - * CTextInput.cpp - * - * Created on: Jan 26, 2017 - * Author: nullifiedcat - */ - -#include "menu/CTextInput.h" - -#include "common.hpp" -#include "sdk.hpp" -#include "menu/GUI.h" - -CTextInput::CTextInput(std::string name, IWidget *parent) - : CBaseWidget(name, parent) -{ - Props()->SetString("value", ""); -} - -bool CTextInput::ConsumesKey(ButtonCode_t key) -{ - return key >= ButtonCode_t::KEY_FIRST && key <= ButtonCode_t::KEY_BACKSPACE; -} - -void CTextInput::SetMaxWidth(int width) -{ - auto length = draw::GetStringLength(fonts::MENU, "W"); - SetSize(length.first * width + 4, length.second + 4); // TODO PADDING -} - -std::string CTextInput::Value() -{ - return std::string(Props()->GetString("value")); -} - -void CTextInput::SetValue(std::string value) -{ - std::string oldv = Value(); - if (m_pCallback) - m_pCallback(this, oldv, value); - Props()->SetString("value", value.c_str()); -} - -void CTextInput::Draw(int x, int y) -{ - auto wsize = draw::GetStringLength(fonts::MENU, "W"); - auto size = GetSize(); - int color = colorsint::Create(0, 0, 0, 80); - if (IsFocused()) - color = colorsint::Transparent(NCGUIColor(), 0.25); - draw::DrawRect(x, y, size.first, size.second, color); - draw::OutlineRect(x, y, size.first, size.second, NCGUIColor()); - int ml = 0; - int md = 0; - auto dotssize = draw::GetStringLength(fonts::MENU, "..."); // TODO static? - std::string value = Value(); - for (int i = 0; i < value.length(); i++) - { - auto strsize = draw::GetStringLength(fonts::MENU, value.substr(i)); - if (strsize.first + 10 + dotssize.first >= size.first) - md = i; - if (strsize.first + 8 > size.first) - ml = i; - } - if (ml) - { - draw::FString(fonts::MENU, x + 2, y + 2, colorsint::white, 1, "...%s", - value.substr(md).c_str()); - } - else - { - draw::String(fonts::MENU, x + 2, y + 2, colorsint::white, 1, - value); // TODO recalc on update - } -} - -void CTextInput::SetCallback(TextInputCallbackFn_t callback) -{ - m_pCallback = callback; -} - -void CTextInput::PutChar(char ch) -{ - SetValue(Value() + std::string(1, ch)); -} - -void CTextInput::OnKeyPress(ButtonCode_t key, bool repeat) -{ - if (key == ButtonCode_t::KEY_BACKSPACE) - { - std::string val = Value(); - if (val.length() > 0) - { - SetValue(val.substr(0, val.length() - 1)); - } - return; - } - else if (key == ButtonCode_t::KEY_SPACE) - { - PutChar(' '); - return; - } - else - { - char ch = 0; - if (g_pGUI->m_bPressedState[ButtonCode_t::KEY_LSHIFT] || - g_pGUI->m_bPressedState[ButtonCode_t::KEY_RSHIFT]) - { - ch = GetUpperChar(key); - } - else - { - ch = GetChar(key); - } - if (ch) - { - PutChar(ch); - } - } -} diff --git a/src/menu/CTooltip.cpp b/src/menu/CTooltip.cpp deleted file mode 100755 index 717c9a73..00000000 --- a/src/menu/CTooltip.cpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * CTooltip.cpp - * - * Created on: Jan 28, 2017 - * Author: nullifiedcat - */ - -#include "menu/CTooltip.h" -#include "common.hpp" -#include "sdk.hpp" - -#include - -CTooltip::CTooltip(IWidget *parent) : CTextLabel("tooltip", parent) -{ - SetZIndex(999); - SetPadding(4, 4); - SetMaxSize(100, -1); - SetAutoSize(false); - SetSize(100, -1); -} - -void CTooltip::Draw(int x, int y) -{ - auto size = GetSize(); - draw::DrawRect(x, y, size.first, size.second, - colorsint::Create(0, 0, 0, 230)); - draw::OutlineRect(x, y, size.first, size.second, NCGUIColor()); - draw::String(fonts::MENU, x + Props()->GetInt("padding_x"), - y + Props()->GetInt("padding_y"), NCGUIColor(), 1, GetText()); -} diff --git a/src/menu/GUI.cpp b/src/menu/GUI.cpp index bc2af1a2..e2110953 100755 --- a/src/menu/GUI.cpp +++ b/src/menu/GUI.cpp @@ -7,8 +7,6 @@ #include "menu/GUI.h" #include "menu/IWidget.h" -#include "menu/RootWindow.h" -#include "menu/CTooltip.h" #include "common.hpp" #include "sdk.hpp" @@ -44,13 +42,11 @@ CatVar gui_draw_bounds(CV_SWITCH, "gui_bounds", "0", "Draw Bounds", CatGUI::CatGUI() { root_nullcore = nullptr; - m_pRootWindow = 0; } CatGUI::~CatGUI() { delete root_nullcore; - delete m_pRootWindow; } bool CatGUI::Visible() @@ -59,11 +55,13 @@ bool CatGUI::Visible() } CatVar gui_color_r(CV_INT, "gui_color_r", "15", "Main GUI color (red)", - "Defines red component of main gui color", 0, 255); + "Defines red component of main gui color"); CatVar gui_color_g(CV_INT, "gui_color_g", "150", "Main GUI color (green)", - "Defines green component of main gui color", 0, 255); + "Defines green component of main gui color"); CatVar gui_color_b(CV_INT, "gui_color_b", "150", "Main GUI color (blue)", - "Defines blue component of main gui color", 0, 255); + "Defines blue component of main gui color"); +CatVar gui_color_a(CV_INT, "gui_color_a", "130", "GUI Background Opacity", + "Defines the opacity of the GUI background (no shit?)"); static CatVar gui_rainbow(CV_SWITCH, "gui_rainbow", "0", "Rainbow GUI", "RGB all the things!!!"); @@ -76,8 +74,6 @@ int NCGUIColor() void CatGUI::Setup() { - m_pRootWindow = new RootWindow(); - m_pRootWindow->Setup(); menu::ncc::Init(); root_nullcore = menu::ncc::root; gui_visible.OnRegister([](CatVar *var) { @@ -85,26 +81,11 @@ void CatGUI::Setup() }); } -void CatGUI::ShowTooltip(std::string text) -{ - m_pTooltip->SetText(text); - m_pTooltip->SetOffset(m_iMouseX + 5, m_iMouseY + 5); - m_pTooltip->Show(); - m_bShowTooltip = true; -} - void CatGUI::Update() { try { - CBaseWindow *root = gui_nullcore - ? dynamic_cast(root_nullcore) - : dynamic_cast(m_pRootWindow); - if (gui_nullcore) - m_pRootWindow->Hide(); - else - root_nullcore->Hide(); - m_bShowTooltip = false; + CBaseWindow *root = dynamic_cast(root_nullcore); int new_scroll = g_IInputSystem->GetAnalogValue(AnalogCode_t::MOUSE_WHEEL); // logging::Info("scroll: %i", new_scroll); @@ -225,8 +206,6 @@ void CatGUI::Update() if (!root->IsVisible()) root->Show(); root->Update(); - if (!m_bShowTooltip && m_pTooltip->IsVisible()) - m_pTooltip->Hide(); root->Draw(0, 0); if (Visible()) { @@ -239,23 +218,6 @@ void CatGUI::Update() { root->DrawBounds(0, 0); } - /*if (gui_visible) { - if (!root->IsVisible()) - root->Show(); - root->Update(); - if (!m_bShowTooltip && m_pTooltip->IsVisible()) m_pTooltip->Hide(); - root->Draw(0, 0); - draw::DrawRect(m_iMouseX - 5, m_iMouseY - 5, 10, 10, - colorsint::Transparent(colorsint::white)); - draw::OutlineRect(m_iMouseX - 5, m_iMouseY - 5, 10, 10, - NCGUIColor()); - if (gui_draw_bounds) { - root->DrawBounds(0, 0); - } - } else { - if (root->IsVisible()) - root->Hide(); - }*/ } catch (std::exception &ex) { @@ -265,18 +227,11 @@ void CatGUI::Update() bool CatGUI::ConsumesKey(ButtonCode_t key) { - CBaseWindow *root = gui_nullcore - ? dynamic_cast(root_nullcore) - : dynamic_cast(m_pRootWindow); + CBaseWindow *root = dynamic_cast(root_nullcore); if (root->IsVisible()) return root->ConsumesKey(key); else return false; } -RootWindow *CatGUI::GetRootWindow() -{ - return m_pRootWindow; -} - CatGUI *g_pGUI = 0; diff --git a/src/menu/RootWindow.cpp b/src/menu/RootWindow.cpp deleted file mode 100755 index 7d470bfe..00000000 --- a/src/menu/RootWindow.cpp +++ /dev/null @@ -1,73 +0,0 @@ -/* - * RootWindow.cpp - * - * Created on: Jan 25, 2017 - * Author: nullifiedcat - */ - -#include "menu/RootWindow.h" -#include "menu/CTextLabel.h" -#include "menu/CCheckbox.h" -#include "menu/CBaseButton.h" -#include "menu/CTextInput.h" -#include "menu/CSplitContainer.h" -#include "menu/CSlider.h" -#include "menu/CTooltip.h" -#include "menu/CBaseContainer.h" -#include "menu/CDropdown.h" -#include "menu/CMenuContainer.h" -#include "menu/CCVarContainer.h" -#include "menu/CMenuWindow.h" - -#include "common.hpp" -#include "menu/CCTitleBar.h" - -void B1Callback(CBaseButton *thisptr) -{ - CBaseContainer *container = - dynamic_cast(thisptr->GetParent()); - CTextLabel *label = - dynamic_cast(container->ChildByName("td")); - if (label) - { - char *text = strfmt("wow! this[\"%s\"] = %i", "test_value", - thisptr->Props()->GetInt("test_value")); - label->SetText(text); - delete[] text; - } -} - -void TICallback(CTextInput *thisptr, std::string olds, std::string news) -{ - CBaseContainer *container = - dynamic_cast(thisptr->GetParent()); - CTextLabel *tl = dynamic_cast(container->ChildByName("td")); - if (tl) - { - char *text = strfmt("wow! text: %s", news.c_str()); - tl->SetText(text); - delete[] text; - } -} - -RootWindow::RootWindow() : CBaseWindow("root") -{ -} - -void RootWindow::Setup() -{ - g_pGUI->m_pTooltip = new CTooltip(); - AddChild(g_pGUI->m_pTooltip); - SetMaxSize(draw::width, draw::height); - CBaseWindow *ws = new CBaseWindow("splitwindow"); - ws->SetPositionMode(ABSOLUTE); - CTitleBar *wst = new CTitleBar(ws, "Window Layout Test"); - ws->AddChild(wst); - ws->SetMaxSize(500, 0); - CMenuWindow *win = new CMenuWindow("menu_window", this); - win->SetMaxSize(912, 410); - auto ms = GetMaxSize(); - win->AddElements(); - win->SetOffset((draw::width - 912) / 2, (draw::height - 410) / 2); - AddChild(win); -} \ No newline at end of file diff --git a/src/menu/ncc/Background.cpp b/src/menu/ncc/Background.cpp deleted file mode 100755 index e377894a..00000000 --- a/src/menu/ncc/Background.cpp +++ /dev/null @@ -1,175 +0,0 @@ -/* - * Background.cpp - * - * Created on: Apr 28, 2017 - * Author: nullifiedcat - */ - -#include "menu/ncc/Menu.hpp" - -namespace menu -{ -namespace ncc -{ -/* -Background::Background() : CBaseWidget("nc_background"), - tx_snowflake(&_binary_snowflake_start, 16, 16), - tx_raindrop(&_binary_raindrop_start, 16, 16), - tx_flame(&_binary_flame_start, 16, 16), - tx_heart(&_binary_heart_start, 16, 16), - tx_raindrop2(&_binary_raindrop2_start, 16, 16) { - SetSize(draw::width, draw::height); -} - -static CatVar particles(CV_SWITCH, "gui_bg_particles", "0", "Particles"); -static CatEnum particle_type_enum({"Snowflake", "Raindrop", "Flame", "Heart", -"Raindrop 2", "Random"}); -static CatVar particle_type(particle_type_enum, "gui_bg_particles_type", "0", -"Particles Type", "Defines particle type"); -static CatVar particle_chance(CV_INT, "gui_bg_particles_chance", "10", -"Particles Spawn Rate", "Defines snowflake spawn rate (HAS TO BE NONZERO!)", -1.0f, 100.0f); -static CatVar particle_pack_size(CV_INT, "gui_bg_particles_pack_size", "10", -"Particles Max Pack", "Defines max snowflake spawn pack size (HAS TO BE -NONZERO!)", 1.0f, 100.0f); -static CatVar particle_safe(CV_INT, "gui_bg_particles_safe_zone", "100", -"Particles Safe Zone", "Defines snowflake safe zone (they will decay after -reaching that point)", 0.0f, 400.0f); -static CatVar particle_gravity(CV_FLOAT, "gui_bg_particles_gravity", "700", -"Particles Gravity", "Defines snowflake gravity (HAS TO BE NONZERO!)", 0.01f, -2400.0f); -static CatVar particle_jittering(CV_INT, "gui_bg_particles_jittering", "2", -"Particles Jittering", "Defines snowflake jittering amount", 0.0f, 10.0f); -static CatVar particle_wind(CV_INT, "gui_bg_particles_wind", "0", "Particles -Wind", "Wind strength and direction", -500.0f, 500.0f); -static CatVar particle_jittering_chance(CV_INT, -"gui_bg_particles_jittering_chance", "60", "Snowflake Jittering Rate", "Defines -snowflake jittering rate (HAS TO BE NONZERO!)", 1.0f, 20.0f); -static CatEnum background_visible_enum({"NEVER", "MENU", "ALWAYS"}); -static CatVar background_visible(background_visible_enum, "gui_bg_visible", "1", -"Render background", "Render background when"); - -bool Background::AlwaysVisible() { - return (int)background_visible == 2; -} - -void Background::Update() { - if (!particles) return; - auto newtime = std::chrono::system_clock::now(); - std::chrono::duration dt = newtime - last_update; - Particle* current = list; - while (current) { - Particle* next = current->next; - current->Update(dt.count()); - if (current->dead) { - KillParticle(current); - } - current = next; - } - if (!(rand() % (int)particle_chance)) { - for (int i = 0; i < rand() % (int)particle_pack_size; i++) -MakeParticle(); - } - last_update = newtime; -} - -Background::~Background() { - Particle* current = list; - while (current) { - Particle* next = current->next; - delete current; - current = next; - } -} - -void Background::LoadTextures() { - tx_flame.Load(); - tx_raindrop.Load(); - tx_snowflake.Load(); - tx_heart.Load(); - tx_raindrop2.Load(); - textures_loaded = true; -} - -void Background::Draw(int x, int y) { - if (!particles) return; - if (!textures_loaded) LoadTextures(); - Particle* current = list; - while (current) { - Particle* next = current->next; - if (!current->show_in) { - int color = colorsint::white; - if (current->y > (int)particle_safe) { - color = colorsint::Create(255, 255, 255, ((int)particle_safe + -255) - current->y); - } - current->texture->Draw((int)current->x, (int)current->y, 16, 16, -color); - } - current = next; - } -} - -void Background::MakeParticle() { - Particle* flake = new Particle(); - flake->x = RandFloatRange(0, draw::width); - flake->y = 3 - (rand() % 6); - flake->vx = 0; - flake->vy = 0; - flake->dead = false; - flake->next = nullptr; - flake->show_in = rand() % 4; - switch (((int)particle_type == 5) ? (rand() % 5) : (int)particle_type) { - case 1: - flake->texture = &tx_raindrop; - break; - case 2: - flake->texture = &tx_flame; - break; - case 3: - flake->texture = &tx_heart; - break; - case 4: - flake->texture = &tx_raindrop2; - break; - default: - flake->texture = &tx_snowflake; - } - if (list_tail) - list_tail->next = flake; - flake->prev = list_tail; - list_tail = flake; - if (!list) { - list = flake; - } -} - -void Background::KillParticle(Particle* flake) { - if (list_tail == flake) { - list_tail = flake->prev; - } - if (list == flake) { - list = flake->next; - } - if (flake->prev) flake->prev->next = flake->next; - if (flake->next) flake->next->prev = flake->prev; - delete flake; -} - -void Background::Particle::Update(float dt) { - if (show_in) show_in--; - if (particle_wind) { - vx += (float)particle_wind * dt * 10.0f; - } - if (!(rand() % (int)(particle_jittering_chance))) { - x += (rand() % 2) ? (int)particle_jittering : -(int)particle_jittering; - } - vy += (float)particle_gravity * dt; - x += vx * dt; - y += vy * dt; - if (x > draw::width + 16) x = -16; - if (y > (int)particle_safe + 255) dead = true; -} -*/ -} -} diff --git a/src/menu/ncc/CritIndicator.cpp b/src/menu/ncc/CritIndicator.cpp deleted file mode 100755 index e15f0b2f..00000000 --- a/src/menu/ncc/CritIndicator.cpp +++ /dev/null @@ -1,84 +0,0 @@ -/* - * CritIndicator.cpp - * - * Created on: May 13, 2017 - * Author: nullifiedcat - */ - -#include "menu/ncc/CritIndicator.hpp" -#include "common.hpp" - -namespace menu -{ -namespace ncc -{ -/* -CatVar ci_enabled(CV_SWITCH, "gui_ncc_crit_indicator", "1", "Crit Indicator"); -CatVar ci_x(CV_INT, "gui_ncc_crit_indicator_x", "400", "Crit Indicator X"); -CatVar ci_y(CV_INT, "gui_ncc_crit_indicator_y", "150", "Crit Indicator Y"); - -CritIndicator::CritIndicator() : CBaseWidget("ncc_crit_indicator"), - crit_normal(&_binary_crit_1_start, 64, 64), - crit_none(&_binary_crit_2_start, 64, 64), - crit_ready(&_binary_crit_3_start, 64, 64), - crit_disabled(&_binary_crit_4_start, 64, 64) { - SetOffset((int)ci_x, (int)ci_y); - SetSize(64, 72); -}*/ -/* -bool CritIndicator::IsVisible() { - return !g_Settings.bInvalid && ci_enabled && -hacks::shared::misc::crit_hack_next; -} - -void CritIndicator::Draw(int x, int y) { - if (!crit_none.id) crit_none.Load(); - if (!crit_disabled.id) crit_disabled.Load(); - if (!crit_normal.id) crit_normal.Load(); - if (!crit_ready.id) crit_ready.Load(); - Texture* tx = &crit_none; - bool critkey { false }; - bool crits { false }; - if (RandomCrits() && weapon_can_crit_last) { - // It's safe to be 1 tick behind real values to prevent flickering. - if (hacks::shared::misc::found_crit_number >= -hacks::shared::misc::last_number - 1 && hacks::shared::misc::found_crit_weapon -== RAW_ENT(LOCAL_W)) { - tx = &crit_normal; - if (CritKeyDown() || experimental_crit_hack.KeyDown()) { - tx = &crit_ready; - critkey = true; - } - crits = true; - } - } else { - tx = &crit_disabled; - } - draw::DrawRect(x, y, 64, 72, colorsint::Transparent(colorsint::black)); - tx->Draw(x, y, 64, 64); - draw::OutlineRect(x, y, 64, 72, critkey ? colorsint::pink : NCGUIColor()); - draw::DrawLine(x, y + 64, 64, 0, critkey ? colorsint::pink : NCGUIColor()); - if (crits) { - draw::DrawRect(x + 1, y + 65, 1 + 61.0f * -(hacks::shared::misc::last_bucket / 1000.0f), 6, (!crits) ? -colorsint::Create(235, 20, 20, 255) : colorsint::Create(20, 235, 20, 255)); - } -} - -bool CritIndicator::AlwaysVisible() { - return IsVisible(); -} - -void CritIndicator::Update() { - if (IsPressed()) { - auto offset = GetOffset(); - offset.first += g_pGUI->mouse_dx; - offset.second += g_pGUI->mouse_dy; - SetOffset(offset.first, offset.second); - ci_x = (int)offset.first; - ci_y = (int)offset.second; - } -} -*/ -} -} diff --git a/src/menu/ncc/Item.cpp b/src/menu/ncc/Item.cpp index 125a8b5d..3bca1276 100755 --- a/src/menu/ncc/Item.cpp +++ b/src/menu/ncc/Item.cpp @@ -29,7 +29,7 @@ void Item::Draw(int x, int y) const auto &size = GetSize(); // draw::DrawRect(x, y, size.first, size.second, colorsint::red); draw::DrawRect(x, y, size.first, size.second, - colorsint::Create(0, 0, 0, 77)); + colorsint::Create(0, 0, 0, gui_color_a)); if (IsHovered()) { draw::DrawRect(x, y, size.first, size.second, diff --git a/src/menu/ncc/Logo.cpp b/src/menu/ncc/Logo.cpp deleted file mode 100755 index 5731a662..00000000 --- a/src/menu/ncc/Logo.cpp +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Logo.cpp - * - * Created on: Apr 28, 2017 - * Author: nullifiedcat - */ - -#include "menu/ncc/Menu.hpp" - -namespace menu -{ -namespace ncc -{ - -static CatEnum logo_enum({ "NEVER", "MENU", "ALWAYS" }); -CatVar logo(logo_enum, "logo", "0", "Show logo", "Show cathook logo when"); -/* -Logo::Logo() : CBaseWidget("nc_logo"), texture(&_binary_logo_start, 576, 288) { - SetSize(576, 288); -} - -bool Logo::AlwaysVisible() { - return (int)logo == 2; -} - -void Logo::Draw(int x, int y) { - if (logo) { - if (!texture.id) texture.Load(); - texture.Draw(x, y, 576, 288, NCGUIColor()); - } -} - -void Logo::Update() { - if (IsPressed()) { - auto offset = GetOffset(); - offset.first += g_pGUI->mouse_dx; - offset.second += g_pGUI->mouse_dy; - SetOffset(offset.first, offset.second); - } -}*/ -} -} diff --git a/src/menu/ncc/Menu.cpp b/src/menu/ncc/Menu.cpp index 246fdb99..a2656173 100755 --- a/src/menu/ncc/Menu.cpp +++ b/src/menu/ncc/Menu.cpp @@ -29,8 +29,7 @@ CatVar font_title_family(fonts::family_enum, "gui_ncc_font_title_family", "4", "Defines font family for NCC menu titles"); Tooltip *tooltip = nullptr; -; -Root *root = nullptr; +Root *root = nullptr; void ShowTooltip(const std::string &text) { @@ -79,11 +78,10 @@ void RefreshFonts() font_title = g_ISurface->CreateFont(); font_item = g_ISurface->CreateFont(); g_ISurface->SetFontGlyphSet( - font_title, - fonts::fonts - .at(_clamp(0, (int) (fonts::fonts.size() - 1), - (int) font_title_family)) - .c_str(), + font_title, fonts::fonts + .at(_clamp(0, (int) (fonts::fonts.size() - 1), + (int) font_title_family)) + .c_str(), psize_font_title * (float) scale, 0, 0, 0, 0x0); g_ISurface->SetFontGlyphSet( font_item, @@ -566,6 +564,7 @@ static const std::string list_tf2 = R"( "gui_color_r" "gui_color_g" "gui_color_b" + "gui_color_a" "esp_color_blue_r" "esp_color_blue_g" "esp_color_blue_b" diff --git a/src/menu/ncc/Radar.cpp b/src/menu/ncc/Radar.cpp deleted file mode 100755 index 5c45b97f..00000000 --- a/src/menu/ncc/Radar.cpp +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Radar.cpp - * - * Created on: Mar 28, 2017 - * Author: nullifiedcat - */ - -#include "menu/ncc/Radar.hpp" -#include "common.hpp" - -namespace menu -{ -namespace ncc -{ -/* -Radar::Radar() : CBaseWidget("ncc_radar") {} - -std::pair Radar::GetSize() { - return { (int)hacks::tf::radar::size, (int)hacks::tf::radar::size }; -} - -void Radar::Update() { - if (!hacks::tf::radar::radar_enabled) Hide(); - else Show(); - SetOffset((int)hacks::tf::radar::radar_x, (int)hacks::tf::radar::radar_y); - if (IsPressed()) { - hacks::tf::radar::radar_x = (int)hacks::tf::radar::radar_x + -g_pGUI->mouse_dx; - hacks::tf::radar::radar_y = (int)hacks::tf::radar::radar_y + -g_pGUI->mouse_dy; - } -}*/ -} -} diff --git a/src/menu/ncc/Root.cpp b/src/menu/ncc/Root.cpp index 1c604aa2..72f4ef47 100755 --- a/src/menu/ncc/Root.cpp +++ b/src/menu/ncc/Root.cpp @@ -8,7 +8,6 @@ #include "menu/ncc/Root.hpp" #include "menu/ncc/Menu.hpp" #include "menu/ncc/Tooltip.hpp" -#include "menu/ncc/Radar.hpp" #include "common.hpp" namespace menu @@ -41,20 +40,14 @@ void Root::Draw(int x, int y) void Root::Setup() { tooltip = new Tooltip(); - // Logo* logo = new Logo(); - // logo->SetOffset(draw::width / 2 - 288, 25); - // AddChild(new Background()); - // AddChild(logo); AddChild(tooltip); AddChild(&menu::ncc::MainList()); menu::ncc::MainList().ChildByIndex(0)->Props()->SetBool("brackets3", true); - // AddChild(new Radar()); menu::ncc::MainList().Show(); menu::ncc::MainList().SetOffset(draw::width / 2, draw::height / 2); PlayerList *pl = new PlayerList(); pl->SetOffset(200, 200); AddChild(pl); - // AddChild(new CritIndicator()); } void Root::OnKeyPress(ButtonCode_t key, bool repeat) diff --git a/src/menu/ncc/Tooltip.cpp b/src/menu/ncc/Tooltip.cpp index f560477b..0934dcc0 100755 --- a/src/menu/ncc/Tooltip.cpp +++ b/src/menu/ncc/Tooltip.cpp @@ -47,13 +47,12 @@ void Tooltip::Draw(int x, int y) originx -= size.first; if (originx + size.second > draw::height) originy -= size.second; - static int bgcolor = - colorsint::Create(0, 0, 0, 77); // colorsint::Create(70, 86, 47, 28); - static int fgcolor = colorsint::Create(200, 200, 190, 255); - draw::DrawRect(x, y, size.first, size.second, bgcolor); + draw::DrawRect(x, y, size.first, size.second, + colorsint::Create(0, 0, 0, 130)); draw::OutlineRect(x, y, size.first, size.second, NCGUIColor()); draw::String(font_item, x + Props()->GetInt("padding_x"), - y + Props()->GetInt("padding_y"), fgcolor, 2, GetText()); + y + Props()->GetInt("padding_y"), colorsint::white, 2, + GetText()); } } } diff --git a/src/visual/drawmgr.cpp b/src/visual/drawmgr.cpp index b636f85e..d13cb93c 100755 --- a/src/visual/drawmgr.cpp +++ b/src/visual/drawmgr.cpp @@ -115,6 +115,11 @@ void DrawCheatVisuals() hacks::tf::radar::Draw(); } #endif + IF_GAME(IsTF()) + { + PROF_SECTION(DRAW_autoreflect); + hacks::tf::autoreflect::Draw(); + } IF_GAME(IsTF2()) { PROF_SECTION(DRAW_healarrows);